Lots of release bugs fixed

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

diff --git a/utils/tex2rtf/src/xlputils.cpp b/utils/tex2rtf/src/xlputils.cpp
index bcbc4a0fb72f5634861f91e50c40d8806f21f6b7..b687adbf4531461759129aea54064335dcea807d 100644 (file)
--- a/utils/tex2rtf/src/xlputils.cpp
+++ b/utils/tex2rtf/src/xlputils.cpp
@@ -2,7 +2,8 @@
 // Name:        xlputils.cpp
 // Purpose:     Converts Latex to obsolete XLP format
 // Author:      Julian Smart
 // Name:        xlputils.cpp
 // Purpose:     Converts Latex to obsolete XLP format
 // Author:      Julian Smart

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

 // Created:     7.9.93
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     7.9.93
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart


@@ -21,31 +22,39 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"

 #endif
 
 #include "tex2any.h"
 #include "tex2rtf.h"
 #include <ctype.h>
 
 #endif
 
 #include "tex2any.h"
 #include "tex2rtf.h"
 #include <ctype.h>
 

+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+#endif
+

 long currentBlockId = -1;
 static TexChunk *descriptionItemArg = NULL;
 static int indentLevel = 0;
 static int noColumns = 0;
 static int currentTab = 0;
 long currentBlockId = -1;
 static TexChunk *descriptionItemArg = NULL;
 static int indentLevel = 0;
 static int noColumns = 0;
 static int currentTab = 0;

-static bool tableVerticalLineLeft = FALSE;
-static bool tableVerticalLineRight = FALSE;
-static bool inTable = FALSE;
+static bool tableVerticalLineLeft = false;
+static bool tableVerticalLineRight = false;
+static bool inTable = false;

 static int citeCount = 1;
 wxList hyperLinks(wxKEY_INTEGER);
 wxList hyperLabels(wxKEY_STRING);
 FILE *Index = NULL;
 
 static int citeCount = 1;
 wxList hyperLinks(wxKEY_INTEGER);
 wxList hyperLabels(wxKEY_STRING);
 FILE *Index = NULL;
 

+
+extern wxHashTable TexReferences;
+
+

 void PadToTab(int tabPos)
 {
   int currentCol = GetCurrentColumn();
   for (int i = currentCol; i < tabPos; i++)
 void PadToTab(int tabPos)
 {
   int currentCol = GetCurrentColumn();
   for (int i = currentCol; i < tabPos; i++)

-    TexOutput(" ", TRUE);
+    TexOutput(_T(" "), true);

 }
 
 static long xlpBlockId = 0;
 }
 
 static long xlpBlockId = 0;


