Make _dist_dir a shadow directory of symlinks rather then copied files, and add

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

diff --git a/utils/tex2rtf/src/xlputils.cpp b/utils/tex2rtf/src/xlputils.cpp
index 527bac8b5ee9719281196ab9a3973ae0ec767c15..39408d89662835f9dfd5327d6c1db198a86ad538 100644 (file)
--- a/utils/tex2rtf/src/xlputils.cpp
+++ b/utils/tex2rtf/src/xlputils.cpp
@@ -2,17 +2,14 @@
 // 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
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     7.9.93
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -37,9 +34,9 @@ static TexChunk *descriptionItemArg = NULL;
 static int indentLevel = 0;
 static int noColumns = 0;
 static int currentTab = 0;
 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);
 static int citeCount = 1;
 wxList hyperLinks(wxKEY_INTEGER);
 wxList hyperLabels(wxKEY_STRING);


@@ -53,7 +50,7 @@ void PadToTab(int tabPos)
 {
   int currentCol = GetCurrentColumn();
   for (int i = currentCol; i < tabPos; i++)
 {
   int currentCol = GetCurrentColumn();
   for (int i = currentCol; i < tabPos; i++)

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

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


@@ -85,7 +82,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 

-      startedSections = TRUE;
+      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);
       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);


@@ -112,12 +109,12 @@ void XLPOnMacro(int macroId, int no_args, bool start)
 
       if (macroId != ltSECTIONSTAR)
         sectionNo ++;
 
       if (macroId != ltSECTIONSTAR)
         sectionNo ++;

-        
+

       SetCurrentOutputs(Chapters, Sections);
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 
       SetCurrentOutputs(Chapters, Sections);
       long id1 = NewBlockId();
       currentBlockId = NewBlockId();
 

-      startedSections = TRUE;
+      startedSections = true;

 
       if (DocumentStyle == LATEX_ARTICLE)
         wxFprintf(Contents, _T("\\hy-%d{%ld}{"), hyBLOCK_LARGE_HEADING, id1);
 
       if (DocumentStyle == LATEX_ARTICLE)
         wxFprintf(Contents, _T("\\hy-%d{%ld}{"), hyBLOCK_LARGE_HEADING, id1);


@@ -209,19 +206,19 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   }
   case ltVOID:
 //    if (start)
   }
   case ltVOID:
 //    if (start)

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

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

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

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

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

     }
     break;
   }
     }
     break;
   }


@@ -239,7 +236,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     {
       wxChar buf[100];
       long id = NewBlockId();
     {
       wxChar buf[100];
       long id = NewBlockId();

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


@@ -253,7 +250,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     {
       wxChar buf[100];
       long id = NewBlockId();
     {
       wxChar buf[100];
       long id = NewBlockId();

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


@@ -266,7 +263,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     if (start)
     {
       long id = NewBlockId();
     if (start)
     {
       long id = NewBlockId();

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


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

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


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

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


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

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


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

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

       TexOutput(buf);
     }
     else TexOutput(_T("}\n"));
       TexOutput(buf);
     }
     else TexOutput(_T("}\n"));


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

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

       TexOutput(buf);
     }
     else TexOutput(_T("}\n"));
       TexOutput(buf);
     }
     else TexOutput(_T("}\n"));


@@ -372,14 +369,14 @@ void XLPOnMacro(int macroId, int no_args, bool start)
         {
           case LATEX_ENUMERATE:
           {
         {
           case LATEX_ENUMERATE:
           {

-            wxSprintf(indentBuf, _T("\\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:
           {

-            wxSprintf(indentBuf, _T("\\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;


@@ -389,7 +386,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
           {
             if (descriptionItemArg)
             {
           {
             if (descriptionItemArg)
             {

-              wxSprintf(indentBuf, _T("\\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);


@@ -398,7 +395,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
             }
             break;
           }
             }
             break;
           }

-       }
+        }

       }
     }
     break;
       }
     }
     break;


@@ -407,11 +404,11 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   {
     if (start && DocumentTitle && DocumentAuthor)
     {
   {
     if (start && DocumentTitle && DocumentAuthor)
     {

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

       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentTitle);
       TexOutput(_T("}\n\n"));
       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentTitle);
       TexOutput(_T("}\n\n"));

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

       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentAuthor);
       TexOutput(_T("}\n\n"));
       TexOutput(buf);
       TraverseChildrenFromChunk(DocumentAuthor);
       TexOutput(_T("}\n\n"));


@@ -433,7 +430,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
         int ch = getc(fd);
         while (ch != EOF)
         {
         int ch = getc(fd);
         while (ch != EOF)
         {

-          putc(ch, Chapters);
+          wxPutc(ch, Chapters);

           ch = getc(fd);
         }
         fclose(fd);
           ch = getc(fd);
         }
         fclose(fd);


@@ -449,13 +446,13 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   case ltHARDY:
   {
     if (start)
   case ltHARDY:
   {
     if (start)

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

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

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

     break;
   }
   case ltVERBATIM:
     break;
   }
   case ltVERBATIM:


@@ -464,7 +461,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
     {
       wxChar buf[100];
       long id = NewBlockId();
     {
       wxChar buf[100];
       long id = NewBlockId();

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

       TexOutput(buf);
     }
     else TexOutput(_T("}"));
       TexOutput(buf);
     }
     else TexOutput(_T("}"));


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

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

     }
     break;
   }
     }
     break;
   }


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

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

     }
     break;
   }
     }
     break;
   }


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

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

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


