added AddText() function (trivial wrapper around AddFile()), use it in debug rpt...

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

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index b7e06231a7fbe651097ac2a969dd4d181948f787..24eb9315207e999991538770f6a99da77c03eefb 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -2,7 +2,7 @@
 // Name:        tex2any.cpp
 // Purpose:     Utilities for Latex conversion.
 // Author:      Julian Smart
 // Name:        tex2any.cpp
 // Purpose:     Utilities for Latex conversion.
 // Author:      Julian Smart

-// Modified by: Wlodzimiez ABX Skiba 2003/2004 Unicode support
+// Modified by: Wlodzimierz ABX Skiba 2003/2004 Unicode support

 //              Ron Lee
 // Created:     01/01/99
 // RCS-ID:      $Id$
 //              Ron Lee
 // Created:     01/01/99
 // RCS-ID:      $Id$


@@ -38,7 +38,7 @@ static inline wxChar* copystring(const wxChar* s)
  * Variables accessible from clients
  *
  */
  * Variables accessible from clients
  *
  */

- 
+

 TexChunk *      DocumentTitle = NULL;
 TexChunk *      DocumentAuthor = NULL;
 TexChunk *      DocumentDate = NULL;
 TexChunk *      DocumentTitle = NULL;
 TexChunk *      DocumentAuthor = NULL;
 TexChunk *      DocumentDate = NULL;


@@ -109,15 +109,15 @@ int             subsectionFont = 12; // largeFont1;
 int             titleFont = LARGEFont3;
 int             authorFont = LargeFont2;
 int             mirrorMargins = true;
 int             titleFont = LARGEFont3;
 int             authorFont = LargeFont2;
 int             mirrorMargins = true;

-bool            winHelp = false;  // Output in Windows Help format if TRUE, linear otherwise
+bool            winHelp = false;  // Output in Windows Help format if true, linear otherwise

 bool            isInteractive = false;
 bool            runTwice = false;
 int             convertMode = TEX_RTF;
 bool            isInteractive = false;
 bool            runTwice = false;
 int             convertMode = TEX_RTF;

-bool            checkCurleyBraces = false;
+bool            checkCurlyBraces = false;

 bool            checkSyntax = false;
 bool            headerRule = false;
 bool            footerRule = false;
 bool            checkSyntax = false;
 bool            headerRule = false;
 bool            footerRule = false;

-bool            compatibilityMode = false; // If TRUE, maximum Latex compatibility
+bool            compatibilityMode = false; // If true, maximum Latex compatibility

                                 // (Quality of RTF generation deteriorate)
 bool            generateHPJ; // Generate WinHelp Help Project file
 wxChar         *winHelpTitle = NULL; // Windows Help title
                                 // (Quality of RTF generation deteriorate)
 bool            generateHPJ; // Generate WinHelp Help Project file
 wxChar         *winHelpTitle = NULL; // Windows Help title


@@ -151,7 +151,7 @@ wxChar         *followedLinkColourString = NULL;
 bool            combineSubSections = false;
 bool            htmlWorkshopFiles = false;
 bool            ignoreBadRefs = false;
 bool            combineSubSections = false;
 bool            htmlWorkshopFiles = false;
 bool            ignoreBadRefs = false;

-wxChar                 *htmlFaceName = NULL;
+wxChar         *htmlFaceName = NULL;

 
 extern int passNumber;
 
 
 extern int passNumber;
 


@@ -181,7 +181,7 @@ wxChar *UpNameString = copystring(_T("Up"));
  * Section numbering
  *
  */
  * Section numbering
  *
  */

- 
+

 int             chapterNo = 0;
 int             sectionNo = 0;
 int             subsectionNo = 0;
 int             chapterNo = 0;
 int             sectionNo = 0;
 int             subsectionNo = 0;


@@ -193,7 +193,7 @@ int             tableNo = 0;
  * Other variables
  *
  */
  * Other variables
  *
  */

- 
+

 FILE *CurrentOutput1 = NULL;
 FILE *CurrentOutput2 = NULL;
 FILE *Inputs[15];
 FILE *CurrentOutput1 = NULL;
 FILE *CurrentOutput2 = NULL;
 FILE *Inputs[15];


@@ -204,12 +204,12 @@ int CurrentInputIndex = 0;
 wxChar *TexFileRoot = NULL;
 wxChar *TexBibName = NULL;         // Bibliography output file name
 wxChar *TexTmpBibName = NULL;      // Temporary bibliography output file name
 wxChar *TexFileRoot = NULL;
 wxChar *TexBibName = NULL;         // Bibliography output file name
 wxChar *TexTmpBibName = NULL;      // Temporary bibliography output file name

-bool isSync = false;             // If TRUE, should not yield to other processes.
-bool stopRunning = false;        // If TRUE, should abort.
+bool isSync = false;             // If true, should not yield to other processes.
+bool stopRunning = false;        // If true, should abort.

 
 static int currentColumn = 0;
 wxChar *currentArgData = NULL;
 
 static int currentColumn = 0;
 wxChar *currentArgData = NULL;

-bool haveArgData = false; // If TRUE, we're simulating the data.
+bool haveArgData = false; // If true, we're simulating the data.

 TexChunk *currentArgument = NULL;
 TexChunk *nextChunk = NULL;
 bool isArgOptional = false;
 TexChunk *currentArgument = NULL;
 TexChunk *nextChunk = NULL;
 bool isArgOptional = false;