@@ -57,7 +66,7 @@ long NewBlockId(void)
 // Called on start/end of macro examination
 void XLPOnMacro(int macroId, int no_args, bool start)
 {
 // Called on start/end of macro examination
 void XLPOnMacro(int macroId, int no_args, bool start)
 {

-  char buf[100];
+  wxChar buf[100];

   switch (macroId)
   {
   case ltCHAPTER:
   switch (macroId)
   {
   case ltCHAPTER:


@@ -77,17 +86,17 @@ void XLPOnMacro(int macroId, int no_args, bool start)
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 

-      startedSections = TRUE;
-      fprintf(Contents, "\\hy-%d{%ld}{", hyBLOCK_SMALL_HEADING, id1);
-      fprintf(Chapters, "\n\\hy-%d{%ld}{", hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
-      fprintf(Index, "%ld %ld\n", id1, currentBlockId);
+      startedSections = true;
+      wxFprintf(Contents, _T("\\hy-%d{%ld}{"), hyBLOCK_SMALL_HEADING, id1);
+      wxFprintf(Chapters, _T("\n\\hy-%d{%ld}{"), hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
+      wxFprintf(Index, _T("%ld %ld\n"), id1, currentBlockId);

 
       OutputCurrentSection(); // Repeat section header
 
 
       OutputCurrentSection(); // Repeat section header
 

-      fprintf(Contents, "}\n\n");
-      fprintf(Chapters, "}\n\n");
+      wxFprintf(Contents, _T("}\n\n"));
+      wxFprintf(Chapters, _T("}\n\n"));

       SetCurrentOutput(Chapters);
       SetCurrentOutput(Chapters);

-      char *topicName = FindTopicName(GetNextChunk());
+      wxChar *topicName = FindTopicName(GetNextChunk());

       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;
       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;


@@ -109,24 +118,24 @@ void XLPOnMacro(int macroId, int no_args, bool start)
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 

-      startedSections = TRUE;
+      startedSections = true;

 
       if (DocumentStyle == LATEX_ARTICLE)
 
       if (DocumentStyle == LATEX_ARTICLE)

-        fprintf(Contents, "\\hy-%d{%ld}{", hyBLOCK_LARGE_HEADING, id1);
+        wxFprintf(Contents, _T("\\hy-%d{%ld}{"), hyBLOCK_LARGE_HEADING, id1);

       else
       else

-        fprintf(Chapters, "\\hy-%d{%ld}{", hyBLOCK_BOLD, id1);
-      fprintf(Sections, "\n\\hy-%d{%ld}{", hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
-      fprintf(Index, "%ld %ld\n", id1, currentBlockId);
+        wxFprintf(Chapters, _T("\\hy-%d{%ld}{"), hyBLOCK_BOLD, id1);
+      wxFprintf(Sections, _T("\n\\hy-%d{%ld}{"), hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
+      wxFprintf(Index, _T("%ld %ld\n"), id1, currentBlockId);

 
       OutputCurrentSection(); // Repeat section header
 
       if (DocumentStyle == LATEX_ARTICLE)
 
       OutputCurrentSection(); // Repeat section header
 
       if (DocumentStyle == LATEX_ARTICLE)

-        fprintf(Contents, "}\n\n");
+        wxFprintf(Contents, _T("}\n\n"));

       else
       else

-        fprintf(Chapters, "}\n\n");
-      fprintf(Sections, "}\n\n");
+        wxFprintf(Chapters, _T("}\n\n"));
+      wxFprintf(Sections, _T("}\n\n"));

       SetCurrentOutput(Sections);
       SetCurrentOutput(Sections);

-      char *topicName = FindTopicName(GetNextChunk());
+      wxChar *topicName = FindTopicName(GetNextChunk());

       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;
       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;


@@ -146,16 +155,16 @@ void XLPOnMacro(int macroId, int no_args, bool start)
       SetCurrentOutputs(Sections, Subsections);
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
       SetCurrentOutputs(Sections, Subsections);
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();

-      fprintf(Sections, "\\hy-%d{%ld}{", hyBLOCK_BOLD, id1);
-      fprintf(Subsections, "\n\\hy-%d{%ld}{", hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
-      fprintf(Index, "%ld %ld\n", id1, currentBlockId);
+      wxFprintf(Sections, _T("\\hy-%d{%ld}{"), hyBLOCK_BOLD, id1);
+      wxFprintf(Subsections, _T("\n\\hy-%d{%ld}{"), hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
+      wxFprintf(Index, _T("%ld %ld\n"), id1, currentBlockId);

 
       OutputCurrentSection(); // Repeat section header
 
 
       OutputCurrentSection(); // Repeat section header
 

-      fprintf(Sections, "}\n\n");
-      fprintf(Subsections, "}\n\n");
+      wxFprintf(Sections, _T("}\n\n"));
+      wxFprintf(Subsections, _T("}\n\n"));

       SetCurrentOutput(Subsections);
       SetCurrentOutput(Subsections);

-      char *topicName = FindTopicName(GetNextChunk());
+      wxChar *topicName = FindTopicName(GetNextChunk());

       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;
       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;


@@ -171,16 +180,16 @@ void XLPOnMacro(int macroId, int no_args, bool start)
       SetCurrentOutputs(Subsections, Subsubsections);
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
       SetCurrentOutputs(Subsections, Subsubsections);
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();

-      fprintf(Subsections, "\\hy-%d{%ld}{", hyBLOCK_BOLD, id1);
-      fprintf(Subsubsections, "\n\\hy-%d{%ld}{", hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
-      fprintf(Index, "%ld %ld\n", id1, currentBlockId);
+      wxFprintf(Subsections, _T("\\hy-%d{%ld}{"), hyBLOCK_BOLD, id1);
+      wxFprintf(Subsubsections, _T("\n\\hy-%d{%ld}{"), hyBLOCK_LARGE_VISIBLE_SECTION, currentBlockId);
+      wxFprintf(Index, _T("%ld %ld\n"), id1, currentBlockId);

 
       OutputCurrentSection(); // Repeat section header
 
 
       OutputCurrentSection(); // Repeat section header
 

-      fprintf(Subsections, "}\n\n");
-      fprintf(Subsubsections, "}\n\n");
+      wxFprintf(Subsections, _T("}\n\n"));
+      wxFprintf(Subsubsections, _T("}\n\n"));

       SetCurrentOutput(Subsubsections);
       SetCurrentOutput(Subsubsections);

-      char *topicName = FindTopicName(GetNextChunk());
+      wxChar *topicName = FindTopicName(GetNextChunk());

       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;
       hyperLabels.Append(topicName, (wxObject *)currentBlockId);
     }
     break;


@@ -193,27 +202,27 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     if (start)
     {
       long id = NewBlockId();
     if (start)
     {
       long id = NewBlockId();

-      fprintf(Subsections, "\\hy-%d{%ld}{", hyBLOCK_BOLD, id);
+      wxFprintf(Subsections, _T("\\hy-%d{%ld}{"), hyBLOCK_BOLD, id);

     }
     else
     }
     else

-      fprintf(Subsections, "}");
+      wxFprintf(Subsections, _T("}"));

     break;
   }
   case ltVOID:
 //    if (start)
     break;
   }
   case ltVOID:
 //    if (start)

-//      TexOutput("void", TRUE);
+//      TexOutput(_T("void"), true);

     break;
   case ltBACKSLASHCHAR:
     if (start)
     break;
   case ltBACKSLASHCHAR:
     if (start)

-      TexOutput("\n", TRUE);
+      TexOutput(_T("\n"), true);

     break;
   case ltPAR:
   {
     if (start)
     {
       if (ParSkip > 0)
     break;
   case ltPAR:
   {
     if (start)
     {
       if (ParSkip > 0)

-        TexOutput("\n", TRUE);
-      TexOutput("\n", TRUE);
+        TexOutput(_T("\n"), true);
+      TexOutput(_T("\n"), true);

     }
     break;
   }
     }
     break;
   }


@@ -229,12 +238,12 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      char buf[100];
+      wxChar buf[100];

       long id = NewBlockId();
       long id = NewBlockId();

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_BOLD, id);
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_BOLD, id);

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltTEXTIT:
     break;
   }
   case ltTEXTIT:


@@ -243,12 +252,12 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      char buf[100];
+      wxChar buf[100];

       long id = NewBlockId();
       long id = NewBlockId();

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_ITALIC, id);
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_ITALIC, id);

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltTTFAMILY:
     break;
   }
   case ltTTFAMILY:


@@ -258,60 +267,60 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     if (start)
     {
       long id = NewBlockId();
     if (start)
     {
       long id = NewBlockId();

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_TELETYPE, id);
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_TELETYPE, id);

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltSMALL:
   {
     if (start)
     {
     break;
   }
   case ltSMALL:
   {
     if (start)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_SMALL_TEXT, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_SMALL_TEXT, NewBlockId());

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltTINY:
   {
     if (start)
     {
     break;
   }
   case ltTINY:
   {
     if (start)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_SMALL_TEXT, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_SMALL_TEXT, NewBlockId());

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltNORMALSIZE:
   {
     if (start)
     {
     break;
   }
   case ltNORMALSIZE:
   {
     if (start)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_NORMAL, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_NORMAL, NewBlockId());

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltlarge:
   {
     if (start)
     {
     break;
   }
   case ltlarge:
   {
     if (start)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_SMALL_HEADING, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_SMALL_HEADING, NewBlockId());

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}\n");
+    else TexOutput(_T("}\n"));

     break;
   }
   case ltLARGE:
   {
     if (start)
     {
     break;
   }
   case ltLARGE:
   {
     if (start)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_LARGE_HEADING, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_LARGE_HEADING, NewBlockId());

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}\n");
+    else TexOutput(_T("}\n"));

     break;
   }
   case ltITEMIZE:
     break;
   }
   case ltITEMIZE:


@@ -324,7 +333,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
 //      tabCount ++;
 
 //      if (indentLevel > 0)
 //      tabCount ++;
 
 //      if (indentLevel > 0)

-//        TexOutput("\\par\\par\n");
+//        TexOutput(_T("\\par\\par\n"));

       indentLevel ++;
       int listType;
       if (macroId == ltENUMERATE)
       indentLevel ++;
       int listType;
       if (macroId == ltENUMERATE)


@@ -340,38 +349,38 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     {
       indentLevel --;
 
     {
       indentLevel --;
 

-      if (itemizeStack.First())
+      if (itemizeStack.GetFirst())

       {
       {

-        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.First()->Data();
+        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.GetFirst()->GetData();

         delete struc;
         delete struc;

-        delete itemizeStack.First();
+        delete itemizeStack.GetFirst();

       }
     }
     break;
   }
   case ltITEM:
   {
       }
     }
     break;
   }
   case ltITEM:
   {

-    wxNode *node = itemizeStack.First();
+    wxNode *node = itemizeStack.GetFirst();

     if (node)
     {
     if (node)
     {

-      ItemizeStruc *struc = (ItemizeStruc *)node->Data();
+      ItemizeStruc *struc = (ItemizeStruc *)node->GetData();

       if (!start)
       {
         struc->currentItem += 1;
       if (!start)
       {
         struc->currentItem += 1;

-        char indentBuf[30];
+        wxChar indentBuf[30];

 
         switch (struc->listType)
         {
           case LATEX_ENUMERATE:
           {
 
         switch (struc->listType)
         {
           case LATEX_ENUMERATE:
           {

-            sprintf(indentBuf, "\\hy-%d{%ld}{%d.} ",
+            wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\hy-%d{%ld}{%d.} "),

               hyBLOCK_BOLD, NewBlockId(), struc->currentItem);
             TexOutput(indentBuf);
             break;
           }
           case LATEX_ITEMIZE:
           {
               hyBLOCK_BOLD, NewBlockId(), struc->currentItem);
             TexOutput(indentBuf);
             break;
           }
           case LATEX_ITEMIZE:
           {

-            sprintf(indentBuf, "\\hy-%d{%ld}{o} ",
+            wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\hy-%d{%ld}{o} "),

               hyBLOCK_BOLD, NewBlockId());
             TexOutput(indentBuf);
             break;
               hyBLOCK_BOLD, NewBlockId());
             TexOutput(indentBuf);
             break;


@@ -381,16 +390,16 @@ void XLPOnMacro(int macroId, int no_args, bool start)
           {
             if (descriptionItemArg)
             {
           {
             if (descriptionItemArg)
             {

-              sprintf(indentBuf, "\\hy-%d{%ld}{",
+              wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\hy-%d{%ld}{"),

                  hyBLOCK_BOLD, NewBlockId());
               TexOutput(indentBuf);
               TraverseChildrenFromChunk(descriptionItemArg);
                  hyBLOCK_BOLD, NewBlockId());
               TexOutput(indentBuf);
               TraverseChildrenFromChunk(descriptionItemArg);

-              TexOutput("} ");
+              TexOutput(_T("} "));

               descriptionItemArg = NULL;
             }
             break;
           }
               descriptionItemArg = NULL;
             }
             break;
           }

-       }
+        }

       }
     }
     break;
       }
     }
     break;


@@ -399,18 +408,18 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start && DocumentTitle && DocumentAuthor)
     {
   {
     if (start && DocumentTitle && DocumentAuthor)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_LARGE_HEADING, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_LARGE_HEADING, NewBlockId());

       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentTitle);
       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentTitle);