@@ -511,7 +508,7 @@ void XLPOnMacro(int macroId, int no_args, bool start)
   case ltNUMBEREDBIBITEM:
   {
     if (!start)
   case ltNUMBEREDBIBITEM:
   {
     if (!start)

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

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


@@ -523,9 +520,9 @@ void XLPOnMacro(int macroId, int no_args, bool start)
 
       wxChar figBuf[40];
       if (DocumentStyle != LATEX_ARTICLE)
 
       wxChar figBuf[40];
       if (DocumentStyle != LATEX_ARTICLE)

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

       else
       else

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

 
       TexOutput(figBuf);
     }
 
       TexOutput(figBuf);
     }


@@ -568,43 +565,43 @@ 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;
+    return false;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-      wxSprintf(buf, _T("\\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))


@@ -612,7 +609,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       TexOutput(_T("}"));
     }
     if (!start && (arg_no == 3))
       TexOutput(_T("}"));
     }
     if (!start && (arg_no == 3))

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

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


@@ -620,7 +617,7 @@ 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();

-      wxSprintf(buf, _T(" \\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))


@@ -634,7 +631,7 @@ 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();

-      wxSprintf(buf, _T(" \\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))


@@ -646,19 +643,19 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
   case ltMEMBER:
   {
     if (!start && (arg_no == 1))
   case ltMEMBER:
   {
     if (!start && (arg_no == 1))

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

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

-    return FALSE;
+    return false;

   }
   case ltREF:
   {
     if (start)
     {
       wxChar *sec = NULL;
   }
   case ltREF:
   {
     if (start)
     {
       wxChar *sec = NULL;

-      
+

       wxChar *refName = GetArgData();
       if (refName)
       {
       wxChar *refName = GetArgData();
       if (refName)
       {


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

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -685,7 +682,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       if (start)
       {
         currentBlockId = NewBlockId();
       if (start)
       {
         currentBlockId = NewBlockId();

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

         TexOutput(buf);
       }
       else TexOutput(_T("}"));
         TexOutput(buf);
       }
       else TexOutput(_T("}"));


@@ -697,8 +694,8 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         wxChar *label = GetArgData();
         hyperLinks.Append(currentBlockId, (wxObject *)copystring(label));
       }
         wxChar *label = GetArgData();
         hyperLinks.Append(currentBlockId, (wxObject *)copystring(label));
       }

-      
-      return FALSE;
+
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -706,7 +703,7 @@ 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)
     {
     }
     else if (arg_no == 2)
     {


@@ -714,7 +711,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         TexOutput(_T(" ("));
       else
         TexOutput(_T(")"));
         TexOutput(_T(" ("));
       else
         TexOutput(_T(")"));

-      return TRUE;
+      return true;

     }
     break;
   }
     }
     break;
   }


@@ -723,7 +720,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;
   }


@@ -734,9 +731,9 @@ 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;

 
         wxChar *alignString = copystring(GetArgData());
 
 
         wxChar *alignString = copystring(GetArgData());
 


@@ -746,9 +743,9 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         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++)


@@ -768,15 +765,15 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
 //        int tabPos = 80/noColumns;
         currentTab = 0;
 
 //        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:


@@ -787,11 +784,11 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

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

     }
     else
     }
     else

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

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


