wxMGL bugfixes

[wxWidgets.git] / utils / tex2rtf / src / rtfutils.cpp

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 60e31552e8fea333662c151cacc3cd8aed13c149..49c710c82ac5f340f1d4dfe0986ef9e10ba0faa5 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -667,7 +667,7 @@ void ProcessText2RTF(TexChunk *chunk)
       i += 1;
       changed = TRUE;
     }
-    else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curly bracket
+    else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curley bracket
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;
@@ -3375,7 +3375,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
                   else
                   {
                     TexOutput("??");
-                    sprintf(buf, "Warning: unresolved reference %s.", refName);
+                    sprintf(buf, "Warning: unresolved reference '%s'", refName);
                     OnInform(buf);
                   }
                 }
@@ -5090,6 +5090,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
 
 bool RTFGo(void)
 {
+  if (stopRunning)
+      return FALSE;
+
   // Reset variables
   indentLevel = 0;
   forbidParindent = 0;
@@ -5164,6 +5167,9 @@ bool RTFGo(void)
 
     SetCurrentOutput(Chapters);
 
+    if (stopRunning)
+        return FALSE;
+
     OnInform("Converting...");
 
     TraverseDocument();