-      TexOutput("}\n\n");
-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_SMALL_HEADING, NewBlockId());
+      TexOutput(_T("}\n\n"));
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_SMALL_HEADING, NewBlockId());

       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentAuthor);
       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentAuthor);

-      TexOutput("}\n\n");
+      TexOutput(_T("}\n\n"));

       if (DocumentDate)
       {
         TraverseChildrenFromChunk(DocumentDate);
       if (DocumentDate)
       {
         TraverseChildrenFromChunk(DocumentDate);

-        TexOutput("\n");
+        TexOutput(_T("\n"));

       }
     }
     break;
       }
     }
     break;


@@ -419,7 +428,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      FILE *fd = fopen(ContentsName, "r");
+      FILE *fd = wxFopen(ContentsName, _T("r"));

       if (fd)
       {
         int ch = getc(fd);
       if (fd)
       {
         int ch = getc(fd);


@@ -432,8 +441,8 @@ void XLPOnMacro(int macroId, int no_args, bool start)
       }
       else
       {
       }
       else
       {

-        TexOutput("RUN TEX2RTF AGAIN FOR CONTENTS PAGE\n");
-        OnInform("Run Tex2RTF again to include contents page.");
+        TexOutput(_T("RUN TEX2RTF AGAIN FOR CONTENTS PAGE\n"));
+        OnInform(_T("Run Tex2RTF again to include contents page."));

       }
     }
     break;
       }
     }
     break;


@@ -441,32 +450,32 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   case ltHARDY:
   {
     if (start)
   case ltHARDY:
   {
     if (start)

-      TexOutput("HARDY", TRUE);
+      TexOutput(_T("HARDY"), true);

     break;
   }
   case ltWXCLIPS:
   {
     if (start)
     break;
   }
   case ltWXCLIPS:
   {
     if (start)

-      TexOutput("wxCLIPS", TRUE);
+      TexOutput(_T("wxCLIPS"), true);

     break;
   }
   case ltVERBATIM:
   {
     if (start)
     {
     break;
   }
   case ltVERBATIM:
   {
     if (start)
     {

-      char buf[100];
+      wxChar buf[100];

       long id = NewBlockId();
       long id = NewBlockId();

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_TELETYPE, id);
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_TELETYPE, id);

       TexOutput(buf);
     }
       TexOutput(buf);
     }