@@ -227,7 +227,7 @@ TexMacroDef *VerbatimMacroDef = NULL;
 
 
 TexRef::TexRef(const wxChar *label, const wxChar *file,
 
 
 TexRef::TexRef(const wxChar *label, const wxChar *file,

-              const wxChar *section, const wxChar *sectionN)
+               const wxChar *section, const wxChar *sectionN)

 {
     refLabel = copystring(label);
     refFile = file ? copystring(file) : (wxChar*) NULL;
 {
     refLabel = copystring(label);
     refFile = file ? copystring(file) : (wxChar*) NULL;


@@ -302,7 +302,7 @@ void ForbidWarning(TexMacroDef *def)
       break;
   }
 }
       break;
   }
 }

- 
+

 TexMacroDef *MatchMacro(wxChar *buffer, int *pos, wxChar **env, bool *parseToBrace)
 {
   *parseToBrace = true;
 TexMacroDef *MatchMacro(wxChar *buffer, int *pos, wxChar **env, bool *parseToBrace)
 {
   *parseToBrace = true;


@@ -359,11 +359,11 @@ TexMacroDef *MatchMacro(wxChar *buffer, int *pos, wxChar **env, bool *parseToBra
     macroBuf[j-i] = 0;
     def = (TexMacroDef *)MacroDefs.Get(macroBuf);
   }
     macroBuf[j-i] = 0;
     def = (TexMacroDef *)MacroDefs.Get(macroBuf);
   }

-    
+

   if (def)
   {
     i = j;
   if (def)
   {
     i = j;

-    
+

     // We want to check whether this is a space-consuming macro
     // (e.g. {\bf word})
     // No brace, e.g. \input thing.tex instead of \input{thing};
     // We want to check whether this is a space-consuming macro
     // (e.g. {\bf word})
     // No brace, e.g. \input thing.tex instead of \input{thing};


@@ -428,8 +428,8 @@ bool readInVerbatim = false;  // Within a verbatim, but not nec. verbatiminput
 // detection of \verb yet.
 // #define CHECK_BRACES 1
 
 // detection of \verb yet.
 // #define CHECK_BRACES 1
 

-unsigned long leftCurley = 0;
-unsigned long rightCurley = 0;
+unsigned long leftCurly = 0;
+unsigned long rightCurly = 0;

 static wxString currentFileName = _T("");
 
 bool read_a_line(wxChar *buf)
 static wxString currentFileName = _T("");
 
 bool read_a_line(wxChar *buf)


@@ -443,6 +443,7 @@ bool read_a_line(wxChar *buf)
   int ch = -2;
   unsigned long bufIndex = 0;
   buf[0] = 0;
   int ch = -2;
   unsigned long bufIndex = 0;
   buf[0] = 0;

+  int lastChar;

 
   while (ch != EOF && ch != 10)
   {
 
   while (ch != EOF && ch != 10)
   {


@@ -459,24 +460,25 @@ bool read_a_line(wxChar *buf)
          ((bufIndex == 16) && (wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0)))
       readInVerbatim = false;
 
          ((bufIndex == 16) && (wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0)))
       readInVerbatim = false;
 

+    lastChar = ch;

     ch = getc(Inputs[CurrentInputIndex]);
 
     ch = getc(Inputs[CurrentInputIndex]);
 

-    if (checkCurleyBraces)
+    if (checkCurlyBraces)

     {
     {

-        if (ch == '{' && !readInVerbatim)
-           leftCurley++;
-        if (ch == '}' && !readInVerbatim)
+        if (ch == '{' && !readInVerbatim && lastChar != _T('\\'))
+           leftCurly++;
+        if (ch == '}' && !readInVerbatim && lastChar != _T('\\'))

         {
         {

-           rightCurley++;
-           if (rightCurley > leftCurley)
+           rightCurly++;
+           if (rightCurly > leftCurly)

            {
                wxString errBuf;
            {
                wxString errBuf;

-               errBuf.Printf(_T("An extra right Curley brace ('}') was detected at line %lu inside file %s"), LineNumbers[CurrentInputIndex], (const wxChar*) currentFileName.c_str());
+               errBuf.Printf(_T("An extra right Curly brace ('}') was detected at line %lu inside file %s"), LineNumbers[CurrentInputIndex], (const wxChar*) currentFileName.c_str());

                OnError((wxChar *)errBuf.c_str());
 
                OnError((wxChar *)errBuf.c_str());
 

-               // Reduce the count of right Curley braces, so the mismatched count
+               // Reduce the count of right Curly braces, so the mismatched count

                // isn't reported on every line that has a '}' after the first mismatch
                // isn't reported on every line that has a '}' after the first mismatch

-               rightCurley--;
+               rightCurly--;

            }
         }
     }
            }
         }
     }


@@ -490,7 +492,7 @@ bool read_a_line(wxChar *buf)
         if ((ch1 == 10) || (ch1 == 13))
         {
           // Eliminate newline (10) following DOS linefeed
         if ((ch1 == 10) || (ch1 == 13))
         {
           // Eliminate newline (10) following DOS linefeed

-          if (ch1 == 13) 
+          if (ch1 == 13)

             getc(Inputs[CurrentInputIndex]);
           buf[bufIndex] = 0;
           IncrementLineNumber();
             getc(Inputs[CurrentInputIndex]);
           buf[bufIndex] = 0;
           IncrementLineNumber();


@@ -520,7 +522,7 @@ bool read_a_line(wxChar *buf)
              return false;
           }
 
              return false;
           }
 

-          buf[bufIndex] = ch;
+          buf[bufIndex] = (wxChar)ch;

           bufIndex ++;
         }
       }
           bufIndex ++;
         }
       }