@@ -804,16 +801,16 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       if (ref)
       {
         if (ref->sectionNumber) delete[] ref->sectionNumber;
       if (ref)
       {
         if (ref->sectionNumber) delete[] ref->sectionNumber;

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

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

-      wxSprintf(buf, _T("\\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;
+    return true;

   }
   case ltTHEBIBLIOGRAPHY:
   {
   }
   case ltTHEBIBLIOGRAPHY:
   {


@@ -831,12 +828,12 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
       wxFprintf(Index, _T("%ld %ld\n"), id1, id2);
 
       SetCurrentOutput(Chapters);
       wxFprintf(Index, _T("%ld %ld\n"), id1, id2);
 
       SetCurrentOutput(Chapters);

-      return FALSE;
+      return false;

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

-    return TRUE;
+    return true;

   }
   case ltTWOCOLITEM:
   case ltTWOCOLITEMRULED:
   }
   case ltTWOCOLITEM:
   case ltTWOCOLITEMRULED:


@@ -846,7 +843,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
 
     if (!start && (arg_no == 2))
       TexOutput(_T("\n"));
 
     if (!start && (arg_no == 2))
       TexOutput(_T("\n"));

-    return TRUE;
+    return true;

   }
   /*
    * Accents
   }
   /*
    * Accents


@@ -896,7 +893,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_ACUTE:
   {
   }
   case ltACCENT_ACUTE:
   {


@@ -948,7 +945,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_CARET:
   {
   }
   case ltACCENT_CARET:
   {


@@ -994,7 +991,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_TILDE:
   {
   }
   case ltACCENT_TILDE:
   {


@@ -1031,7 +1028,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_UMLAUT:
   {
   }
   case ltACCENT_UMLAUT:
   {


@@ -1083,7 +1080,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_DOT:
   {
   }
   case ltACCENT_DOT:
   {


@@ -1105,7 +1102,7 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_CADILLA:
   {
   }
   case ltACCENT_CADILLA:
   {


@@ -1127,21 +1124,21 @@ bool XLPOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

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

-  return TRUE;
+  return true;

 }
 
 bool XLPGo(void)
 {
   xlpBlockId = 0;
 
 }
 
 bool XLPGo(void)
 {
   xlpBlockId = 0;
 

-  if (InputFile && OutputFile)
+  if (!InputFile.empty() && !OutputFile.empty())

   {
     Contents = wxFopen(TmpContentsName, _T("w"));
     Chapters = wxFopen(_T("chapters.xlp"), _T("w"));
   {
     Contents = wxFopen(TmpContentsName, _T("w"));
     Chapters = wxFopen(_T("chapters.xlp"), _T("w"));


@@ -1208,8 +1205,7 @@ bool XLPGo(void)
     wxRemoveFile(_T("subsections.xlp"));
     wxRemoveFile(_T("subsubsections.xlp"));
     wxRemoveFile(_T("index.xlp"));
     wxRemoveFile(_T("subsections.xlp"));
     wxRemoveFile(_T("subsubsections.xlp"));
     wxRemoveFile(_T("index.xlp"));

-    return TRUE;
+    return true;

   }
   }

-  return FALSE;
+  return false;

 }
 }

-