-    else TexOutput("}");
+    else TexOutput(_T("}"));

     break;
   }
   case ltHRULE:
   {
     if (start)
     {
     break;
   }
   case ltHRULE:
   {
     if (start)
     {

-      TexOutput("\n------------------------------------------------------------------", TRUE);
+      TexOutput(_T("\n------------------------------------------------------------------"), true);

     }
     break;
   }
     }
     break;
   }


@@ -474,7 +483,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      TexOutput("--------------------------------------------------------------------------------", TRUE);
+      TexOutput(_T("--------------------------------------------------------------------------------"), true);

     }
     break;
   }
     }
     break;
   }


@@ -493,17 +502,17 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_TELETYPE, NewBlockId());
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_TELETYPE, NewBlockId());

       TexOutput(buf);
     }
     else
       TexOutput(buf);
     }
     else

-      TexOutput("}");
+      TexOutput(_T("}"));

     break;
   }
   case ltNUMBEREDBIBITEM:
   {
     if (!start)
     break;
   }
   case ltNUMBEREDBIBITEM:
   {
     if (!start)

-      TexOutput("\n\n", TRUE);
+      TexOutput(_T("\n\n"), true);

     break;
   }
   case ltCAPTION:
     break;
   }
   case ltCAPTION:


@@ -513,17 +522,17 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     {
       figureNo ++;
 
     {
       figureNo ++;
 

-      char figBuf[40];
+      wxChar figBuf[40];

       if (DocumentStyle != LATEX_ARTICLE)
       if (DocumentStyle != LATEX_ARTICLE)

-        sprintf(figBuf, "Figure %d.%d: ", chapterNo, figureNo);
+        wxSnprintf(figBuf, sizeof(figBuf), _T("Figure %d.%d: "), chapterNo, figureNo);

       else
       else

-        sprintf(figBuf, "Figure %d: ", figureNo);
+        wxSnprintf(figBuf, sizeof(figBuf), _T("Figure %d: "), figureNo);

 
       TexOutput(figBuf);
     }
     else
     {
 
       TexOutput(figBuf);
     }
     else
     {

-      char *topicName = FindTopicName(GetNextChunk());
+      wxChar *topicName = FindTopicName(GetNextChunk());

 
       AddTexRef(topicName, NULL, NULL,
            ((DocumentStyle != LATEX_ARTICLE) ? chapterNo : figureNo),
 
       AddTexRef(topicName, NULL, NULL,
            ((DocumentStyle != LATEX_ARTICLE) ? chapterNo : figureNo),


@@ -541,7 +550,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
 
 bool XLPOnArgument(int macroId, int arg_no, bool start)
 {
 
 bool XLPOnArgument(int macroId, int arg_no, bool start)
 {

-  char buf[300];
+  wxChar buf[300];

   switch (macroId)
   {
   case ltCHAPTER:
   switch (macroId)
   {
   case ltCHAPTER:


@@ -560,52 +569,51 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
   {
     if (!start && (arg_no == 1))
       currentSection = GetArgChunk();
   {
     if (!start && (arg_no == 1))
       currentSection = GetArgChunk();

-    return FALSE;
-    break;
+    return false;

   }
   case ltFUNC:
   {
     if (!start && (arg_no == 1))
   }
   case ltFUNC:
   {
     if (!start && (arg_no == 1))

-      TexOutput(" ", TRUE);
+      TexOutput(_T(" "), true);

     if (start && (arg_no == 3))
     if (start && (arg_no == 3))

-      TexOutput("(", TRUE);
+      TexOutput(_T("("), true);

     if (!start && (arg_no == 3))
     if (!start && (arg_no == 3))

-     TexOutput(")", TRUE);
+     TexOutput(_T(")"), true);

     break;
   }
   case ltPFUNC:
   {
     if (!start && (arg_no == 1))
     break;
   }
   case ltPFUNC:
   {
     if (!start && (arg_no == 1))

-      TexOutput(" ", TRUE);
+      TexOutput(_T(" "), true);

 
     if (start && (arg_no == 2))
 
     if (start && (arg_no == 2))

-      TexOutput("(*", TRUE);
+      TexOutput(_T("(*"), true);

     if (!start && (arg_no == 2))
     if (!start && (arg_no == 2))

-      TexOutput(")", TRUE);
+      TexOutput(_T(")"), true);

 
     if (start && (arg_no == 3))
 
     if (start && (arg_no == 3))

-      TexOutput("(", TRUE);
+      TexOutput(_T("("), true);

     if (!start && (arg_no == 3))
     if (!start && (arg_no == 3))

-      TexOutput(")", TRUE);
+      TexOutput(_T(")"), true);

     break;
   }
   case ltCLIPSFUNC:
   {
     if (!start && (arg_no == 1))
     break;
   }
   case ltCLIPSFUNC:
   {
     if (!start && (arg_no == 1))

-      TexOutput(" ", TRUE);
+      TexOutput(_T(" "), true);

     if (start && (arg_no == 2))
     {
     if (start && (arg_no == 2))
     {

-      TexOutput("(", TRUE);
+      TexOutput(_T("("), true);

       long id = NewBlockId();
       long id = NewBlockId();

-      sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_BOLD, id);
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_BOLD, id);

       TexOutput(buf);
     }
     if (!start && (arg_no == 2))
     {
       TexOutput(buf);
     }
     if (!start && (arg_no == 2))
     {

-      TexOutput("}");
+      TexOutput(_T("}"));

     }
     if (!start && (arg_no == 3))
     }
     if (!start && (arg_no == 3))

-     TexOutput(")", TRUE);
+     TexOutput(_T(")"), true);

     break;
   }
   case ltPARAM:
     break;
   }
   case ltPARAM:


@@ -613,12 +621,12 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
     if (start && (arg_no == 2))
     {
       long id = NewBlockId();
     if (start && (arg_no == 2))
     {
       long id = NewBlockId();

-      sprintf(buf, " \\hy-%d{%ld}{", hyBLOCK_BOLD, id);
+      wxSnprintf(buf, sizeof(buf), _T(" \\hy-%d{%ld}{"), hyBLOCK_BOLD, id);

       TexOutput(buf);
     }
     if (!start && (arg_no == 2))
     {
       TexOutput(buf);
     }
     if (!start && (arg_no == 2))
     {

-      TexOutput("}");
+      TexOutput(_T("}"));

     }
     break;
   }
     }
     break;
   }


@@ -627,33 +635,32 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
     if (start && (arg_no == 2))
     {
       long id = NewBlockId();
     if (start && (arg_no == 2))
     {
       long id = NewBlockId();

-      sprintf(buf, " \\hy-%d{%ld}{", hyBLOCK_BOLD, id);
+      wxSnprintf(buf, sizeof(buf), _T(" \\hy-%d{%ld}{"), hyBLOCK_BOLD, id);

       TexOutput(buf);
     }
     if (!start && (arg_no == 2))
     {
       TexOutput(buf);
     }
     if (!start && (arg_no == 2))
     {

-      TexOutput("}");
+      TexOutput(_T("}"));

     }
     break;
   }
   case ltMEMBER:
   {
     if (!start && (arg_no == 1))
     }
     break;
   }
   case ltMEMBER:
   {
     if (!start && (arg_no == 1))

-      TexOutput(" ", TRUE);
+      TexOutput(_T(" "), true);

     break;
   }
   case ltLABEL:
   {
     break;
   }
   case ltLABEL:
   {

-    return FALSE;
-    break;
+    return false;

   }
   case ltREF:
   {
     if (start)
     {
   }
   case ltREF:
   {
     if (start)
     {

-      char *sec = NULL;
+      wxChar *sec = NULL;

       
       

-      char *refName = GetArgData();
+      wxChar *refName = GetArgData();

       if (refName)
       {
         TexRef *texRef = FindReference(refName);
       if (refName)
       {
         TexRef *texRef = FindReference(refName);


@@ -666,7 +673,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       {
         TexOutput(sec);
       }
       {
         TexOutput(sec);
       }

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -679,20 +686,20 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       if (start)
       {
         currentBlockId = NewBlockId();
       if (start)
       {
         currentBlockId = NewBlockId();

-        sprintf(buf, "\\hy-%d{%ld}{", hyBLOCK_RED_ITALIC, currentBlockId);
+        wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{"), hyBLOCK_RED_ITALIC, currentBlockId);

         TexOutput(buf);
       }
         TexOutput(buf);
       }

-      else TexOutput("}");
+      else TexOutput(_T("}"));

     }
     if (arg_no == 2)
     {
       if (start)
       {
     }
     if (arg_no == 2)
     {
       if (start)
       {

-        char *label = GetArgData();
+        wxChar *label = GetArgData();

         hyperLinks.Append(currentBlockId, (wxObject *)copystring(label));
       }
       
         hyperLinks.Append(currentBlockId, (wxObject *)copystring(label));
       }
       

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -700,15 +707,15 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
   {
     if (arg_no == 1)
     {
   {
     if (arg_no == 1)
     {

-      return TRUE;
+      return true;

     }
     else if (arg_no == 2)
     {
       if (start)
     }
     else if (arg_no == 2)
     {
       if (start)

-        TexOutput(" (");
+        TexOutput(_T(" ("));

       else
       else

-        TexOutput(")");
-      return TRUE;
+        TexOutput(_T(")"));
+      return true;

     }
     break;
   }
     }
     break;
   }


@@ -717,7 +724,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
     if (start && IsArgOptional())
     {
       descriptionItemArg = GetArgChunk();
     if (start && IsArgOptional())
     {
       descriptionItemArg = GetArgChunk();

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -728,21 +735,21 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
     {
       if (start)
       {
     {
       if (start)
       {

-        inTable = TRUE;
-        tableVerticalLineLeft = FALSE;
-        tableVerticalLineRight = FALSE;
+        inTable = true;
+        tableVerticalLineLeft = false;
+        tableVerticalLineRight = false;

 
 

-        char *alignString = copystring(GetArgData());
+        wxChar *alignString = copystring(GetArgData());

 
         // Count the number of columns
         noColumns = 0;
 
         // Count the number of columns
         noColumns = 0;

-        int len = strlen(alignString);
+        int len = wxStrlen(alignString);

         if (len > 0)
         {
           if (alignString[0] == '|')
         if (len > 0)
         {
           if (alignString[0] == '|')

-            tableVerticalLineLeft = TRUE;
+            tableVerticalLineLeft = true;

           if (alignString[len-1] == '|')
           if (alignString[len-1] == '|')

-            tableVerticalLineRight = TRUE;
+            tableVerticalLineRight = true;

         }
 
         for (int i = 0; i < len; i++)
         }
 
         for (int i = 0; i < len; i++)


@@ -751,26 +758,26 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
 
 /*
       // Experimental
 
 /*
       // Experimental

-      TexOutput("\\brdrt\\brdrs");
+      TexOutput(_T("\\brdrt\\brdrs"));

       if (tableVerticalLineLeft)
       if (tableVerticalLineLeft)

-        TexOutput("\\brdrl\\brdrs");
+        TexOutput(_T("\\brdrl\\brdrs"));

       if (tableVerticalLineRight)
       if (tableVerticalLineRight)

-        TexOutput("\\brdrr\\brdrs");
+        TexOutput(_T("\\brdrr\\brdrs"));

 */
 
         // Calculate a rough size for each column
 //        int tabPos = 80/noColumns;
         currentTab = 0;
 
 */
 
         // Calculate a rough size for each column
 //        int tabPos = 80/noColumns;
         currentTab = 0;
 

-        return FALSE;
+        return false;

       }
     }
     else if (arg_no == 2 && !start)
     {
       }
     }
     else if (arg_no == 2 && !start)
     {

-      inTable = FALSE;
+      inTable = false;

     }
     else if (arg_no == 2 && start)
     }
     else if (arg_no == 2 && start)

-      return TRUE;
+      return true;

     break;
   }
   case ltMARGINPAR:
     break;
   }
   case ltMARGINPAR:


@@ -781,34 +788,33 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      TexOutput("----------------------------------------------------------------------\n", TRUE);
-      return TRUE;
+      TexOutput(_T("----------------------------------------------------------------------\n"), true);
+      return true;

     }
     else
     }
     else

-      TexOutput("\n----------------------------------------------------------------------\n", TRUE);
+      TexOutput(_T("\n----------------------------------------------------------------------\n"), true);

     break;
   }
   case ltBIBITEM:
   {
     break;
   }
   case ltBIBITEM:
   {

-    char buf[100];
+    wxChar buf[100];

     if (arg_no == 1 && start)
     {
     if (arg_no == 1 && start)
     {

-      char *citeKey = GetArgData();
+      wxChar *citeKey = GetArgData();

       TexRef *ref = (TexRef *)TexReferences.Get(citeKey);
       if (ref)
       {
         if (ref->sectionNumber) delete[] ref->sectionNumber;
       TexRef *ref = (TexRef *)TexReferences.Get(citeKey);
       if (ref)
       {
         if (ref->sectionNumber) delete[] ref->sectionNumber;

-        sprintf(buf, "[%d]", citeCount);
+        wxSnprintf(buf, sizeof(buf), _T("[%d]"), citeCount);

         ref->sectionNumber = copystring(buf);
       }
 
         ref->sectionNumber = copystring(buf);
       }
 

-      sprintf(buf, "\\hy-%d{%ld}{[%d]} ", hyBLOCK_BOLD, NewBlockId(), citeCount);
+      wxSnprintf(buf, sizeof(buf), _T("\\hy-%d{%ld}{[%d]} "), hyBLOCK_BOLD, NewBlockId(), citeCount);

       TexOutput(buf);
       citeCount ++;
       TexOutput(buf);
       citeCount ++;

-      return FALSE;
+      return false;

     }
     }

-    return TRUE;
-    break;
+    return true;

   }
   case ltTHEBIBLIOGRAPHY:
   {
   }
   case ltTHEBIBLIOGRAPHY:
   {


@@ -821,28 +827,27 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       SetCurrentOutputs(Contents, Chapters);
       long id1 = NewBlockId();
       long id2 = NewBlockId();
       SetCurrentOutputs(Contents, Chapters);
       long id1 = NewBlockId();
       long id2 = NewBlockId();

-      fprintf(Contents, "\\hy-%d{%ld}{%s}\n", hyBLOCK_SMALL_HEADING, id1, ReferencesNameString);
-      fprintf(Chapters, "\\hy-%d{%ld}{%s}\n\n\n", hyBLOCK_LARGE_VISIBLE_SECTION, id2, ReferencesNameString);
-      fprintf(Index, "%ld %ld\n", id1, id2);
+      wxFprintf(Contents, _T("\\hy-%d{%ld}{%s}\n"), hyBLOCK_SMALL_HEADING, id1, ReferencesNameString);
+      wxFprintf(Chapters, _T("\\hy-%d{%ld}{%s}\n\n\n"), hyBLOCK_LARGE_VISIBLE_SECTION, id2, ReferencesNameString);
+      wxFprintf(Index, _T("%ld %ld\n"), id1, id2);

 
       SetCurrentOutput(Chapters);
 
       SetCurrentOutput(Chapters);

-      return FALSE;
+      return false;

     }
     if (!start && (arg_no == 2))
     {
     }
     }
     if (!start && (arg_no == 2))
     {
     }

-    return TRUE;
-    break;
+    return true;

   }
   case ltTWOCOLITEM:
   case ltTWOCOLITEMRULED:
   {
     if (start && (arg_no == 2))
   }
   case ltTWOCOLITEM:
   case ltTWOCOLITEMRULED:
   {
     if (start && (arg_no == 2))

-      TexOutput("\n    ");
+      TexOutput(_T("\n    "));

 
     if (!start && (arg_no == 2))
 
     if (!start && (arg_no == 2))

-      TexOutput("\n");
-    return TRUE;
+      TexOutput(_T("\n"));
+    return true;

   }
   /*
    * Accents
   }
   /*
    * Accents


@@ -852,293 +857,285 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'a':
-           TexOutput("a");
+          case _T('a'):
+           TexOutput(_T("a"));

            break;
            break;

-          case 'e':
-           TexOutput("e");
+          case _T('e'):
+           TexOutput(_T("e"));

            break;
            break;

-          case 'i':
-           TexOutput("i");
+          case _T('i'):
+           TexOutput(_T("i"));

            break;
            break;

-          case 'o':
-           TexOutput("o");
+          case _T('o'):
+           TexOutput(_T("o"));

            break;
            break;

-          case 'u':
-           TexOutput("u");
+          case _T('u'):
+           TexOutput(_T("u"));

            break;
            break;

-          case 'A':
-           TexOutput("a");
+          case _T('A'):
+           TexOutput(_T("a"));

            break;
            break;

-          case 'E':
-           TexOutput("E");
+          case _T('E'):
+           TexOutput(_T("E"));

            break;
            break;

-          case 'I':
-           TexOutput("I");
+          case _T('I'):
+           TexOutput(_T("I"));

            break;
            break;

-          case 'O':
-           TexOutput("O");
+          case _T('O'):
+           TexOutput(_T("O"));

            break;
            break;

-          case 'U':
-           TexOutput("U");
+          case _T('U'):
+           TexOutput(_T("U"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   case ltACCENT_ACUTE:
   {
     if (start)
     {
   }
   case ltACCENT_ACUTE:
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'a':
-           TexOutput("a");
+          case _T('a'):
+           TexOutput(_T("a"));

            break;
            break;

-          case 'e':
-           TexOutput("e");
+          case _T('e'):
+           TexOutput(_T("e"));

            break;
            break;

-          case 'i':
-           TexOutput("i");
+          case _T('i'):
+           TexOutput(_T("i"));

            break;
            break;

-          case 'o':
-           TexOutput("o");
+          case _T('o'):
+           TexOutput(_T("o"));

            break;
            break;

-          case 'u':
-           TexOutput("u");
+          case _T('u'):
+           TexOutput(_T("u"));

            break;
            break;

-          case 'y':
-           TexOutput("y");
+          case _T('y'):
+           TexOutput(_T("y"));

            break;
            break;

-          case 'A':
-           TexOutput("A");
+          case _T('A'):
+           TexOutput(_T("A"));

            break;
            break;

-          case 'E':
-           TexOutput("E");
+          case _T('E'):
+           TexOutput(_T("E"));

            break;
            break;

-          case 'I':
-           TexOutput("I");
+          case _T('I'):
+           TexOutput(_T("I"));

            break;
            break;

-          case 'O':
-           TexOutput("O");
+          case _T('O'):
+           TexOutput(_T("O"));

            break;
            break;

-          case 'U':
-           TexOutput("U");
+          case _T('U'):
+           TexOutput(_T("U"));

            break;
            break;

-          case 'Y':
-           TexOutput("Y");
+          case _T('Y'):
+           TexOutput(_T("Y"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   case ltACCENT_CARET:
   {
     if (start)
     {
   }
   case ltACCENT_CARET:
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'a':
-           TexOutput("a");
+          case _T('a'):
+           TexOutput(_T("a"));

            break;
            break;

-          case 'e':
-           TexOutput("e");
+          case _T('e'):
+           TexOutput(_T("e"));

            break;
            break;

-          case 'i':
-           TexOutput("i");
+          case _T('i'):
+           TexOutput(_T("i"));

            break;
            break;

-          case 'o':
-           TexOutput("o");
+          case _T('o'):
+           TexOutput(_T("o"));

            break;
            break;

-          case 'u':
-           TexOutput("u");
+          case _T('u'):
+           TexOutput(_T("u"));

            break;
            break;

-          case 'A':
-           TexOutput("A");
+          case _T('A'):
+           TexOutput(_T("A"));

            break;
            break;

-          case 'E':
-           TexOutput("E");
+          case _T('E'):
+           TexOutput(_T("E"));

            break;
            break;

-          case 'I':
-           TexOutput("I");
+          case _T('I'):
+           TexOutput(_T("I"));

            break;
            break;

-          case 'O':
-           TexOutput("O");
+          case _T('O'):
+           TexOutput(_T("O"));

            break;
            break;

-          case 'U':
-           TexOutput("U");
+          case _T('U'):
+           TexOutput(_T("U"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   case ltACCENT_TILDE:
   {
     if (start)
     {
   }
   case ltACCENT_TILDE:
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'a':
-           TexOutput("a");
+          case _T('a'):
+           TexOutput(_T("a"));

            break;
            break;

-          case ' ':
-           TexOutput("~");
+          case _T(' '):
+           TexOutput(_T("~"));

            break;
            break;

-          case 'n':
-           TexOutput("n");
+          case _T('n'):
+           TexOutput(_T("n"));

            break;
            break;

-          case 'o':
-           TexOutput("o");
+          case _T('o'):
+           TexOutput(_T("o"));

            break;
            break;

-          case 'A':
-           TexOutput("A");
+          case _T('A'):
+           TexOutput(_T("A"));

            break;
            break;

-          case 'N':
-           TexOutput("N");
+          case _T('N'):
+           TexOutput(_T("N"));

            break;
            break;

-          case 'O':
-           TexOutput("O");
+          case _T('O'):
+           TexOutput(_T("O"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   case ltACCENT_UMLAUT:
   {
     if (start)
     {
   }
   case ltACCENT_UMLAUT:
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'a':
-           TexOutput("a");
+          case _T('a'):
+           TexOutput(_T("a"));

            break;
            break;

-          case 'e':
-           TexOutput("e");
+          case _T('e'):
+           TexOutput(_T("e"));

            break;
            break;

-          case 'i':
-           TexOutput("i");
+          case _T('i'):
+           TexOutput(_T("i"));

            break;
            break;

-          case 'o':
-           TexOutput("o");
+          case _T('o'):
+           TexOutput(_T("o"));

            break;
            break;

-          case 'u':
-           TexOutput("u");
+          case _T('u'):
+           TexOutput(_T("u"));

            break;
            break;

-          case 'y':
-           TexOutput("y");
+          case _T('y'):
+           TexOutput(_T("y"));

            break;
            break;

-          case 'A':
-           TexOutput("A");
+          case _T('A'):
+           TexOutput(_T("A"));

            break;
            break;

-          case 'E':
-           TexOutput("E");
+          case _T('E'):
+           TexOutput(_T("E"));

            break;
            break;

-          case 'I':
-           TexOutput("I");
+          case _T('I'):
+           TexOutput(_T("I"));

            break;
            break;

-          case 'O':
-           TexOutput("O");
+          case _T('O'):
+           TexOutput(_T("O"));

            break;
            break;

-          case 'U':
-           TexOutput("U");
+          case _T('U'):
+           TexOutput(_T("U"));

            break;
            break;

-          case 'Y':
-           TexOutput("Y");
+          case _T('Y'):
+           TexOutput(_T("Y"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   case ltACCENT_DOT:
   {
     if (start)
     {
   }
   case ltACCENT_DOT:
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'a':
-           TexOutput("a");
+          case _T('a'):
+           TexOutput(_T("a"));

            break;
            break;

-          case 'A':
-           TexOutput("A");
+          case _T('A'):
+           TexOutput(_T("A"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   case ltACCENT_CADILLA:
   {
     if (start)
     {
   }
   case ltACCENT_CADILLA:
   {
     if (start)
     {

-      char *val = GetArgData();
+      wxChar *val = GetArgData();

       if (val)
       {
         switch (val[0])
         {
       if (val)
       {
         switch (val[0])
         {

-          case 'c':
-           TexOutput("c");
+          case _T('c'):
+           TexOutput(_T("c"));

            break;
            break;

-          case 'C':
-           TexOutput("C");
+          case _T('C'):
+           TexOutput(_T("C"));

            break;
           default:
            break;
         }
       }
     }
            break;
           default:
            break;
         }
       }
     }

-    return FALSE;
-    break;
+    return false;

   }
   default:
   {
     return DefaultOnArgument(macroId, arg_no, start);
   }
   default:
   {
     return DefaultOnArgument(macroId, arg_no, start);

-    break;

   }
   }
   }
   }

-  return TRUE;
+  return true;

 }
 
 bool XLPGo(void)
 }
 
 bool XLPGo(void)


@@ -1147,42 +1144,42 @@ bool XLPGo(void)
 
   if (InputFile && OutputFile)
   {
 
   if (InputFile && OutputFile)
   {

-    Contents = fopen(TmpContentsName, "w");
-    Chapters = fopen("chapters.xlp", "w");
-    Sections = fopen("sections.xlp", "w");
-    Subsections = fopen("subsections.xlp", "w");
-    Subsubsections = fopen("subsubsections.xlp", "w");
-    Index = fopen("index.xlp", "w");
+    Contents = wxFopen(TmpContentsName, _T("w"));
+    Chapters = wxFopen(_T("chapters.xlp"), _T("w"));
+    Sections = wxFopen(_T("sections.xlp"), _T("w"));
+    Subsections = wxFopen(_T("subsections.xlp"), _T("w"));
+    Subsubsections = wxFopen(_T("subsubsections.xlp"), _T("w"));
+    Index = wxFopen(_T("index.xlp"), _T("w"));

 
     // Insert invisible section marker at beginning
 
     // Insert invisible section marker at beginning

-    fprintf(Chapters, "\\hy-%d{%ld}{%s}\n",
-                hyBLOCK_INVISIBLE_SECTION, NewBlockId(), "\n");
+    wxFprintf(Chapters, _T("\\hy-%d{%ld}{%s}\n"),
+                hyBLOCK_INVISIBLE_SECTION, NewBlockId(), _T("\n"));

 
 

-    fprintf(Contents, "\\hy-%d{%ld}{%s}\n\n",
+    wxFprintf(Contents, _T("\\hy-%d{%ld}{%s}\n\n"),

 //                hyBLOCK_LARGE_HEADING, NewBlockId(), "\n\n%s\n\n", ContentsNameString);
                 hyBLOCK_LARGE_HEADING, NewBlockId(), ContentsNameString);
 
     SetCurrentOutput(Chapters);
 
 //                hyBLOCK_LARGE_HEADING, NewBlockId(), "\n\n%s\n\n", ContentsNameString);
                 hyBLOCK_LARGE_HEADING, NewBlockId(), ContentsNameString);
 
     SetCurrentOutput(Chapters);
 

-    fprintf(Index, "\n\\hyindex{\n\"%s\"\n",
-             contentsString ? contentsString : "WXHELPCONTENTS");
+    wxFprintf(Index, _T("\n\\hyindex{\n\"%s\"\n"),
+             contentsString ? contentsString : _T("WXHELPCONTENTS"));

     TraverseDocument();
 
     TraverseDocument();
 

-    wxNode *node = hyperLinks.First();
+    wxNode *node = hyperLinks.GetFirst();

     while (node)
     {
       long from = node->GetKeyInteger();
     while (node)
     {
       long from = node->GetKeyInteger();

-      char *label = (char *)node->Data();
+      wxChar *label = (wxChar *)node->GetData();

       wxNode *otherNode = hyperLabels.Find(label);
       if (otherNode)
       {
       wxNode *otherNode = hyperLabels.Find(label);
       if (otherNode)
       {

-        long to = (long)otherNode->Data();
-        fprintf(Index, "%ld %ld\n", from, to);
+        long to = (long)otherNode->GetData();
+        wxFprintf(Index, _T("%ld %ld\n"), from, to);

       }
       }

-      node = node->Next();
+      node = node->GetNext();

     }
 
     }
 

-    fprintf(Index, "}\n");
+    wxFprintf(Index, _T("}\n"));

 
     fclose(Contents); Contents = NULL;
     fclose(Chapters); Chapters = NULL;
 
     fclose(Contents); Contents = NULL;
     fclose(Chapters); Chapters = NULL;


@@ -1191,7 +1188,7 @@ bool XLPGo(void)
     fclose(Subsubsections); Subsubsections = NULL;
     fclose(Index); Index = NULL;
 
     fclose(Subsubsections); Subsubsections = NULL;
     fclose(Index); Index = NULL;
 

-    if (FileExists(ContentsName)) wxRemoveFile(ContentsName);
+    if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);

 
     if (!wxRenameFile(TmpContentsName, ContentsName))
     {
 
     if (!wxRenameFile(TmpContentsName, ContentsName))
     {


@@ -1199,21 +1196,21 @@ bool XLPGo(void)
       wxRemoveFile(TmpContentsName);
     }
 
       wxRemoveFile(TmpContentsName);
     }
 

-    wxConcatFiles("chapters.xlp", "sections.xlp", "tmp2.xlp");
-    wxConcatFiles("tmp2.xlp", "subsections.xlp", "tmp1.xlp");
-    wxConcatFiles("tmp1.xlp", "subsubsections.xlp", "tmp2.xlp");
-    wxConcatFiles("tmp2.xlp", "index.xlp", OutputFile);
+    wxConcatFiles(_T("chapters.xlp"), _T("sections.xlp"), _T("tmp2.xlp"));
+    wxConcatFiles(_T("tmp2.xlp"), _T("subsections.xlp"), _T("tmp1.xlp"));
+    wxConcatFiles(_T("tmp1.xlp"), _T("subsubsections.xlp"), _T("tmp2.xlp"));
+    wxConcatFiles(_T("tmp2.xlp"), _T("index.xlp"), OutputFile);

 
 

-    wxRemoveFile("tmp1.xlp");
-    wxRemoveFile("tmp2.xlp");
+    wxRemoveFile(_T("tmp1.xlp"));
+    wxRemoveFile(_T("tmp2.xlp"));

 
 

-    wxRemoveFile("chapters.xlp");
-    wxRemoveFile("sections.xlp");
-    wxRemoveFile("subsections.xlp");
-    wxRemoveFile("subsubsections.xlp");
-    wxRemoveFile("index.xlp");
-    return TRUE;
+    wxRemoveFile(_T("chapters.xlp"));
+    wxRemoveFile(_T("sections.xlp"));
+    wxRemoveFile(_T("subsections.xlp"));
+    wxRemoveFile(_T("subsubsections.xlp"));
+    wxRemoveFile(_T("index.xlp"));
+    return true;

   }
   }

-  return FALSE;
+  return false;

 }
 
 }