@@ -535,7 +537,7 @@ bool read_a_line(wxChar *buf)
         case 0xfc: // ü
         case 0xd6: // Ö
         case 0xc4: // Ä
         case 0xfc: // ü
         case 0xd6: // Ö
         case 0xc4: // Ä

-        case 0xdc: // Ü     
+        case 0xdc: // Ü

                 if (bufIndex+5 >= MAX_LINE_BUFFER_SIZE)
                 {
                    wxString errBuf;
                 if (bufIndex+5 >= MAX_LINE_BUFFER_SIZE)
                 {
                    wxString errBuf;


@@ -554,11 +556,11 @@ bool read_a_line(wxChar *buf)
                     case 0xfc:buf[bufIndex++]='u';break; // ü
                     case 0xd6:buf[bufIndex++]='O';break; // Ö
                     case 0xc4:buf[bufIndex++]='A';break; // Ä
                     case 0xfc:buf[bufIndex++]='u';break; // ü
                     case 0xd6:buf[bufIndex++]='O';break; // Ö
                     case 0xc4:buf[bufIndex++]='A';break; // Ä

-                    case 0xdc:buf[bufIndex++]='U';break; // Ü                   
-                }               
+                    case 0xdc:buf[bufIndex++]='U';break; // Ü
+                }

                 buf[bufIndex++]='}';
                 break;
                 buf[bufIndex++]='}';
                 break;

-        case 0xdf: // ß 
+        case 0xdf: // ß

             if (bufIndex+5 >= MAX_LINE_BUFFER_SIZE)
             {
               wxString errBuf;
             if (bufIndex+5 >= MAX_LINE_BUFFER_SIZE)
             {
               wxString errBuf;


@@ -572,7 +574,7 @@ bool read_a_line(wxChar *buf)
             buf[bufIndex++]='s';
             buf[bufIndex++]='\\';
             buf[bufIndex++]='/';
             buf[bufIndex++]='s';
             buf[bufIndex++]='\\';
             buf[bufIndex++]='/';

-            break;  
+            break;

         default:
             if (bufIndex >= MAX_LINE_BUFFER_SIZE)
             {
         default:
             if (bufIndex >= MAX_LINE_BUFFER_SIZE)
             {


@@ -582,11 +584,11 @@ bool read_a_line(wxChar *buf)
               OnError((wxChar *)errBuf.c_str());
               return false;
             }
               OnError((wxChar *)errBuf.c_str());
               return false;
             }

-            // If the current character read in is a '_', we need to check 
+            // If the current character read in is a '_', we need to check

             // whether there should be a '\' before it or not
             if (ch != '_')
             {
             // whether there should be a '\' before it or not
             if (ch != '_')
             {

-                buf[bufIndex++] = ch;
+                buf[bufIndex++] = (wxChar)ch;

                 break;
             }
 
                 break;
             }
 


@@ -597,10 +599,10 @@ bool read_a_line(wxChar *buf)
                     // There should NOT be a '\' before the '_'
                     if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%'))
                     {
                     // There should NOT be a '\' before the '_'
                     if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%'))
                     {

-                        wxString errBuf;
-                        errBuf.Printf(_T("An underscore ('_') was detected at line %lu inside file %s that should NOT have a '\\' before it."),
-                            LineNumbers[CurrentInputIndex], (const wxChar*) currentFileName.c_str());
-                        OnError((wxChar *)errBuf.c_str());
+//                        wxString errBuf;
+//                        errBuf.Printf(_T("An underscore ('_') was detected at line %lu inside file %s that should NOT have a '\\' before it."),
+//                            LineNumbers[CurrentInputIndex], (const wxChar*) currentFileName.c_str());
+//                        OnError((wxChar *)errBuf.c_str());

                     }
                 }
                 else
                     }
                 }
                 else


@@ -623,7 +625,7 @@ bool read_a_line(wxChar *buf)
                     }
                 }
             }
                     }
                 }
             }

-            buf[bufIndex++] = ch;
+            buf[bufIndex++] = (wxChar)ch;

             break;
         }  // switch
       }  // else
             break;
         }  // switch
       }  // else


@@ -633,21 +635,21 @@ bool read_a_line(wxChar *buf)
       buf[bufIndex] = 0;
       fclose(Inputs[CurrentInputIndex]);
       Inputs[CurrentInputIndex] = NULL;
       buf[bufIndex] = 0;
       fclose(Inputs[CurrentInputIndex]);
       Inputs[CurrentInputIndex] = NULL;

-      if (CurrentInputIndex > 0) 
+      if (CurrentInputIndex > 0)

          ch = ' '; // No real end of file
       CurrentInputIndex --;
 
          ch = ' '; // No real end of file
       CurrentInputIndex --;
 

-      if (checkCurleyBraces)
+      if (checkCurlyBraces)

       {
       {

-          if (leftCurley != rightCurley)
+          if (leftCurly != rightCurly)

           {
             wxString errBuf;
           {
             wxString errBuf;

-            errBuf.Printf(_T("Curley braces do not match inside file %s\n%lu opens, %lu closes"),
-                          (const wxChar*) currentFileName.c_str(),leftCurley,rightCurley);
+            errBuf.Printf(_T("Curly braces do not match inside file %s\n%lu opens, %lu closes"),
+                          (const wxChar*) currentFileName.c_str(),leftCurly,rightCurly);

             OnError((wxChar *)errBuf.c_str());
           }
             OnError((wxChar *)errBuf.c_str());
           }

-          leftCurley = 0;
-          rightCurley = 0;
+          leftCurly = 0;
+          rightCurly = 0;

       }
 
       if (readingVerbatim)
       }
 
       if (readingVerbatim)


@@ -685,7 +687,7 @@ bool read_a_line(wxChar *buf)
       j -= 5;
       buf[j] = 0;
     }
       j -= 5;
       buf[j] = 0;
     }

-    
+

     if (buf[j-1] == '}')
         buf[j-1] = 0; // Ignore final brace
 
     if (buf[j-1] == '}')
         buf[j-1] = 0; // Ignore final brace
 


@@ -751,7 +753,7 @@ bool read_a_line(wxChar *buf)
       buf[j] = 0;
     }
 
       buf[j] = 0;
     }
 

-    if (buf[j-1] == _T('}')) 
+    if (buf[j-1] == _T('}'))

         buf[j-1] = 0; // Ignore final brace
 
     // Remove backslashes from name
         buf[j-1] = 0; // Ignore final brace
 
     // Remove backslashes from name


@@ -811,7 +813,7 @@ bool read_a_line(wxChar *buf)
   if (checkSyntax)
   {
       wxString bufStr = buf;
   if (checkSyntax)
   {
       wxString bufStr = buf;

-      for (int index=0; syntaxTokens[index] != wxEmptyString; index++)
+      for (int index=0; !syntaxTokens[index].empty(); index++)

       {
           size_t pos = bufStr.find(syntaxTokens[index]);
           if (pos != wxString::npos && pos != 0)
       {
           size_t pos = bufStr.find(syntaxTokens[index]);
           if (pos != wxString::npos && pos != 0)


@@ -847,13 +849,13 @@ bool read_a_line(wxChar *buf)
            wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0)
     readInVerbatim = false;
 
            wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0)
     readInVerbatim = false;
 

-  if (checkCurleyBraces)
+  if (checkCurlyBraces)

   {
   {

-      if (ch == EOF && leftCurley != rightCurley)
+      if (ch == EOF && leftCurly != rightCurly)

       {
         wxString errBuf;
       {
         wxString errBuf;

-        errBuf.Printf(_T("Curley braces do not match inside file %s\n%lu opens, %lu closes"),
-            (const wxChar*) currentFileName.c_str(),leftCurley,rightCurley);
+        errBuf.Printf(_T("Curly braces do not match inside file %s\n%lu opens, %lu closes"),
+            (const wxChar*) currentFileName.c_str(),leftCurly,rightCurly);

         OnError((wxChar *)errBuf.c_str());
       }
   }
         OnError((wxChar *)errBuf.c_str());
       }
   }


@@ -899,7 +901,7 @@ bool ParseNewCommand(wxChar *buffer, int *pos)
     int braceCount = 0;
     while (!end)
     {
     int braceCount = 0;
     while (!end)
     {

-      char ch = buffer[*pos];
+      wxChar ch = buffer[*pos];

       if (ch == _T('{'))
         braceCount ++;
       else if (ch == _T('}'))
       if (ch == _T('{'))
         braceCount ++;
       else if (ch == _T('}'))


@@ -940,7 +942,7 @@ void MacroError(wxChar *buffer)
   wxChar macroBuf[200];
   macroBuf[0] = '\\';
   int i = 1;
   wxChar macroBuf[200];
   macroBuf[0] = '\\';
   int i = 1;

-  char ch;
+  wxChar ch;

   while (((ch = buffer[i-1]) != '\n') && (ch != 0))
   {
     macroBuf[i] = ch;
   while (((ch = buffer[i-1]) != '\n') && (ch != 0))
   {
     macroBuf[i] = ch;


@@ -965,7 +967,7 @@ void MacroError(wxChar *buffer)
  * Parse an argument.
  * 'environment' specifies the name of the macro IFF if we're looking for the end
  * of an environment, e.g. \end{itemize}. Otherwise it's NULL.
  * Parse an argument.
  * 'environment' specifies the name of the macro IFF if we're looking for the end
  * of an environment, e.g. \end{itemize}. Otherwise it's NULL.

- * 'parseToBrace' is TRUE if the argument should extend to the next right brace,
+ * 'parseToBrace' is true if the argument should extend to the next right brace,

  * e.g. in {\bf an argument} as opposed to \vskip 30pt
  *
  */
  * e.g. in {\bf an argument} as opposed to \vskip 30pt
  *
  */


@@ -973,7 +975,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
 {
   Tex2RTFYield();
   if (stopRunning) return pos;
 {
   Tex2RTFYield();
   if (stopRunning) return pos;

-  
+

   bool eof = false;
   BigBuffer[0] = 0;
   int buf_ptr = 0;
   bool eof = false;
   BigBuffer[0] = 0;
   int buf_ptr = 0;


@@ -1003,7 +1005,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
     }
   }
 */
     }
   }
 */

-    
+

   // If not parsing to brace, just read the next word
   // (e.g. \vskip 20pt)
   if (!parseToBrace)
   // If not parsing to brace, just read the next word
   // (e.g. \vskip 20pt)
   if (!parseToBrace)


@@ -1012,7 +1014,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
     while (!eof && ch != 13 && ch != 32 && ch != 10 &&
            ch != 0 && ch != '{')
     {
     while (!eof && ch != 13 && ch != 32 && ch != 10 &&
            ch != 0 && ch != '{')
     {

-      BigBuffer[buf_ptr] = ch;
+      BigBuffer[buf_ptr] = (wxChar)ch;

       buf_ptr ++;
       pos ++;
       ch = buffer[pos];
       buf_ptr ++;
       pos ++;
       ch = buffer[pos];


@@ -1091,15 +1093,15 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
       }
     }
 
       }
     }
 

-    char ch = buffer[pos];
+    wxChar wxCh = buffer[pos];

     // End of optional argument -- pretend it's right brace for simplicity
     // End of optional argument -- pretend it's right brace for simplicity

-    if (thisArg->optional && (ch == ']'))
-      ch = '}';
+    if (thisArg->optional && (wxCh == _T(']')))
+      wxCh = _T('}');

 
 

-    switch (ch)
+    switch (wxCh)

     {
       case 0:
     {
       case 0:

-      case '}':  // End of argument
+      case _T('}'):  // End of argument

       {
         if (buf_ptr > 0)
         {
       {
         if (buf_ptr > 0)
         {


@@ -1108,10 +1110,10 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
           chunk->value = copystring(BigBuffer);
           children.Append((wxObject *)chunk);
         }
           chunk->value = copystring(BigBuffer);
           children.Append((wxObject *)chunk);
         }

-        if (ch == '}') pos ++;
+        if (wxCh == _T('}')) pos ++;

         return pos;
       }
         return pos;
       }

-      case '\\':
+      case _T('\\'):

       {
         if (buf_ptr > 0)  // Finish off the string we've read so far
         {
       {
         if (buf_ptr > 0)  // Finish off the string we've read so far
         {


@@ -1122,7 +1124,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
           children.Append((wxObject *)chunk);
         }
         pos ++;
           children.Append((wxObject *)chunk);
         }
         pos ++;

-        
+

         // Try matching \end{environment}
         if (environment && FindEndEnvironment(buffer, &pos, environment))
         {
         // Try matching \end{environment}
         if (environment && FindEndEnvironment(buffer, &pos, environment))
         {


@@ -1152,8 +1154,8 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
           bool end = false;
           while (!end)
           {
           bool end = false;
           while (!end)
           {

-            int ch = buffer[pos];
-            if (ch == '}')
+            wxChar ch = buffer[pos];
+            if (ch == _T('}'))

             {
               noBraces --;
               if (noBraces == 0)
             {
               noBraces --;
               if (noBraces == 0)


@@ -1163,26 +1165,26 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
               }
               else
               {
               }
               else
               {

-                wxTex2RTFBuffer[i] = '}';
+                wxTex2RTFBuffer[i] = _T('}');

                 i ++;
               }
               pos ++;
             }
                 i ++;
               }
               pos ++;
             }

-            else if (ch == '{')
+            else if (ch == _T('{'))

             {
             {

-              wxTex2RTFBuffer[i] = '{';
+              wxTex2RTFBuffer[i] = _T('{');

               i ++;
               pos ++;
             }
               i ++;
               pos ++;
             }

-            else if (ch == '\\' && buffer[pos+1] == '}')
+            else if (ch == _T('\\') && buffer[pos+1] == _T('}'))

             {
             {

-              wxTex2RTFBuffer[i] = '}';
+              wxTex2RTFBuffer[i] = _T('}');

               pos += 2;
               i++;
             }
               pos += 2;
               i++;
             }

-            else if (ch == '\\' && buffer[pos+1] == '{')
+            else if (ch == _T('\\') && buffer[pos+1] == _T('{'))

             {
             {

-              wxTex2RTFBuffer[i] = '{';
+              wxTex2RTFBuffer[i] = _T('{');

               pos += 2;
               i++;
             }
               pos += 2;
               i++;
             }


@@ -1216,11 +1218,11 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
         else if (wxStrncmp(buffer+pos, _T("verb"), 4) == 0)
         {
           pos += 4;
         else if (wxStrncmp(buffer+pos, _T("verb"), 4) == 0)
         {
           pos += 4;

-          if (buffer[pos] == '*')
+          if (buffer[pos] == _T('*'))

             pos ++;
 
             pos ++;
 

-          // Find the delimiter character         
-          int ch = buffer[pos];
+          // Find the delimiter character
+          wxChar ch = buffer[pos];

           pos ++;
           // Now at start of verbatim text
           int j = pos;
           pos ++;
           // Now at start of verbatim text
           int j = pos;


@@ -1254,8 +1256,8 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
 
           children.Append((wxObject *)chunk);
         }
 
           children.Append((wxObject *)chunk);
         }

-    else
-    {
+        else
+        {

           wxChar *env = NULL;
           bool tmpParseToBrace = true;
           TexMacroDef *def = MatchMacro(buffer, &pos, &env, &tmpParseToBrace);
           wxChar *env = NULL;
           bool tmpParseToBrace = true;
           TexMacroDef *def = MatchMacro(buffer, &pos, &env, &tmpParseToBrace);


@@ -1295,7 +1297,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
               wxStrcat(macroBuf, _T("}"));
               ParseArg(thisArg, children, macroBuf, 0, NULL, true, chunk);
             }
               wxStrcat(macroBuf, _T("}"));
               ParseArg(thisArg, children, macroBuf, 0, NULL, true, chunk);
             }

-            
+

 //            delete chunk; // Might delete children
           }
         }
 //            delete chunk; // Might delete children
           }
         }


@@ -1308,10 +1310,10 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
       }
       // Parse constructs like {\bf thing} as if they were
       // \bf{thing}
       }
       // Parse constructs like {\bf thing} as if they were
       // \bf{thing}

-      case '{':
+      case _T('{'):

       {
         pos ++;
       {
         pos ++;

-        if (buffer[pos] == '\\')
+        if (buffer[pos] == _T('\\'))

         {
           if (buf_ptr > 0)
           {
         {
           if (buf_ptr > 0)
           {


@@ -1351,7 +1353,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
                 wxStrcat(macroBuf, _T("}"));
                 ParseArg(thisArg, children, macroBuf, 0, NULL, true, chunk);
               }
                 wxStrcat(macroBuf, _T("}"));
                 ParseArg(thisArg, children, macroBuf, 0, NULL, true, chunk);
               }

-            
+

 //            delete chunk; // Might delete children
         }
           }
 //            delete chunk; // Might delete children
         }
           }


@@ -1361,7 +1363,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
           }
         }
         else
           }
         }
         else

-    {
+        {

          /*
           * If all else fails, we assume that we have
           * a pair of braces on their own, so return a `dummy' macro
          /*
           * If all else fails, we assume that we have
           * a pair of braces on their own, so return a `dummy' macro


@@ -1394,10 +1396,10 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
           arg->macroId = chunk->macroId;
 
           pos = ParseArg(arg, arg->children, buffer, pos, NULL, true, customMacroArgs);
           arg->macroId = chunk->macroId;
 
           pos = ParseArg(arg, arg->children, buffer, pos, NULL, true, customMacroArgs);

-    }
+        }

         break;
       }
         break;
       }

-      case '$':
+      case _T('$'):

       {
         if (buf_ptr > 0)
         {
       {
         if (buf_ptr > 0)
         {


@@ -1410,7 +1412,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
 
         pos ++;
 
 
         pos ++;
 

-        if (buffer[pos] == '$')
+        if (buffer[pos] == _T('$'))

         {
           TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO);
           chunk->no_args = 0;
         {
           TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO);
           chunk->no_args = 0;


@@ -1429,7 +1431,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
         }
         break;
       }
         }
         break;
       }

-      case '~':
+      case _T('~'):

       {
         if (buf_ptr > 0)
         {
       {
         if (buf_ptr > 0)
         {


@@ -1448,7 +1450,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
         children.Append((wxObject *)chunk);
         break;
       }
         children.Append((wxObject *)chunk);
         break;
       }

-      case '#': // Either treat as a special TeX character or as a macro arg
+      case _T('#'): // Either treat as a special TeX character or as a macro arg

       {
         if (buf_ptr > 0)
         {
       {
         if (buf_ptr > 0)
         {


@@ -1484,12 +1486,12 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
         }
         break;
       }
         }
         break;
       }

-      case '&':
+      case _T('&'):

       {
         // Remove white space before and after the ampersand,
         // since this is probably a table column separator with
         // some convenient -- but useless -- white space in the text.
       {
         // Remove white space before and after the ampersand,
         // since this is probably a table column separator with
         // some convenient -- but useless -- white space in the text.

-        while ((buf_ptr > 0) && ((BigBuffer[buf_ptr-1] == ' ') || (BigBuffer[buf_ptr-1] == 9)))
+        while ((buf_ptr > 0) && ((BigBuffer[buf_ptr-1] == _T(' ')) || (BigBuffer[buf_ptr-1] == 9)))

           buf_ptr --;
 
         if (buf_ptr > 0)
           buf_ptr --;
 
         if (buf_ptr > 0)


@@ -1503,7 +1505,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
 
         pos ++;
 
 
         pos ++;
 

-        while (buffer[pos] == ' ' || buffer[pos] == 9)
+        while (buffer[pos] == _T(' ') || buffer[pos] == 9)

           pos ++;
 
         TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO);
           pos ++;
 
         TexChunk *chunk = new TexChunk(CHUNK_TYPE_MACRO);


@@ -1514,13 +1516,13 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
         break;
       }
       // Eliminate end-of-line comment
         break;
       }
       // Eliminate end-of-line comment

-      case '%':
+      case _T('%'):

       {
       {

-        ch = buffer[pos];
-        while (ch != 10 && ch != 13 && ch != 0)
+        wxCh = buffer[pos];
+        while (wxCh != 10 && wxCh != 13 && wxCh != 0)

         {
           pos ++;
         {
           pos ++;

-          ch = buffer[pos];
+          wxCh = buffer[pos];

         }
         if (buffer[pos] == 10 || buffer[pos] == 13)
         {
         }
         if (buffer[pos] == 10 || buffer[pos] == 13)
         {


@@ -1532,7 +1534,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
       // Eliminate tab
       case 9:
       {
       // Eliminate tab
       case 9:
       {

-        BigBuffer[buf_ptr] = ' ';
+        BigBuffer[buf_ptr] = _T(' ');

         BigBuffer[buf_ptr+1] = 0;
         buf_ptr ++;
         pos ++;
         BigBuffer[buf_ptr+1] = 0;
         buf_ptr ++;
         pos ++;


@@ -1540,7 +1542,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
       }
       default:
       {
       }
       default:
       {

-        BigBuffer[buf_ptr] = ch;
+        BigBuffer[buf_ptr] = wxCh;

         BigBuffer[buf_ptr+1] = 0;
         buf_ptr ++;
         pos ++;
         BigBuffer[buf_ptr+1] = 0;
         buf_ptr ++;
         pos ++;


@@ -1555,7 +1557,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, wxChar *buffer, int pos, wxCha
  * Consume as many arguments as the macro definition specifies
  *
  */
  * Consume as many arguments as the macro definition specifies
  *
  */

- 
+

 int ParseMacroBody(const wxChar *WXUNUSED(macro_name), TexChunk *parent,
                    int no_args, wxChar *buffer, int pos,
                    wxChar *environment, bool parseToBrace,
 int ParseMacroBody(const wxChar *WXUNUSED(macro_name), TexChunk *parent,
                    int no_args, wxChar *buffer, int pos,
                    wxChar *environment, bool parseToBrace,


@@ -1672,11 +1674,11 @@ bool TexLoadFile(wxChar *filename)
 
   TexPathList.EnsureFileAccessible(filename);
 
 
   TexPathList.EnsureFileAccessible(filename);
 

-  if (line_buffer) 
+  if (line_buffer)

       delete line_buffer;
 
   line_buffer = new wxChar[MAX_LINE_BUFFER_SIZE];
       delete line_buffer;
 
   line_buffer = new wxChar[MAX_LINE_BUFFER_SIZE];

-  
+

   Inputs[0] = wxFopen(filename, _T("r"));
   LineNumbers[0] = 1;
   FileNames[0] = copystring(filename);
   Inputs[0] = wxFopen(filename, _T("r"));
   LineNumbers[0] = 1;
   FileNames[0] = copystring(filename);


@@ -1723,7 +1725,7 @@ TexChunk::TexChunk(TexChunk& toCopy)
   no_args = toCopy.no_args;
   argn = toCopy.argn;
   macroId = toCopy.macroId;
   no_args = toCopy.no_args;
   argn = toCopy.argn;
   macroId = toCopy.macroId;

-  
+

 //  if (toCopy.name)
 //    name = copystring(toCopy.name);
 //  else
 //  if (toCopy.name)
 //    name = copystring(toCopy.name);
 //  else


@@ -1734,7 +1736,7 @@ TexChunk::TexChunk(TexChunk& toCopy)
     value = copystring(toCopy.value);
   else
     value = NULL;
     value = copystring(toCopy.value);
   else
     value = NULL;

-  
+

   optional = toCopy.optional;
   wxNode *node = toCopy.children.GetFirst();
   while (node)
   optional = toCopy.optional;
   wxNode *node = toCopy.children.GetFirst();
   while (node)


@@ -1774,7 +1776,7 @@ int GetNoArgs(void) // Number of args for this macro
  * only!)
  *
  */
  * only!)
  *
  */

- 
+

 void GetArgData1(TexChunk *chunk)
 {
   switch (chunk->type)
 void GetArgData1(TexChunk *chunk)
 {
   switch (chunk->type)


@@ -2056,22 +2058,22 @@ void TexCleanUp(void)
   }
 /**/
   TexReferences.BeginFind();
   }
 /**/
   TexReferences.BeginFind();

-  wxNode *node = TexReferences.Next();
-  while (node)
+  wxHashTable::Node *refNode = TexReferences.Next();
+  while (refNode)

   {
   {

-    TexRef *ref = (TexRef *)node->GetData();
+    TexRef *ref = (TexRef *)refNode->GetData();

     delete ref;
     delete ref;

-    node = TexReferences.Next();
+    refNode = TexReferences.Next();

   }
   TexReferences.Clear();
   }
   TexReferences.Clear();

-  
-  node = BibList.GetFirst();
-  while (node)
+
+  wxNode* bibNode = BibList.GetFirst();
+  while (bibNode)

   {
   {

-    BibEntry *entry = (BibEntry *)node->GetData();
+    BibEntry *entry = (BibEntry *)bibNode->GetData();

     delete entry;
     delete entry;

-    delete node;
-    node = BibList.GetFirst();
+    delete bibNode;
+    bibNode = BibList.GetFirst();

   }
   CitationList.Clear();
   ResetTopicCounter();
   }
   CitationList.Clear();
   ResetTopicCounter();


@@ -2504,7 +2506,7 @@ void DefineDefaultMacros(void)
   AddMacroDef(ltUPSHAPE,             _T("upshape"), 1);
   AddMacroDef(ltURLREF,              _T("urlref"), 2);
   AddMacroDef(ltUSEPACKAGE,          _T("usepackage"), 1);
   AddMacroDef(ltUPSHAPE,             _T("upshape"), 1);
   AddMacroDef(ltURLREF,              _T("urlref"), 2);
   AddMacroDef(ltUSEPACKAGE,          _T("usepackage"), 1);

-  
+

   AddMacroDef(ltVAREPSILON,          _T("varepsilon"), 0);
   AddMacroDef(ltVARPHI,              _T("varphi"), 0);
   AddMacroDef(ltVARPI,               _T("varpi"), 0);
   AddMacroDef(ltVAREPSILON,          _T("varepsilon"), 0);
   AddMacroDef(ltVARPHI,              _T("varphi"), 0);
   AddMacroDef(ltVARPI,               _T("varpi"), 0);


@@ -2568,7 +2570,7 @@ void DefineDefaultMacros(void)
  * Default behaviour, should be called by client if can't match locally.
  *
  */
  * Default behaviour, should be called by client if can't match locally.
  *
  */

- 
+

 // Called on start/end of macro examination
 void DefaultOnMacro(int macroId, int no_args, bool start)
 {
 // Called on start/end of macro examination
 void DefaultOnMacro(int macroId, int no_args, bool start)
 {


@@ -2689,7 +2691,7 @@ void DefaultOnMacro(int macroId, int no_args, bool start)
         TexOutput(_T("(r)"), true);
       break;
     case ltBACKSLASH:
         TexOutput(_T("(r)"), true);
       break;
     case ltBACKSLASH:

-      if (start)    
+      if (start)

         TexOutput(_T("\\"), true);
       break;
     case ltLDOTS:
         TexOutput(_T("\\"), true);
       break;
     case ltLDOTS:


@@ -2711,7 +2713,8 @@ void DefaultOnMacro(int macroId, int no_args, bool start)
       break;
     case ltPOUNDS:
       if (start)
       break;
     case ltPOUNDS:
       if (start)

-        TexOutput(_T("£"), true);
+        // FIXME: this is valid only if the output is iso-8859-1
+        TexOutput(wxString::FromAscii("£"), true);

       break;
     case ltSPECIALDOUBLEDOLLAR:  // Interpret as center
       OnMacro(ltCENTER, no_args, start);
       break;
     case ltSPECIALDOUBLEDOLLAR:  // Interpret as center
       OnMacro(ltCENTER, no_args, start);


@@ -3172,7 +3175,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
         else
         {
            wxString informBuf;
         else
         {
            wxString informBuf;

-           informBuf.Printf(_T("Warning: unresolved reference '%s'"), refName); 
+           informBuf.Printf(_T("Warning: unresolved reference '%s'"), refName);

            OnInform((wxChar *)informBuf.c_str());
         }
       }
            OnInform((wxChar *)informBuf.c_str());
         }
       }


@@ -3220,7 +3223,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
         DocumentStyle = LATEX_LETTER;
       else if (wxStrncmp(DocumentStyleString, _T("slides"), 6) == 0)
         DocumentStyle = LATEX_SLIDES;
         DocumentStyle = LATEX_LETTER;
       else if (wxStrncmp(DocumentStyleString, _T("slides"), 6) == 0)
         DocumentStyle = LATEX_SLIDES;

-        
+

       if (StringMatch(_T("10"), DocumentStyleString))
         SetFontSizes(10);
       else if (StringMatch(_T("11"), DocumentStyleString))
       if (StringMatch(_T("10"), DocumentStyleString))
         SetFontSizes(10);
       else if (StringMatch(_T("11"), DocumentStyleString))


@@ -3434,12 +3437,12 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
       if (fd)
       {
         ch = getc(fd);
       if (fd)
       {
         ch = getc(fd);

-        smallBuf[0] = ch;
+        smallBuf[0] = (wxChar)ch;

         while (ch != EOF)
         {
           TexOutput(smallBuf);
           ch = getc(fd);
         while (ch != EOF)
         {
           TexOutput(smallBuf);
           ch = getc(fd);

-          smallBuf[0] = ch;
+          smallBuf[0] = (wxChar)ch;

         }
         fclose(fd);
       }
         }
         fclose(fd);
       }


@@ -3513,7 +3516,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
         wxChar *s1 = copystring(s);
         int i;
         for (i = 0; i < (int)wxStrlen(s); i++)
         wxChar *s1 = copystring(s);
         int i;
         for (i = 0; i < (int)wxStrlen(s); i++)

-          s1[i] = wxToupper(s[i]);
+          s1[i] = (wxChar)wxToupper(s[i]);

         TexOutput(s1);
         delete[] s1;
         return false;
         TexOutput(s1);
         delete[] s1;
         return false;


@@ -3533,7 +3536,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
         wxChar *s1 = copystring(s);
         int i;
         for (i = 0; i < (int)wxStrlen(s); i++)
         wxChar *s1 = copystring(s);
         int i;
         for (i = 0; i < (int)wxStrlen(s); i++)

-          s1[i] = wxTolower(s[i]);
+          s1[i] = (wxChar)wxTolower(s[i]);

         TexOutput(s1);
         delete[] s1;
         return false;
         TexOutput(s1);
         delete[] s1;
         return false;


@@ -3553,7 +3556,7 @@ bool DefaultOnArgument(int macroId, int arg_no, bool start)
         wxChar *s1 = copystring(s);
         int i;
         for (i = 0; i < (int)wxStrlen(s); i++)
         wxChar *s1 = copystring(s);
         int i;
         for (i = 0; i < (int)wxStrlen(s); i++)

-          s1[i] = wxToupper(s[i]);
+          s1[i] = (wxChar)wxToupper(s[i]);

         TexOutput(s1);
         delete[] s1;
         return false;
         TexOutput(s1);
         delete[] s1;
         return false;