printf() format mismatch warning fixed

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

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index b09bfd403e92a942905c76e80558ffda46d266fb..20bd6e35f023d68ae2a9358411c13a837020fcf0 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -2,7 +2,8 @@
 // Name:        rtfutils.cpp
 // Purpose:     Converts Latex to Word RTF/WinHelp RTF
 // Author:      Julian Smart
 // Name:        rtfutils.cpp
 // Purpose:     Converts Latex to Word RTF/WinHelp RTF
 // 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


@@ -65,17 +66,17 @@ extern wxChar *BigBuffer;
 extern wxHashTable TexReferences;
 
 // Are we in verbatim mode? If so, format differently.
 extern wxHashTable TexReferences;
 
 // Are we in verbatim mode? If so, format differently.

-static bool inVerbatim = FALSE;
+static bool inVerbatim = false;

 
 // We're in a series of PopRef topics, so don't output section headings
 
 // We're in a series of PopRef topics, so don't output section headings

-bool inPopRefSection = FALSE;
+bool inPopRefSection = false;

 
 // Green colour?
 
 // Green colour?

-static bool hotSpotColour = TRUE;
-static bool hotSpotUnderline = TRUE;
+static bool hotSpotColour = true;
+static bool hotSpotUnderline = true;

 
 // Transparency (WHITE = transparent)
 
 // Transparency (WHITE = transparent)

-static bool bitmapTransparency = TRUE;
+static bool bitmapTransparency = true;

 
 // Linear RTF requires us to set the style per section.
 static wxChar *currentNumberStyle = NULL;
 
 // Linear RTF requires us to set the style per section.
 static wxChar *currentNumberStyle = NULL;


@@ -109,8 +110,8 @@ int issuedNewParagraph = 0;
 
 // Need to know whether we're in a table or figure for benefit
 // of listoffigures/listoftables
 
 // Need to know whether we're in a table or figure for benefit
 // of listoffigures/listoftables

-static bool inFigure = FALSE;
-static bool inTable = FALSE;
+static bool inFigure = false;
+static bool inTable = false;

 
 /*
  * Current topics
 
 /*
  * Current topics


@@ -124,10 +125,10 @@ static wxChar *CurrentTopic = NULL;
 static bool InPopups()
 {
   if (CurrentChapterName && (wxStrcmp(CurrentChapterName, _T("popups")) == 0))
 static bool InPopups()
 {
   if (CurrentChapterName && (wxStrcmp(CurrentChapterName, _T("popups")) == 0))

-    return TRUE;
+    return true;

   if (CurrentSectionName && (wxStrcmp(CurrentSectionName, _T("popups")) == 0))
   if (CurrentSectionName && (wxStrcmp(CurrentSectionName, _T("popups")) == 0))

-    return TRUE;
-  return FALSE;
+    return true;
+  return false;

 }
 
 static void SetCurrentTopic(wxChar *s)
 }
 
 static void SetCurrentTopic(wxChar *s)


@@ -190,7 +191,7 @@ void NotifyParentHasChildren(int parentLevel)
       texTopic = new TexTopic;
       TopicTable.Put(parentTopic, texTopic);
     }
       texTopic = new TexTopic;
       TopicTable.Put(parentTopic, texTopic);
     }

-    texTopic->hasChildren = TRUE;
+    texTopic->hasChildren = true;

   }
 }
 
   }
 }
 


@@ -206,10 +207,10 @@ void ResetContentsLevels(int l)
 {
   int i;
   for (i = l; i < 5; i++)
 {
   int i;
   for (i = l; i < 5; i++)

-    ContentsLevels[i] = FALSE;
+    ContentsLevels[i] = false;

     
   // There are always books on the top level
     
   // There are always books on the top level

-  ContentsLevels[0] = TRUE;
+  ContentsLevels[0] = true;

 }
 
 // Output a WinHelp section as a keyword, substituting
 }
 
 // Output a WinHelp section as a keyword, substituting


@@ -292,7 +293,7 @@ void WriteWinHelpContentsFileLine(wxChar *topicName, wxChar *xitle, int level)
 
         // Remember that at this level, we had a book and *must* for the
         // remainder of sections at this level.
 
         // Remember that at this level, we had a book and *must* for the
         // remainder of sections at this level.

-        ContentsLevels[level-1] = TRUE;
+        ContentsLevels[level-1] = true;

       }
       else
       {
       }
       else
       {


@@ -306,7 +307,7 @@ void WriteWinHelpContentsFileLine(wxChar *topicName, wxChar *xitle, int level)
         // Always have a book at level 1
         wxFprintf(WinHelpContentsFile, _T("%d %s\n"), level, title);
         wxFprintf(WinHelpContentsFile, _T("%d %s=%s\n"), level+1, title, topicName);
         // Always have a book at level 1
         wxFprintf(WinHelpContentsFile, _T("%d %s\n"), level, title);
         wxFprintf(WinHelpContentsFile, _T("%d %s=%s\n"), level+1, title, topicName);

-        ContentsLevels[level-1] = TRUE;
+        ContentsLevels[level-1] = true;

       }
       else
         // Probably doesn't have children if it hasn't been added to the topic table
       }
       else
         // Probably doesn't have children if it hasn't been added to the topic table


@@ -539,7 +540,7 @@ bool WriteHPJ(wxChar *filename)
   
   FILE *fd = wxFopen(hpjFilename, _T("w"));
   if (!fd)
   
   FILE *fd = wxFopen(hpjFilename, _T("w"));
   if (!fd)

-    return FALSE;
+    return false;

 
   wxChar *helpTitle = winHelpTitle;
   if (!helpTitle)
 
   wxChar *helpTitle = winHelpTitle;
   if (!helpTitle)


@@ -580,7 +581,7 @@ bool WriteHPJ(wxChar *filename)
   wxFprintf(fd, _T("BrowseButtons()\n\n"));
   wxFprintf(fd, _T("[MAP]\n\n[BITMAPS]\n\n"));
   fclose(fd);
   wxFprintf(fd, _T("BrowseButtons()\n\n"));
   wxFprintf(fd, _T("[MAP]\n\n[BITMAPS]\n\n"));
   fclose(fd);

-  return TRUE;
+  return true;

 }
 
 
 }
 
 


@@ -594,7 +595,7 @@ bool WriteHPJ(wxChar *filename)
 
 void ProcessText2RTF(TexChunk *chunk)
 {
 
 void ProcessText2RTF(TexChunk *chunk)
 {

-  bool changed = FALSE;
+  bool changed = false;

   int ptr = 0;
   int i = 0;
   wxChar ch = 1;
   int ptr = 0;
   int i = 0;
   wxChar ch = 1;


@@ -610,7 +611,7 @@ void ProcessText2RTF(TexChunk *chunk)
         BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par\n")); ptr += 5;
 //        BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par{\\v this was verbatim}\n")); ptr += 5;
         i ++;
         BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par\n")); ptr += 5;
 //        BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("\\par{\\v this was verbatim}\n")); ptr += 5;
         i ++;

-        changed = TRUE;
+        changed = true;

       }
       else
       {
       }
       else
       {


@@ -626,7 +627,7 @@ void ProcessText2RTF(TexChunk *chunk)
             ((len > i+1 && chunk->value[i+1] == 13) &&
              (len > i+2 && isascii(chunk->value[i+2]) &&
               !isspace(chunk->value[i+2]))))
             ((len > i+1 && chunk->value[i+1] == 13) &&
              (len > i+2 && isascii(chunk->value[i+2]) &&
               !isspace(chunk->value[i+2]))))

-//        if (TRUE)
+//        if (true)

         {
           // DOS files have a 13 after the 10
           BigBuffer[ptr] = 10;
         {
           // DOS files have a 13 after the 10
           BigBuffer[ptr] = 10;


@@ -644,7 +645,7 @@ void ProcessText2RTF(TexChunk *chunk)
 
           // Note that the actual ASCII character seen is dealt with in the next
           // iteration
 
           // Note that the actual ASCII character seen is dealt with in the next
           // iteration

-          changed = TRUE;
+          changed = true;

         }
         else
         {
         }
         else
         {


@@ -657,27 +658,27 @@ void ProcessText2RTF(TexChunk *chunk)
     {
       BigBuffer[ptr] = '"'; ptr ++;
       i += 2;
     {
       BigBuffer[ptr] = '"'; ptr ++;
       i += 2;

-      changed = TRUE;
+      changed = true;

     }
     else if (!inVerbatim && ch == '`') // Change ` to '
     {
       BigBuffer[ptr] = 39; ptr ++;
       i += 1;
     }
     else if (!inVerbatim && ch == '`') // Change ` to '
     {
       BigBuffer[ptr] = 39; ptr ++;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     else if (inVerbatim && ch == '\\') // Change backslash to two backslashes
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = '\\'; ptr ++;
       i += 1;
     }
     else if (inVerbatim && ch == '\\') // Change backslash to two backslashes
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = '\\'; ptr ++;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curley bracket
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;
       i += 1;
     }
     else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curley bracket
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     else
     {
     }
     else
     {


@@ -717,7 +718,7 @@ void Text2RTF(TexChunk *chunk)
         return;
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB))
         return;
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB))

-        inVerbatim = TRUE;
+        inVerbatim = true;

 
       wxNode *node = chunk->children.GetFirst();
       while (node)
 
       wxNode *node = chunk->children.GetFirst();
       while (node)


@@ -728,7 +729,7 @@ void Text2RTF(TexChunk *chunk)
       }
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB))
       }
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB))

-        inVerbatim = FALSE;
+        inVerbatim = false;

 
       break;
     }
 
       break;
     }


@@ -764,7 +765,7 @@ wxChar *GetBrowseString(void)
 {
   wxChar buf[10];
   browseId ++;
 {
   wxChar buf[10];
   browseId ++;

-  wxSprintf(buf, _T("%ld"), browseId);
+  wxSnprintf(buf, sizeof(buf), _T("%ld"), browseId);

   int noZeroes = 5-wxStrlen(buf);
   wxStrcpy(browseBuf, _T("browse"));
   for (int i = 0; i < noZeroes; i++)
   int noZeroes = 5-wxStrlen(buf);
   wxStrcpy(browseBuf, _T("browse"));
   for (int i = 0; i < noZeroes; i++)


@@ -808,7 +809,7 @@ void WriteEnvironmentStyles(void)
   if (!inTabular && (ParIndent > 0) && (forbidParindent == 0))
   {
     wxChar buf[15];
   if (!inTabular && (ParIndent > 0) && (forbidParindent == 0))
   {
     wxChar buf[15];

-    wxSprintf(buf, _T("\\fi%d"), ParIndent*20); // Convert points to TWIPS
+    wxSnprintf(buf, sizeof(buf), _T("\\fi%d"), ParIndent*20); // Convert points to TWIPS

     TexOutput(buf);
   }
   if (environmentStack.GetCount() > 0 || (ParIndent > 0))
     TexOutput(buf);
   }
   if (environmentStack.GetCount() > 0 || (ParIndent > 0))


@@ -843,12 +844,12 @@ void OutputRTFHeaderCommands(void)
     TexOutput(_T("{\\i \\qr "));
     if (DocumentStyle == LATEX_ARTICLE)
     {
     TexOutput(_T("{\\i \\qr "));
     if (DocumentStyle == LATEX_ARTICLE)
     {

-      wxSprintf(buf, _T("SECTION %d"), sectionNo);
+      wxSnprintf(buf, sizeof(buf), _T("SECTION %d"), sectionNo);

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

-      wxSprintf(buf, _T("CHAPTER %d: "), chapterNo);
+      wxSnprintf(buf, sizeof(buf), _T("CHAPTER %d: "), chapterNo);

       TexOutput(buf);
     }
     TexOutput(_T("{\\field{\\*\\fldinst PAGE \\\\* MERGEFORMAT }{\\fldrslt 1}}"));
       TexOutput(buf);
     }
     TexOutput(_T("{\\field{\\*\\fldinst PAGE \\\\* MERGEFORMAT }{\\fldrslt 1}}"));


@@ -863,12 +864,12 @@ void OutputRTFHeaderCommands(void)
     TexOutput(_T("{\\i \\qc "));
     if (DocumentStyle == LATEX_ARTICLE)
     {
     TexOutput(_T("{\\i \\qc "));
     if (DocumentStyle == LATEX_ARTICLE)
     {

-      wxSprintf(buf, _T("SECTION %d"), sectionNo);
+      wxSnprintf(buf, sizeof(buf), _T("SECTION %d"), sectionNo);

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

-      wxSprintf(buf, _T("CHAPTER %d"), chapterNo);
+      wxSnprintf(buf, sizeof(buf), _T("CHAPTER %d"), chapterNo);

       TexOutput(buf);
     }
     TexOutput(_T("{\\field{\\*\\fldinst PAGE \\\\* MERGEFORMAT }{\\fldrslt 1}}"));
       TexOutput(buf);
     }
     TexOutput(_T("{\\field{\\*\\fldinst PAGE \\\\* MERGEFORMAT }{\\fldrslt 1}}"));


@@ -1075,7 +1076,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 {
 /*
   wxChar tmpBuf[40];
 {
 /*
   wxChar tmpBuf[40];

-  wxSprintf(tmpBuf, _T("%d (%d)"), macroId, (int)start);
+  wxSnprintf(tmpBuf, sizeof(tmpBuf), _T("%d (%d)"), macroId, (int)start);

   OutputDebugString("RTFOnMacro Start "); OutputDebugString(tmpBuf);
   OutputDebugString("\n"); wxYield();
 */
   OutputDebugString("RTFOnMacro Start "); OutputDebugString(tmpBuf);
   OutputDebugString("\n"); wxYield();
 */


@@ -1168,7 +1169,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         }
       }
   
         }
       }
   

-      startedSections = TRUE;
+      startedSections = true;

 
       // Output heading to contents page
       if (!InPopups())
 
       // Output heading to contents page
       if (!InPopups())


@@ -1176,7 +1177,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         OutputCurrentSection();
       
         if (winHelp)
         OutputCurrentSection();
       
         if (winHelp)

-          wxFprintf(Contents, _T("}{\\v %s}\\par\\pard\n"), topicName);
+        {
+          wxFprintf(Contents, _T("}{\\v %s}\\pard\\par\n"), topicName);
+          //WriteEnvironmentStyles();
+        }

         else if ((macroId == ltCHAPTER) || (macroId == ltCHAPTERHEADING))
           wxFprintf(Contents, _T("}\\par\\par\\pard\n"));
 
         else if ((macroId == ltCHAPTER) || (macroId == ltCHAPTERHEADING))
           wxFprintf(Contents, _T("}\\par\\par\\pard\n"));
 


@@ -1321,7 +1325,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (winHelp)
           wxFprintf(Sections, _T("\\page\n"));
       }
         if (winHelp)
           wxFprintf(Sections, _T("\\page\n"));
       }

-      startedSections = TRUE;
+      startedSections = true;

 
       if (winHelp)
         wxFprintf(Sections, _T("\n${\\footnote "));
 
       if (winHelp)
         wxFprintf(Sections, _T("\n${\\footnote "));


@@ -1333,7 +1337,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       if (winHelp)
       {
         if (!InPopups())
       if (winHelp)
       {
         if (!InPopups())

-          wxFprintf(jumpFrom, _T("}{\\v %s}\\par\\pard\n"), topicName);
+        {
+          wxFprintf(jumpFrom, _T("}{\\v %s}\\pard\\par\n"), topicName);
+          //WriteEnvironmentStyles();
+        }

       }
       else if ((macroId != ltSECTIONSTAR) && (macroId != ltGLOSS))
       {
       }
       else if ((macroId != ltSECTIONSTAR) && (macroId != ltGLOSS))
       {


@@ -1485,7 +1492,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
           wxFprintf(Chapters, _T("\\par\n"));
 #endif        
       }
           wxFprintf(Chapters, _T("\\par\n"));
 #endif        
       }

-      startedSections = TRUE;
+      startedSections = true;

 
       if (winHelp)
         wxFprintf(Subsections, _T("\n${\\footnote "));
 
       if (winHelp)
         wxFprintf(Subsections, _T("\n${\\footnote "));


@@ -1497,7 +1504,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       if (winHelp)
       {
         if (!InPopups())
       if (winHelp)
       {
         if (!InPopups())

-          wxFprintf(Sections, _T("}{\\v %s}\\par\\pard\n"), topicName);
+        {
+          wxFprintf(Sections, _T("}{\\v %s}\\pard\\par\n"), topicName);
+          //WriteEnvironmentStyles();
+        }

       }
       else if ((macroId != ltSUBSECTIONSTAR) && (macroId != ltMEMBERSECTION) &&
          (macroId != ltFUNCTIONSECTION))
       }
       else if ((macroId != ltSUBSECTIONSTAR) && (macroId != ltMEMBERSECTION) &&
          (macroId != ltFUNCTIONSECTION))


@@ -1643,7 +1653,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 #endif        
       }
 
 #endif        
       }
 

-      startedSections = TRUE;
+      startedSections = true;

 
       if (winHelp)
         wxFprintf(Subsubsections, _T("\n${\\footnote "));
 
       if (winHelp)
         wxFprintf(Subsubsections, _T("\n${\\footnote "));


@@ -1652,7 +1662,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       OutputCurrentSection();
 
       if (winHelp)
       OutputCurrentSection();
 
       if (winHelp)

-        wxFprintf(Subsections, _T("}{\\v %s}\\par\\pard\n"), topicName);
+      {
+        wxFprintf(Subsections, _T("}{\\v %s}\\pard\\par\n"), topicName);
+        //WriteEnvironmentStyles();
+      }

       else if ((DocumentStyle == LATEX_ARTICLE) && (macroId != ltSUBSUBSECTIONSTAR))
         wxFprintf(Contents, _T("\\par\\pard\n"));
         
       else if ((DocumentStyle == LATEX_ARTICLE) && (macroId != ltSUBSUBSECTIONSTAR))
         wxFprintf(Contents, _T("\\par\\pard\n"));
         


@@ -1752,13 +1765,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (winHelp || !useWord)
         {
           if (DocumentStyle != LATEX_ARTICLE)
         if (winHelp || !useWord)
         {
           if (DocumentStyle != LATEX_ARTICLE)

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

           else
           else

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

         }
         else
         {
         }
         else
         {

-          wxSprintf(figBuf, _T("%s {\\field\\flddirty{\\*\\fldinst  SEQ Figure \\\\* ARABIC }{\\fldrslt {\\bkmkstart %s}??{\\bkmkend %s}}}: "),
+          wxSnprintf(figBuf, sizeof(figBuf), _T("%s {\\field\\flddirty{\\*\\fldinst  SEQ Figure \\\\* ARABIC }{\\fldrslt {\\bkmkstart %s}??{\\bkmkend %s}}}: "),

                FigureNameString, topicName, topicName);
         }
       }
                FigureNameString, topicName, topicName);
         }
       }


@@ -1769,13 +1782,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (winHelp || !useWord)
         {
           if (DocumentStyle != LATEX_ARTICLE)
         if (winHelp || !useWord)
         {
           if (DocumentStyle != LATEX_ARTICLE)

-            wxSprintf(figBuf, _T("%s %d.%d: "), TableNameString, chapterNo, tableNo);
+            wxSnprintf(figBuf, sizeof(figBuf), _T("%s %d.%d: "), TableNameString, chapterNo, tableNo);

           else
           else

-            wxSprintf(figBuf, _T("%s %d: "), TableNameString, tableNo);
+            wxSnprintf(figBuf, sizeof(figBuf), _T("%s %d: "), TableNameString, tableNo);

         }
         else
         {
         }
         else
         {

-          wxSprintf(figBuf, _T("%s {\\field\\flddirty{\\*\\fldinst  SEQ Table \\\\* ARABIC }{\\fldrslt {\\bkmkstart %s}??{\\bkmkend %s}}}: "),
+          wxSnprintf(figBuf, sizeof(figBuf), _T("%s {\\field\\flddirty{\\*\\fldinst  SEQ Table \\\\* ARABIC }{\\fldrslt {\\bkmkstart %s}??{\\bkmkend %s}}}: "),

                TableNameString, topicName, topicName);
         }
       }
                TableNameString, topicName, topicName);
         }
       }


@@ -1812,18 +1825,18 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       if (winHelp)
       {
         TexOutput(_T("K{\\footnote {K} "));
       if (winHelp)
       {
         TexOutput(_T("K{\\footnote {K} "));

-        suppressNameDecoration = TRUE;
+        suppressNameDecoration = true;

         TraverseChildrenFromChunk(currentMember);
         TraverseChildrenFromChunk(currentMember);

-        suppressNameDecoration = FALSE;
+        suppressNameDecoration = false;

         TexOutput(_T("}\n"));
       }
       if (!winHelp && useWord)
       {
         // Insert index entry for this function
         TexOutput(_T("{\\xe\\v {"));
         TexOutput(_T("}\n"));
       }
       if (!winHelp && useWord)
       {
         // Insert index entry for this function
         TexOutput(_T("{\\xe\\v {"));

-        suppressNameDecoration = TRUE;  // Necessary so don't print "(\\bf" etc.
+        suppressNameDecoration = true;  // Necessary so don't print "(\\bf" etc.

         TraverseChildrenFromChunk(currentMember);
         TraverseChildrenFromChunk(currentMember);

-        suppressNameDecoration = FALSE;
+        suppressNameDecoration = false;

         TexOutput(_T("}}"));
       }
     }
         TexOutput(_T("}}"));
       }
     }


@@ -1842,18 +1855,18 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       if (winHelp)
       {
         TexOutput(_T("K{\\footnote {K} "));
       if (winHelp)
       {
         TexOutput(_T("K{\\footnote {K} "));

-        suppressNameDecoration = TRUE;  // Necessary so don't print "(\\bf" etc.
+        suppressNameDecoration = true;  // Necessary so don't print "(\\bf" etc.

         TraverseChildrenFromChunk(currentMember);
         TraverseChildrenFromChunk(currentMember);

-        suppressNameDecoration = FALSE;
+        suppressNameDecoration = false;

         TexOutput(_T("}\n"));
       }
       if (!winHelp && useWord)
       {
         // Insert index entry for this function
         TexOutput(_T("{\\xe\\v {"));
         TexOutput(_T("}\n"));
       }
       if (!winHelp && useWord)
       {
         // Insert index entry for this function
         TexOutput(_T("{\\xe\\v {"));

-        suppressNameDecoration = TRUE;  // Necessary so don't print "(\\bf" etc.
+        suppressNameDecoration = true;  // Necessary so don't print "(\\bf" etc.

         TraverseChildrenFromChunk(currentMember);
         TraverseChildrenFromChunk(currentMember);

-        suppressNameDecoration = FALSE;
+        suppressNameDecoration = false;

         TexOutput(_T("}}"));
       }
     }
         TexOutput(_T("}}"));
       }
     }


@@ -1879,9 +1892,9 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       {
         // Insert index entry for this function
         TexOutput(_T("{\\xe\\v {"));
       {
         // Insert index entry for this function
         TexOutput(_T("{\\xe\\v {"));

-        suppressNameDecoration = TRUE;  // Necessary so don't print "(\\bf" etc.
+        suppressNameDecoration = true;  // Necessary so don't print "(\\bf" etc.

         TraverseChildrenFromChunk(currentMember);
         TraverseChildrenFromChunk(currentMember);

-        suppressNameDecoration = FALSE;
+        suppressNameDecoration = false;

         TexOutput(_T("}}"));
       }
     }
         TexOutput(_T("}}"));
       }
     }


@@ -1903,10 +1916,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         TexOutput(_T("\\par\\pard\\pgnrestart\\sect\\titlepg"));
 
        // In linear RTF, same as chapter headings.
         TexOutput(_T("\\par\\pard\\pgnrestart\\sect\\titlepg"));
 
        // In linear RTF, same as chapter headings.

-        wxSprintf(buf, _T("{\\b\\fs%d %s}\\par\\par\\pard\n\n"), chapterFont*2, ContentsNameString);
+        wxSnprintf(buf, sizeof(buf), _T("{\\b\\fs%d %s}\\par\\par\\pard\n\n"), chapterFont*2, ContentsNameString);

 
         TexOutput(buf);
 
         TexOutput(buf);

-        wxSprintf(buf, _T("{\\field{\\*\\fldinst TOC \\\\o \"1-%d\" }{\\fldrslt PRESS F9 TO REFORMAT CONTENTS}}\n"), contentsDepth);
+        wxSnprintf(buf, sizeof(buf), _T("{\\field{\\*\\fldinst TOC \\\\o \"1-%d\" }{\\fldrslt PRESS F9 TO REFORMAT CONTENTS}}\n"), contentsDepth);

         TexOutput(buf);
 //        TexOutput(_T("\\sect\\sectd"));
       }
         TexOutput(buf);
 //        TexOutput(_T("\\sect\\sectd"));
       }


@@ -1965,10 +1978,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      if (TRUE) // (inVerbatim)
+      #if 1 // if(inVerbatim)

         TexOutput(_T("~"));
         TexOutput(_T("~"));

-      else
+      #else

         TexOutput(_T(" "));
         TexOutput(_T(" "));

+      #endif

     }
     break;
   }
     }
     break;
   }


@@ -1990,7 +2004,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
           if (TableData[i].leftBorder)
             TexOutput(_T("\\clbrdrl\\brdrs\\brdrw15"));
           
           if (TableData[i].leftBorder)
             TexOutput(_T("\\clbrdrl\\brdrs\\brdrw15"));
           

-          wxSprintf(buf, _T("\\cellx%d"), currentWidth);
+          wxSnprintf(buf, sizeof(buf), _T("\\cellx%d"), currentWidth);

           TexOutput(buf);
         }
         TexOutput(_T("\\pard\\intbl\n"));
           TexOutput(buf);
         }
         TexOutput(_T("\\pard\\intbl\n"));


@@ -2059,7 +2073,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       ItemizeStruc *struc = new ItemizeStruc(listType, indentSize2, indentSize1);
       itemizeStack.Insert(struc);
       
       ItemizeStruc *struc = new ItemizeStruc(listType, indentSize2, indentSize1);
       itemizeStack.Insert(struc);
       

-      wxSprintf(buf, _T("\\tx%d\\tx%d\\li%d\\sa200"), indentSize1, indentSize2, indentSize2);
+      wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\tx%d\\li%d\\sa200"), indentSize1, indentSize2, indentSize2);

       PushEnvironmentStyle(buf);
     }
     else
       PushEnvironmentStyle(buf);
     }
     else


@@ -2077,8 +2091,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 /* Change 18/7/97 - don't know why we wish to do this
       if (itemizeStack.Number() == 0)
       {
 /* Change 18/7/97 - don't know why we wish to do this
       if (itemizeStack.Number() == 0)
       {

-        OnMacro(ltPAR, 0, TRUE);
-        OnMacro(ltPAR, 0, FALSE);
+        OnMacro(ltPAR, 0, true);
+        OnMacro(ltPAR, 0, false);

         issuedNewParagraph = 2;
       }
 */
         issuedNewParagraph = 2;
       }
 */


@@ -2100,8 +2114,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       ItemizeStruc *struc = new ItemizeStruc(LATEX_TWOCOL, indentSize);
       itemizeStack.Insert(struc);
       
       ItemizeStruc *struc = new ItemizeStruc(LATEX_TWOCOL, indentSize);
       itemizeStack.Insert(struc);
       

-//      wxSprintf(buf, _T("\\tx%d\\li%d\\ri%d"), indentSize, indentSize, TwoColWidthA+TwoColWidthB+oldIndent);
-      wxSprintf(buf, _T("\\tx%d\\li%d\\sa200"), indentSize, indentSize);
+//      wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\ri%d"), indentSize, indentSize, TwoColWidthA+TwoColWidthB+oldIndent);
+      wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\sa200"), indentSize, indentSize);

       PushEnvironmentStyle(buf);
     }
     else
       PushEnvironmentStyle(buf);
     }
     else


@@ -2126,8 +2140,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       if (itemizeStack.GetCount() == 0)
       {
         issuedNewParagraph = 0;
       if (itemizeStack.GetCount() == 0)
       {
         issuedNewParagraph = 0;

-        OnMacro(ltPAR, 0, TRUE);
-        OnMacro(ltPAR, 0, FALSE);
+        OnMacro(ltPAR, 0, true);
+        OnMacro(ltPAR, 0, false);

       }
 #endif      
     }
       }
 #endif      
     }


@@ -2159,7 +2173,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 //          WriteEnvironmentStyles();
         }
 
 //          WriteEnvironmentStyles();
         }
 

-        wxSprintf(buf, _T("\\tx%d\\tx%d\\li%d\\fi-%d\n"), indentSize1, indentSize2,
+        wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\tx%d\\li%d\\fi-%d\n"), indentSize1, indentSize2,

                   indentSize2, 20*itemIndentTab);
         TexOutput(buf);
 
                   indentSize2, 20*itemIndentTab);
         TexOutput(buf);
 


@@ -2176,7 +2190,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
            }
            else
            {
            }
            else
            {

-              wxSprintf(indentBuf, _T("\\tab{\\b %d.}\\tab"), struc->currentItem);
+              wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\tab{\\b %d.}\\tab"), struc->currentItem);

               TexOutput(indentBuf);
             }
             break;
               TexOutput(indentBuf);
             }
             break;


@@ -2195,14 +2209,14 @@ void RTFOnMacro(int macroId, int no_args, bool start)
               if (bulletFile && winHelp)
               {
                 if (winHelpVersion > 3) // Transparent bitmap
               if (bulletFile && winHelp)
               {
                 if (winHelpVersion > 3) // Transparent bitmap

-                  wxSprintf(indentBuf, _T("\\tab\\{bmct %s\\}\\tab"), bulletFile);
+                  wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\tab\\{bmct %s\\}\\tab"), bulletFile);

                 else
                 else

-                  wxSprintf(indentBuf, _T("\\tab\\{bmc %s\\}\\tab"), bulletFile);
+                  wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\tab\\{bmc %s\\}\\tab"), bulletFile);

               }
               else if (winHelp)
               }
               else if (winHelp)

-                wxSprintf(indentBuf, _T("\\tab{\\b o}\\tab"));
+                wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\tab{\\b o}\\tab"));

               else
               else

-                wxSprintf(indentBuf, _T("\\tab{\\f1\\'b7}\\tab"));
+                wxSnprintf(indentBuf, sizeof(indentBuf), _T("\\tab{\\f1\\'b7}\\tab"));

               TexOutput(indentBuf);
             }
             break;
               TexOutput(indentBuf);
             }
             break;


@@ -2254,13 +2268,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         }
 #endif        
 
         }
 #endif        
 

-//        wxSprintf(buf, _T("\\tx%d\\li%d\\fi-%d\\ri%d\n"), TwoColWidthA,
+//        wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\fi-%d\\ri%d\n"), TwoColWidthA,

 //             TwoColWidthA, TwoColWidthA, TwoColWidthA+TwoColWidthB+oldIndent);
 /*
 //             TwoColWidthA, TwoColWidthA, TwoColWidthA+TwoColWidthB+oldIndent);
 /*

-        wxSprintf(buf, _T("\\tx%d\\li%d\\fi-%d\n"), TwoColWidthA,
+        wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\fi-%d\n"), TwoColWidthA,

              TwoColWidthA, TwoColWidthA);
 */
              TwoColWidthA, TwoColWidthA);
 */

-        wxSprintf(buf, _T("\\tx%d\\li%d\\fi-%d\n"), TwoColWidthA + oldIndent,
+        wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\fi-%d\n"), TwoColWidthA + oldIndent,

              TwoColWidthA + oldIndent, TwoColWidthA);
         TexOutput(buf);
       }
              TwoColWidthA + oldIndent, TwoColWidthA);
         TexOutput(buf);
       }


@@ -2287,9 +2301,9 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 #endif
       
       if (macroId == ltVERBATIM)
 #endif
       
       if (macroId == ltVERBATIM)

-        wxSprintf(buf, _T("{\\f3\\s10\\fs20\\li720\\sa0 "));
+        wxSnprintf(buf, sizeof(buf), _T("{\\f3\\s10\\fs20\\li720\\sa0 "));

       else
       else

-        wxSprintf(buf, _T("{\\f3\\fs20 "));
+        wxSnprintf(buf, sizeof(buf), _T("{\\f3\\fs20 "));

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


@@ -2368,7 +2382,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), smallFont*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), smallFont*2);

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


@@ -2379,7 +2393,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), tinyFont*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), tinyFont*2);

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


@@ -2389,7 +2403,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), normalFont*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), normalFont*2);

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


@@ -2399,7 +2413,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), largeFont1*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), largeFont1*2);

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


@@ -2409,7 +2423,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), LargeFont2*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), LargeFont2*2);

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


@@ -2419,7 +2433,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), LARGEFont3*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), LARGEFont3*2);

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


@@ -2429,7 +2443,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), hugeFont1*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), hugeFont1*2);

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


@@ -2439,7 +2453,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), HugeFont2*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), HugeFont2*2);

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


@@ -2449,7 +2463,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("{\\fs%d\n"), HUGEFont3*2);
+      wxSnprintf(buf, sizeof(buf), _T("{\\fs%d\n"), HUGEFont3*2);

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


@@ -2575,11 +2589,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
           // Extra par if parskip is more than zero (usually looks best.)
           // N.B. JACS 2004-02-21: shouldn't need this for linear RTF if
           // we have a suitable set of styles.
           // Extra par if parskip is more than zero (usually looks best.)
           // N.B. JACS 2004-02-21: shouldn't need this for linear RTF if
           // we have a suitable set of styles.

+#if 0

           if (winHelp && !inTabular && (ParSkip > 0))
                  {
             TexOutput(_T("\\par"));
             issuedNewParagraph ++;
                  }
           if (winHelp && !inTabular && (ParSkip > 0))
                  {
             TexOutput(_T("\\par"));
             issuedNewParagraph ++;
                  }

+#endif          

           WriteEnvironmentStyles();
                }
                // 1 is a whole paragraph if ParSkip == 0,
           WriteEnvironmentStyles();
                }
                // 1 is a whole paragraph if ParSkip == 0,


@@ -2588,13 +2604,14 @@ void RTFOnMacro(int macroId, int no_args, bool start)
                {
                  // Don't need a par at all if we've already had one,
                  // and ParSkip == 0.
                {
                  // Don't need a par at all if we've already had one,
                  // and ParSkip == 0.

-
+#if 0

           // Extra par if parskip is more than zero (usually looks best.)
           if (winHelp && !inTabular && (ParSkip > 0))
                  {
             TexOutput(_T("\\par"));
             issuedNewParagraph ++;
                  }
           // Extra par if parskip is more than zero (usually looks best.)
           if (winHelp && !inTabular && (ParSkip > 0))
                  {
             TexOutput(_T("\\par"));
             issuedNewParagraph ++;
                  }

+#endif          

           WriteEnvironmentStyles();
                }
 /*
           WriteEnvironmentStyles();
                }
 /*


@@ -2628,7 +2645,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       TexOutput(_T("\\par\\pard"));
       if (!winHelp)
         TexOutput(_T("\\par"));
       TexOutput(_T("\\par\\pard"));
       if (!winHelp)
         TexOutput(_T("\\par"));

-      wxSprintf(buf, _T("\\qc{\\fs%d\\b "), titleFont*2);
+      wxSnprintf(buf, sizeof(buf), _T("\\qc{\\fs%d\\b "), titleFont*2);

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


@@ -2637,7 +2654,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       {
         if (!winHelp)
           TexOutput(_T("\\par"));
       {
         if (!winHelp)
           TexOutput(_T("\\par"));

-        wxSprintf(buf, _T("\\par\\qc{\\fs%d "), authorFont*2);
+        wxSnprintf(buf, sizeof(buf), _T("\\par\\qc{\\fs%d "), authorFont*2);

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


@@ -2646,7 +2663,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       if (DocumentDate)
       {
         TexOutput(_T("\\par"));
       if (DocumentDate)
       {
         TexOutput(_T("\\par"));

-        wxSprintf(buf, _T("\\qc{\\fs%d "), authorFont*2);
+        wxSnprintf(buf, sizeof(buf), _T("\\qc{\\fs%d "), authorFont*2);

         TexOutput(buf);
         TraverseChildrenFromChunk(DocumentDate);
         TexOutput(_T("}\\par\\pard\n"));
         TexOutput(buf);
         TraverseChildrenFromChunk(DocumentDate);
         TexOutput(_T("}\\par\\pard\n"));


@@ -2730,7 +2747,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
     if (start)
     {
 //      TexOutput(_T("{\\field{\\*\\fldinst SECTION \\\\* MERGEFORMAT }{\\fldrslt 1}}"));
     if (start)
     {
 //      TexOutput(_T("{\\field{\\*\\fldinst SECTION \\\\* MERGEFORMAT }{\\fldrslt 1}}"));

-      wxSprintf(buf, _T("%d"), chapterNo);
+      wxSnprintf(buf, sizeof(buf), _T("%d"), chapterNo);

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


@@ -2740,7 +2757,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
     if (start)
     {
 //      TexOutput(_T("{\\field{\\*\\fldinst SECTION \\\\* MERGEFORMAT }{\\fldrslt 1}}"));
     if (start)
     {
 //      TexOutput(_T("{\\field{\\*\\fldinst SECTION \\\\* MERGEFORMAT }{\\fldrslt 1}}"));

-      wxSprintf(buf, _T("%d"), sectionNo);
+      wxSnprintf(buf, sizeof(buf), _T("%d"), sectionNo);

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


@@ -2766,8 +2783,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
     if (start && useWord && !winHelp)
     {
       FakeCurrentSection(_T("Index"));
     if (start && useWord && !winHelp)
     {
       FakeCurrentSection(_T("Index"));

-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);

       TexOutput(_T("\\par{\\field{\\*\\fldinst INDEX \\\\h \"\\emdash A\\emdash \"\\\\c \"2\"}{\\fldrslt PRESS F9 TO REFORMAT INDEX}}\n"));
     }
     break;
       TexOutput(_T("\\par{\\field{\\*\\fldinst INDEX \\\\h \"\\emdash A\\emdash \"\\\\c \"2\"}{\\fldrslt PRESS F9 TO REFORMAT INDEX}}\n"));
     }
     break;


@@ -2776,13 +2793,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start && useWord && !winHelp)
     {
   {
     if (start && useWord && !winHelp)
     {

-      FakeCurrentSection(FiguresNameString, FALSE);
-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
+      FakeCurrentSection(FiguresNameString, false);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);

       wxChar buf[200];
       wxChar buf[200];

-      wxSprintf(buf, _T("{\\field\\fldedit{\\*\\fldinst  TOC \\\\c \"%s\" }{\\fldrslt PRESS F9 TO REFORMAT LIST OF FIGURES}}\n"),
+      wxSnprintf(buf, sizeof(buf), _T("{\\field\\fldedit{\\*\\fldinst  TOC \\\\c \"%s\" }{\\fldrslt PRESS F9 TO REFORMAT LIST OF FIGURES}}\n"),

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


@@ -2792,13 +2809,13 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   {
     if (start && useWord && !winHelp)
     {
   {
     if (start && useWord && !winHelp)
     {

-      FakeCurrentSection(TablesNameString, FALSE);
-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
+      FakeCurrentSection(TablesNameString, false);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);

       wxChar buf[200];
       wxChar buf[200];

-      wxSprintf(buf, _T("{\\field\\fldedit{\\*\\fldinst  TOC \\\\c \"%s\" }{\\fldrslt PRESS F9 TO REFORMAT LIST OF TABLES}}\n"),
+      wxSnprintf(buf, sizeof(buf), _T("{\\field\\fldedit{\\*\\fldinst  TOC \\\\c \"%s\" }{\\fldrslt PRESS F9 TO REFORMAT LIST OF TABLES}}\n"),

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


@@ -3153,14 +3170,14 @@ void RTFOnMacro(int macroId, int no_args, bool start)
     break;
   case ltFIGURE:
   {
     break;
   case ltFIGURE:
   {

-    if (start) inFigure = TRUE;
-    else inFigure = FALSE;
+    if (start) inFigure = true;
+    else inFigure = false;

     break;
   }
   case ltTABLE:
   {
     break;
   }
   case ltTABLE:
   {

-    if (start) inTable = TRUE;
-    else inTable = FALSE;
+    if (start) inTable = true;
+    else inTable = false;

     break;
   }
   default:
     break;
   }
   default:


@@ -3195,7 +3212,7 @@ bool RTFOnArgument(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:
   {
   }
   case ltFUNC:
   {


@@ -3344,7 +3361,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         wxFprintf(Chapters, _T("{\\field{\\*\\fldinst  REF %s \\\\* MERGEFORMAT }{\\fldrslt ??}}"),
                 refName);
       }
         wxFprintf(Chapters, _T("{\\field{\\*\\fldinst  REF %s \\\\* MERGEFORMAT }{\\fldrslt ??}}"),
                 refName);
       }

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -3389,7 +3406,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         if (start)
           helpRefText = GetArgChunk();
 
         if (start)
           helpRefText = GetArgChunk();
 

-        return TRUE;
+        return true;

       }
       else if ((GetNoArgs() - arg_no) == 0) // Arg = 2, or 3 if first is optional
       {
       }
       else if ((GetNoArgs() - arg_no) == 0) // Arg = 2, or 3 if first is optional
       {


@@ -3428,7 +3445,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
                     {
                       if (!ignoreBadRefs)
                         TexOutput(_T("??"));
                     {
                       if (!ignoreBadRefs)
                         TexOutput(_T("??"));

-                      wxSprintf(buf, _T("Warning: unresolved reference '%s'"), refName);
+                      wxSnprintf(buf, sizeof(buf), _T("Warning: unresolved reference '%s'"), refName);

                       OnInform(buf);
                     }
                   }
                       OnInform(buf);
                     }
                   }


@@ -3442,7 +3459,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
               TexOutput(_T(")"));
           }
         }
               TexOutput(_T(")"));
           }
         }

-        return FALSE;
+        return false;

       }
     }
     break;
       }
     }
     break;


@@ -3451,21 +3468,21 @@ bool RTFOnArgument(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)
       {

-        inVerbatim = TRUE;
+        inVerbatim = true;

         TexOutput(_T(" ({\\f3 "));
       }
       else
       {
         TexOutput(_T("})"));
         TexOutput(_T(" ({\\f3 "));
       }
       else
       {
         TexOutput(_T("})"));

-        inVerbatim = FALSE;
+        inVerbatim = false;

       }
       }

-      return TRUE;
+      return true;

     }
     break;
   }
     }
     break;
   }


@@ -3504,9 +3521,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           TexOutput(_T("{\\i "));
         else
           TexOutput(_T("}"));
           TexOutput(_T("{\\i "));
         else
           TexOutput(_T("}"));

-        return TRUE;
+        return true;

       }
       }

-      else return FALSE;
+      else return false;

     }
     break;
   }
     }
     break;
   }


@@ -3518,9 +3535,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         contentsLineSection = copystring(GetArgData());
       else if (arg_no == 3)
         contentsLineValue = copystring(GetArgData());
         contentsLineSection = copystring(GetArgData());
       else if (arg_no == 3)
         contentsLineValue = copystring(GetArgData());

-      return FALSE;
+      return false;

     }
     }

-    else return FALSE;
+    else return false;

   }
   case ltIMAGE:
   case ltIMAGEL:
   }
   case ltIMAGE:
   case ltIMAGEL:


@@ -3529,7 +3546,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
   case ltPSBOXTO:
   {
     if (arg_no == 3)
   case ltPSBOXTO:
   {
     if (arg_no == 3)

-      return FALSE;
+      return false;

       
     static int imageWidth = 0;
     static int imageHeight = 0;
       
     static int imageWidth = 0;
     static int imageHeight = 0;


@@ -3563,7 +3580,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
 
       if (imageDimensions)  // glt
           delete [] imageDimensions;
 
       if (imageDimensions)  // glt
           delete [] imageDimensions;

-      return FALSE;
+      return false;

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


@@ -3634,7 +3651,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           TexOutput(_T("[No BMP or WMF for image file "));
           TexOutput(filename);
           TexOutput(_T("]"));
           TexOutput(_T("[No BMP or WMF for image file "));
           TexOutput(filename);
           TexOutput(_T("]"));

-          wxSprintf(buf, _T("Warning: could not find a BMP or WMF equivalent for %s."), filename);
+          wxSnprintf(buf, sizeof(buf), _T("Warning: could not find a BMP or WMF equivalent for %s."), filename);

           OnInform(buf);
         }
         if (filename)  // glt
           OnInform(buf);
         }
         if (filename)  // glt


@@ -3656,7 +3673,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
               OutputBitmapData(fd);
             else
             {
               OutputBitmapData(fd);
             else
             {

-              wxSprintf(buf, _T("Could not read bitmap %s.\nMay be in wrong format (needs RGB-encoded Windows BMP)."), f.c_str());
+              wxSnprintf(buf, sizeof(buf), _T("Could not read bitmap %s.\nMay be in wrong format (needs RGB-encoded Windows BMP)."), f.c_str());

               OnError(buf);
             }
             fclose(fd);
               OnError(buf);
             }
             fclose(fd);


@@ -3678,7 +3695,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
               }
               else
               {
               }
               else
               {

-                wxSprintf(buf, _T("Could not read metafile %s. Perhaps it's not a placeable metafile?"), f.c_str());
+                wxSnprintf(buf, sizeof(buf), _T("Could not read metafile %s. Perhaps it's not a placeable metafile?"), f.c_str());

                 OnError(buf);
               }
               fclose(fd);
                 OnError(buf);
               }
               fclose(fd);


@@ -3689,17 +3706,17 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
               TexOutput(_T("[No BMP or WMF for image file "));
               TexOutput(filename);
               TexOutput(_T("]"));
               TexOutput(_T("[No BMP or WMF for image file "));
               TexOutput(filename);
               TexOutput(_T("]"));

-              wxSprintf(buf, _T("Warning: could not find a BMP or WMF equivalent for %s."), filename);
+              wxSnprintf(buf, sizeof(buf), _T("Warning: could not find a BMP or WMF equivalent for %s."), filename);

               OnInform(buf);
 #ifdef __WXMSW__
             }
 #endif
         }
       }
               OnInform(buf);
 #ifdef __WXMSW__
             }
 #endif
         }
       }

-      return FALSE;
+      return false;

     }
     else
     }
     else

-      return FALSE;
+      return false;

   }
   case ltTABULAR:
   case ltSUPERTABULAR:
   }
   case ltTABULAR:
   case ltSUPERTABULAR:


@@ -3709,10 +3726,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       if (start)
       {
         currentRowNumber = 0;
       if (start)
       {
         currentRowNumber = 0;

-        inTabular = TRUE;
-        startRows = TRUE;
-        tableVerticalLineLeft = FALSE;
-        tableVerticalLineRight = FALSE;
+        inTabular = true;
+        startRows = true;
+        tableVerticalLineLeft = false;
+        tableVerticalLineRight = false;

         int currentWidth = 0;
 
         wxChar *alignString = copystring(GetArgData());
         int currentWidth = 0;
 
         wxChar *alignString = copystring(GetArgData());


@@ -3728,21 +3745,21 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           for (int i = 0; i < noColumns; i++)
           {
             currentWidth += TableData[i].width;
           for (int i = 0; i < noColumns; i++)
           {
             currentWidth += TableData[i].width;

-            wxSprintf(buf, _T("\\cellx%d"), currentWidth);
+            wxSnprintf(buf, sizeof(buf), _T("\\cellx%d"), currentWidth);

             TexOutput(buf);
           }
           TexOutput(_T("\\pard\\intbl\n"));
         }
         delete[] alignString;
 
             TexOutput(buf);
           }
           TexOutput(_T("\\pard\\intbl\n"));
         }
         delete[] alignString;
 

-        return FALSE;
+        return false;

       }
     }
     else if (arg_no == 2 && !start)
     {
       TexOutput(_T("\\pard\n"));
       WriteEnvironmentStyles();
       }
     }
     else if (arg_no == 2 && !start)
     {
       TexOutput(_T("\\pard\n"));
       WriteEnvironmentStyles();

-      inTabular = FALSE;
+      inTabular = false;

     }
     break;
   }
     }
     break;
   }


@@ -3760,8 +3777,8 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     {
       forbidParindent --;
       PopEnvironmentStyle();
     {
       forbidParindent --;
       PopEnvironmentStyle();

-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);

     }
     break;
   }
     }
     break;
   }


@@ -3775,8 +3792,8 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     else
     {
       PopEnvironmentStyle();
     else
     {
       PopEnvironmentStyle();

-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);

     }
     break;
   }
     }
     break;
   }


@@ -3788,15 +3805,15 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

-      wxSprintf(buf, _T("\\sa200\\box\\trgaph108%s\n"), ((macroId == ltNORMALBOXD) ? _T("\\brdrdb") : _T("\\brdrs")));
+      wxSnprintf(buf, sizeof(buf), _T("\\sa200\\box\\trgaph108%s\n"), ((macroId == ltNORMALBOXD) ? _T("\\brdrdb") : _T("\\brdrs")));

       TexOutput(buf);
       PushEnvironmentStyle(buf);
     }
     else
     {
       PopEnvironmentStyle();
       TexOutput(buf);
       PushEnvironmentStyle(buf);
     }
     else
     {
       PopEnvironmentStyle();

-      OnMacro(ltPAR, 0, TRUE);
-      OnMacro(ltPAR, 0, FALSE);
+      OnMacro(ltPAR, 0, true);
+      OnMacro(ltPAR, 0, false);

     }
     break;
   }
     }
     break;
   }


@@ -3811,10 +3828,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         SetFontSizes(11);
       else if (wxStrcmp(data, _T("12")) == 0)
         SetFontSizes(12);
         SetFontSizes(11);
       else if (wxStrcmp(data, _T("12")) == 0)
         SetFontSizes(12);

-      wxSprintf(buf, _T("\\fs%d\n"), normalFont*2);
+      wxSnprintf(buf, sizeof(buf), _T("\\fs%d\n"), normalFont*2);

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

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -3830,7 +3847,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       else if (wxStrcmp(data, _T("Times")) == 0)
         TexOutput(_T("\\f0\n"));
 
       else if (wxStrcmp(data, _T("Times")) == 0)
         TexOutput(_T("\\f0\n"));
 

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -3842,10 +3859,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       ParIndent = ParseUnitArgument(data);
       if (ParIndent == 0 || forbidParindent == 0)
       {
       ParIndent = ParseUnitArgument(data);
       if (ParIndent == 0 || forbidParindent == 0)
       {

-        wxSprintf(buf, _T("\\fi%d\n"), ParIndent*20);
+        wxSnprintf(buf, sizeof(buf), _T("\\fi%d\n"), ParIndent*20);

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

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -3854,7 +3871,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     if (start && IsArgOptional())
     {
       descriptionItemArg = GetArgChunk();
     if (start && IsArgOptional())
     {
       descriptionItemArg = GetArgChunk();

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -3882,7 +3899,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         break;
       }
     }
         break;
       }
     }

-    return TRUE;
+    return true;

   }
   /*
    * Accents
   }
   /*
    * Accents


@@ -3932,7 +3949,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_ACUTE:
   {
   }
   case ltACCENT_ACUTE:
   {


@@ -3984,7 +4001,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_CARET:
   {
   }
   case ltACCENT_CARET:
   {


@@ -4030,7 +4047,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_TILDE:
   {
   }
   case ltACCENT_TILDE:
   {


@@ -4067,7 +4084,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_UMLAUT:
   {
   }
   case ltACCENT_UMLAUT:
   {


@@ -4122,7 +4139,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_DOT:
   {
   }
   case ltACCENT_DOT:
   {


@@ -4144,7 +4161,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_CADILLA:
   {
   }
   case ltACCENT_CADILLA:
   {


@@ -4166,7 +4183,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltFOOTNOTE:
   {
   }
   case ltFOOTNOTE:
   {


@@ -4181,7 +4198,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           OnInform(_T("Consider using \\footnotepopup instead of \\footnote."));
           footnoteCount ++;
           wxChar footBuf[20];
           OnInform(_T("Consider using \\footnotepopup instead of \\footnote."));
           footnoteCount ++;
           wxChar footBuf[20];

-          wxSprintf(footBuf, _T("(%d)"), footnoteCount);
+          wxSnprintf(footBuf, sizeof(footBuf), _T("(%d)"), footnoteCount);

 
           TexOutput(_T(" {\\ul "));
           TexOutput(footBuf);
 
           TexOutput(_T(" {\\ul "));
           TexOutput(footBuf);


@@ -4209,21 +4226,21 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
        {
           SetCurrentOutput(savedOutput);
        }
        {
           SetCurrentOutput(savedOutput);
        }

-       return TRUE;
+        return true;

       }
       }

-      return TRUE;
+      return true;

     }
     else
     {
       if (start)
       {
     }
     else
     {
       if (start)
       {

-        TexOutput(_T(" {\\super \\chftn{\\footnote \\fs20 {\\super \\chftn}"), TRUE);
+        TexOutput(_T(" {\\super \\chftn{\\footnote \\fs20 {\\super \\chftn}"), true);

       }
       else
       {
       }
       else
       {

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

       }
       }

-      return TRUE;
+      return true;

     }
   }
   case ltFOOTNOTEPOPUP:
     }
   }
   case ltFOOTNOTEPOPUP:


@@ -4238,8 +4255,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         {
           TexOutput(_T("{\\ul "));
        }
         {
           TexOutput(_T("{\\ul "));
        }

-       else TexOutput(_T("}"));
-       return TRUE;
+        else
+        {
+          TexOutput(_T("}"));
+        }
+        return true;

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


@@ -4268,31 +4288,31 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         {
           SetCurrentOutput(savedOutput);
         }
         {
           SetCurrentOutput(savedOutput);
         }

-        return TRUE;
+        return true;

       }
     }
     else
     {
       if (arg_no == 1)
       }
     }
     else
     {
       if (arg_no == 1)

-        return TRUE;
+        return true;

       if (start)
       {
       if (start)
       {

-        TexOutput(_T(" {\\super \\chftn{\\footnote \\fs20 {\\super \\chftn}"), TRUE);
+        TexOutput(_T(" {\\super \\chftn{\\footnote \\fs20 {\\super \\chftn}"), true);

       }
       else
       {
       }
       else
       {

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

       }
       }

-      return TRUE;
+      return true;

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

-      return FALSE;
+      return false;

     else
     else

-      return TRUE;
+      return true;

   }
   case ltSETHEADER:
   {
   }
   case ltSETHEADER:
   {


@@ -4301,7 +4321,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     else
       forbidResetPar --;
 
     else
       forbidResetPar --;
 

-    if (winHelp) return FALSE;
+    if (winHelp) return false;

     if (start)
     {
       switch (arg_no)
     if (start)
     {
       switch (arg_no)


@@ -4341,7 +4361,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           break;
       }
     }
           break;
       }
     }

-    return FALSE;
+    return false;

   }
   case ltSETFOOTER:
   {
   }
   case ltSETFOOTER:
   {


@@ -4350,7 +4370,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     else
       forbidResetPar --;
 
     else
       forbidResetPar --;
 

-    if (winHelp) return FALSE;
+    if (winHelp) return false;

     if (start)
     {
       switch (arg_no)
     if (start)
     {
       switch (arg_no)


@@ -4390,11 +4410,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           break;
       }
     }
           break;
       }
     }

-    return FALSE;
+    return false;

   }
   case ltMARKRIGHT:
   {
   }
   case ltMARKRIGHT:
   {

-    if (winHelp) return FALSE;
+    if (winHelp) return false;

     // Fake a SetHeader command
     if (start)
     {
     // Fake a SetHeader command
     if (start)
     {


@@ -4409,11 +4429,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     RTFOnArgument(ltSETHEADER, 4, start);
     if (!start)
       OutputRTFHeaderCommands();
     RTFOnArgument(ltSETHEADER, 4, start);
     if (!start)
       OutputRTFHeaderCommands();

-    return FALSE;
+    return false;

   }
   case ltMARKBOTH:
   {
   }
   case ltMARKBOTH:
   {

-    if (winHelp) return FALSE;
+    if (winHelp) return false;

     // Fake a SetHeader command
     switch (arg_no)
     {
     // Fake a SetHeader command
     switch (arg_no)
     {


@@ -4436,7 +4456,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         RTFOnArgument(ltSETHEADER, 4, start);
         if (!start)
           OutputRTFHeaderCommands();
         RTFOnArgument(ltSETHEADER, 4, start);
         if (!start)
           OutputRTFHeaderCommands();

-        return FALSE;
+        return false;

       }
     }
     break;
       }
     }
     break;


@@ -4448,7 +4468,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     else
       forbidResetPar --;
 
     else
       forbidResetPar --;
 

-    if (winHelp) return FALSE;
+    if (winHelp) return false;

     if (start)
     {
       TexOutput(_T("\\pgnrestart"));
     if (start)
     {
       TexOutput(_T("\\pgnrestart"));


@@ -4459,13 +4479,13 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       
       TexOutput(_T("\n"));
     }
       
       TexOutput(_T("\n"));
     }

-    return FALSE;
+    return false;

   }
   case ltTWOCOLUMN:
   {
   }
   case ltTWOCOLUMN:
   {

-    if (winHelp) return FALSE;
+    if (winHelp) return false;

     if (start)
     if (start)

-      return TRUE;
+      return true;

     break;
   }
   case ltITEMSEP:
     break;
   }
   case ltITEMSEP:


@@ -4474,13 +4494,13 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     {
       wxChar *val = GetArgData();
       currentItemSep = ParseUnitArgument(val);
     {
       wxChar *val = GetArgData();
       currentItemSep = ParseUnitArgument(val);

-      return FALSE;
+      return false;

     }
     break;
   }
   case ltEVENSIDEMARGIN:
   {
     }
     break;
   }
   case ltEVENSIDEMARGIN:
   {

-    return FALSE;
+    return false;

   }
   case ltODDSIDEMARGIN:
   {
   }
   case ltODDSIDEMARGIN:
   {


@@ -4491,12 +4511,12 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       // Add an inch since in LaTeX it's specified minus an inch
       twips += 1440;
       CurrentLeftMarginOdd = twips;
       // Add an inch since in LaTeX it's specified minus an inch
       twips += 1440;
       CurrentLeftMarginOdd = twips;

-      wxSprintf(buf, _T("\\margl%d\n"), twips);
+      wxSnprintf(buf, sizeof(buf), _T("\\margl%d\n"), twips);

       TexOutput(buf);
 
       CurrentMarginParX = CurrentLeftMarginOdd + CurrentTextWidth + CurrentMarginParSep;
     }
       TexOutput(buf);
 
       CurrentMarginParX = CurrentLeftMarginOdd + CurrentTextWidth + CurrentMarginParSep;
     }

-    return FALSE;
+    return false;

   }
   case ltMARGINPARWIDTH:
   {
   }
   case ltMARGINPARWIDTH:
   {


@@ -4506,7 +4526,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       int twips = (int)(20*ParseUnitArgument(val));
       CurrentMarginParWidth = twips;
     }
       int twips = (int)(20*ParseUnitArgument(val));
       CurrentMarginParWidth = twips;
     }

-    return FALSE;
+    return false;

   }
   case ltMARGINPARSEP:
   {
   }
   case ltMARGINPARSEP:
   {


@@ -4517,7 +4537,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       CurrentMarginParSep = twips;
       CurrentMarginParX = CurrentLeftMarginOdd + CurrentTextWidth + CurrentMarginParSep;
     }
       CurrentMarginParSep = twips;
       CurrentMarginParX = CurrentLeftMarginOdd + CurrentTextWidth + CurrentMarginParSep;
     }

-    return FALSE;
+    return false;

   }
   case ltTEXTWIDTH:
   {
   }
   case ltTEXTWIDTH:
   {


@@ -4531,10 +4551,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       CurrentRightMarginOdd = PageWidth - CurrentTextWidth - CurrentLeftMarginOdd;
       CurrentRightMarginEven = PageWidth - CurrentTextWidth - CurrentLeftMarginEven;
       CurrentMarginParX = CurrentLeftMarginOdd + CurrentTextWidth + CurrentMarginParSep;
       CurrentRightMarginOdd = PageWidth - CurrentTextWidth - CurrentLeftMarginOdd;
       CurrentRightMarginEven = PageWidth - CurrentTextWidth - CurrentLeftMarginEven;
       CurrentMarginParX = CurrentLeftMarginOdd + CurrentTextWidth + CurrentMarginParSep;

-      wxSprintf(buf, _T("\\margr%d\n"), CurrentRightMarginOdd);
+      wxSnprintf(buf, sizeof(buf), _T("\\margr%d\n"), CurrentRightMarginOdd);

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

-    return FALSE;
+    return false;

   }
   case ltMARGINPAR:
   case ltMARGINPARODD:
   }
   case ltMARGINPAR:
   case ltMARGINPARODD:


@@ -4548,10 +4568,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       }
       else
       {
       }
       else
       {

-        wxSprintf(buf, _T("\\phpg\\posx%d\\absw%d\n"), CurrentMarginParX, CurrentMarginParWidth);
+        wxSnprintf(buf, sizeof(buf), _T("\\phpg\\posx%d\\absw%d\n"), CurrentMarginParX, CurrentMarginParWidth);

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

-      return TRUE;
+      return true;

     }
     else
     {
     }
     else
     {


@@ -4565,7 +4585,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         TexOutput(_T("\\par\\pard\n"));
       issuedNewParagraph = 1;
     }
         TexOutput(_T("\\par\\pard\n"));
       issuedNewParagraph = 1;
     }

-    return FALSE;
+    return false;

   }
   case ltMARGINPAREVEN:
   {
   }
   case ltMARGINPAREVEN:
   {


@@ -4584,16 +4604,16 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           // mirror mode, on an even (left-hand) page.
           int x = PageWidth - CurrentRightMarginOdd - CurrentMarginParWidth - CurrentMarginParSep
                     - CurrentTextWidth + GutterWidth;
           // mirror mode, on an even (left-hand) page.
           int x = PageWidth - CurrentRightMarginOdd - CurrentMarginParWidth - CurrentMarginParSep
                     - CurrentTextWidth + GutterWidth;

-          wxSprintf(buf, _T("\\phpg\\posx%d\\absw%d\n"), x, CurrentMarginParWidth);
+          wxSnprintf(buf, sizeof(buf), _T("\\phpg\\posx%d\\absw%d\n"), x, CurrentMarginParWidth);

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

-          wxSprintf(buf, _T("\\phpg\\posx%d\\absw%d\n"), CurrentMarginParX, CurrentMarginParWidth);
+          wxSnprintf(buf, sizeof(buf), _T("\\phpg\\posx%d\\absw%d\n"), CurrentMarginParX, CurrentMarginParWidth);

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

-      return TRUE;
+      return true;

     }
     else
     {
     }
     else
     {


@@ -4607,7 +4627,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         issuedNewParagraph = 1;
       TexOutput(_T("\\par\\pard\n"));
     }
         issuedNewParagraph = 1;
       TexOutput(_T("\\par\\pard\n"));
     }

-    return FALSE;
+    return false;

   }
   case ltTWOCOLWIDTHA:
   {
   }
   case ltTWOCOLWIDTHA:
   {


@@ -4617,7 +4637,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       int twips = (int)(20*ParseUnitArgument(val));
       TwoColWidthA = twips;
     }
       int twips = (int)(20*ParseUnitArgument(val));
       TwoColWidthA = twips;
     }

-    return FALSE;
+    return false;

   }
   case ltTWOCOLWIDTHB:
   {
   }
   case ltTWOCOLWIDTHB:
   {


@@ -4627,7 +4647,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       int twips = (int)(20*ParseUnitArgument(val));
       TwoColWidthB = twips;
     }
       int twips = (int)(20*ParseUnitArgument(val));
       TwoColWidthB = twips;
     }

-    return FALSE;
+    return false;

   }
   case ltROW:
   case ltRULEDROW:
   }
   case ltROW:
   case ltRULEDROW:


@@ -4668,7 +4688,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         if (TableData[i].leftBorder)
           TexOutput(_T("\\clbrdrl\\brdrs\\brdrw15"));
           
         if (TableData[i].leftBorder)
           TexOutput(_T("\\clbrdrl\\brdrs\\brdrw15"));
           

-        wxSprintf(buf, _T("\\cellx%d"), currentWidth);
+        wxSnprintf(buf, sizeof(buf), _T("\\cellx%d"), currentWidth);

         TexOutput(buf);
       }
       TexOutput(_T("\\pard\\intbl\n"));
         TexOutput(buf);
       }
       TexOutput(_T("\\pard\\intbl\n"));


@@ -4676,7 +4696,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       ruleTop = 0;
       ruleBottom = 0;
       currentRowNumber ++;
       ruleTop = 0;
       ruleBottom = 0;
       currentRowNumber ++;

-      return TRUE;
+      return true;

     }
     else
     {
     }
     else
     {


@@ -4695,15 +4715,15 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         case 1:
         {
           noMultiColumns = wxAtoi(GetArgData());
         case 1:
         {
           noMultiColumns = wxAtoi(GetArgData());

-          return FALSE;
+          return false;

         }
         case 2:
         {
         }
         case 2:
         {

-          return FALSE;
+          return false;

         }
         case 3:
         {
         }
         case 3:
         {

-          return TRUE;
+          return true;

         }
       }
     }
         }
       }
     }


@@ -4734,10 +4754,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize);
       itemizeStack.Insert(struc);
       
       ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize);
       itemizeStack.Insert(struc);
       

-      wxSprintf(buf, _T("\\tx%d\\li%d\\sa200 "), indentSize, indentSize);
+      wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\sa200 "), indentSize, indentSize);

       PushEnvironmentStyle(buf);
       TexOutput(buf);
       PushEnvironmentStyle(buf);
       TexOutput(buf);

-      return FALSE;
+      return false;

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


@@ -4755,7 +4775,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         WriteEnvironmentStyles();
       }
     }
         WriteEnvironmentStyles();
       }
     }

-    return TRUE;
+    return true;

   }
 /*
   case ltSIZEDBOX:
   }
 /*
   case ltSIZEDBOX:


@@ -4777,11 +4797,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize);
       itemizeStack.Insert(struc);
       
       ItemizeStruc *struc = new ItemizeStruc(LATEX_INDENT, indentSize);
       itemizeStack.Insert(struc);
       

-      wxSprintf(buf, _T("\\tx%d\\li%d\\lr%d\\sa200\\box%s "), indentSize, indentSize, indentSizeRight,
+      wxSnprintf(buf, sizeof(buf), _T("\\tx%d\\li%d\\lr%d\\sa200\\box%s "), indentSize, indentSize, indentSizeRight,

         ((macroId == ltCENTEREDBOX) ? _T("\\brdrs") : _T("\\brdrdb")));
       PushEnvironmentStyle(buf);
       TexOutput(buf);
         ((macroId == ltCENTEREDBOX) ? _T("\\brdrs") : _T("\\brdrdb")));
       PushEnvironmentStyle(buf);
       TexOutput(buf);

-      return FALSE;
+      return false;

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


@@ -4799,7 +4819,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         WriteEnvironmentStyles();
       }
     }
         WriteEnvironmentStyles();
       }
     }

-    return TRUE;
+    return true;

     break;
   }
 */
     break;
   }
 */


@@ -4818,7 +4838,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       }
       TexOutput(_T("\n"));
     }
       }
       TexOutput(_T("\n"));
     }

-    return FALSE;
+    return false;

   }
   case ltSETHOTSPOTCOLOUR:
   case ltSETHOTSPOTCOLOR:
   }
   case ltSETHOTSPOTCOLOUR:
   case ltSETHOTSPOTCOLOR:


@@ -4827,11 +4847,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     {
       wxChar *text = GetArgData();
       if (wxStrcmp(text, _T("yes")) == 0 || wxStrcmp(text, _T("on")) == 0 || wxStrcmp(text, _T("ok")) == 0)
     {
       wxChar *text = GetArgData();
       if (wxStrcmp(text, _T("yes")) == 0 || wxStrcmp(text, _T("on")) == 0 || wxStrcmp(text, _T("ok")) == 0)

-        hotSpotColour = TRUE;
+        hotSpotColour = true;

       else
       else

-        hotSpotColour = FALSE;
+        hotSpotColour = false;

     }
     }

-    return FALSE;
+    return false;

   }
   case ltSETTRANSPARENCY:
   {
   }
   case ltSETTRANSPARENCY:
   {


@@ -4839,11 +4859,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     {
       wxChar *text = GetArgData();
       if (wxStrcmp(text, _T("yes")) == 0 || wxStrcmp(text, _T("on")) == 0 || wxStrcmp(text, _T("ok")) == 0)
     {
       wxChar *text = GetArgData();
       if (wxStrcmp(text, _T("yes")) == 0 || wxStrcmp(text, _T("on")) == 0 || wxStrcmp(text, _T("ok")) == 0)

-        bitmapTransparency = TRUE;
+        bitmapTransparency = true;

       else
       else

-        bitmapTransparency = FALSE;
+        bitmapTransparency = false;

     }
     }

-    return FALSE;
+    return false;

   }
   case ltSETHOTSPOTUNDERLINE:
   {
   }
   case ltSETHOTSPOTUNDERLINE:
   {


@@ -4851,11 +4871,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     {
       wxChar *text = GetArgData();
       if (wxStrcmp(text, _T("yes")) == 0 || wxStrcmp(text, _T("on")) == 0 || wxStrcmp(text, _T("ok")) == 0)
     {
       wxChar *text = GetArgData();
       if (wxStrcmp(text, _T("yes")) == 0 || wxStrcmp(text, _T("on")) == 0 || wxStrcmp(text, _T("ok")) == 0)

-        hotSpotUnderline = TRUE;
+        hotSpotUnderline = true;

       else
       else

-        hotSpotUnderline = FALSE;
+        hotSpotUnderline = false;

     }
     }

-    return FALSE;
+    return false;

   }
   case ltBIBITEM:
   {
   }
   case ltBIBITEM:
   {


@@ -4866,19 +4886,19 @@ bool RTFOnArgument(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);
       }
 
       TexOutput(_T("\\li260\\fi-260 ")); // Indent from 2nd line
         ref->sectionNumber = copystring(buf);
       }
 
       TexOutput(_T("\\li260\\fi-260 ")); // Indent from 2nd line

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

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

-      return FALSE;
+      return false;

     }
     if (arg_no == 2 && !start)
       TexOutput(_T("\\par\\pard\\par\n\n"));
     }
     if (arg_no == 2 && !start)
       TexOutput(_T("\\par\\pard\\par\n\n"));

-    return TRUE;
+    return true;

   }
   case ltTHEBIBLIOGRAPHY:
   {
   }
   case ltTHEBIBLIOGRAPHY:
   {


@@ -4913,7 +4933,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       else
         wxFprintf(Contents, _T("\\par\n\\pard{\\b %s}"), ReferencesNameString);
 
       else
         wxFprintf(Contents, _T("\\par\n\\pard{\\b %s}"), ReferencesNameString);
 

-      startedSections = TRUE;
+      startedSections = true;

 
       if (winHelp)
         wxFprintf(Chapters, _T("\n${\\footnote %s}"), ReferencesNameString);
 
       if (winHelp)
         wxFprintf(Chapters, _T("\n${\\footnote %s}"), ReferencesNameString);


@@ -4921,7 +4941,10 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       wxChar *topicName = _T("bibliography");
 
       if (winHelp)
       wxChar *topicName = _T("bibliography");
 
       if (winHelp)

+      {

         wxFprintf(Contents, _T("{\\v %s}\\par\\pard\n"), topicName);
         wxFprintf(Contents, _T("{\\v %s}\\par\\pard\n"), topicName);

+        WriteEnvironmentStyles();
+      }

       else
         wxFprintf(Contents, _T("\\par\\par\\pard\n"));
 
       else
         wxFprintf(Contents, _T("\\par\\par\\pard\n"));
 


@@ -4945,9 +4968,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       wxFprintf(Chapters, _T("\\pard{%s"), (winHelp ? _T("\\keepn\\sa140\\sb140") : styleCommand));
       WriteHeadingStyle(Chapters, 1);  wxFprintf(Chapters, _T(" References\\par\\pard}\n"));
 
       wxFprintf(Chapters, _T("\\pard{%s"), (winHelp ? _T("\\keepn\\sa140\\sb140") : styleCommand));
       WriteHeadingStyle(Chapters, 1);  wxFprintf(Chapters, _T(" References\\par\\pard}\n"));
 

-      return FALSE;
+      return false;

     }
     }

-    return TRUE;
+    return true;

   }
   case ltINDEX:
   {
   }
   case ltINDEX:
   {


@@ -4974,7 +4997,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       }
       else GenerateIndexEntry(buf);
     }
       }
       else GenerateIndexEntry(buf);
     }

-    return FALSE;
+    return false;

   }
   case ltFCOL:
   case ltBCOL:
   }
   case ltFCOL:
   case ltBCOL:


@@ -4989,19 +5012,19 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           int pos = FindColourPosition(name);
           if (pos > -1)
           {
           int pos = FindColourPosition(name);
           if (pos > -1)
           {

-            wxSprintf(buf, _T("{%s%d "), ((macroId == ltFCOL) ? _T("\\cf") : _T("\\cb")), pos);
+            wxSnprintf(buf, sizeof(buf), _T("{%s%d "), ((macroId == ltFCOL) ? _T("\\cf") : _T("\\cb")), pos);

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

-                       wxSprintf(buf, _T("Could not find colour name %s"), name);
+                       wxSnprintf(buf, sizeof(buf), _T("Could not find colour name %s"), name);

             OnError(buf);
                  }
           break;
         }
         case 2:
         {
             OnError(buf);
                  }
           break;
         }
         case 2:
         {

-          return TRUE;
+          return true;

         }
         default:
           break;
         }
         default:
           break;


@@ -5011,7 +5034,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     {
       if (arg_no == 2) TexOutput(_T("}"));
     }
     {
       if (arg_no == 2) TexOutput(_T("}"));
     }

-    return FALSE;
+    return false;

   }
   case ltLABEL:
   {
   }
   case ltLABEL:
   {


@@ -5031,7 +5054,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           wxFprintf(Chapters, _T("{\\bkmkstart %s}{\\bkmkend %s}"), s,s);
       }
     }
           wxFprintf(Chapters, _T("{\\bkmkstart %s}{\\bkmkend %s}"), s,s);
       }
     }

-    return FALSE;
+    return false;

   }
   case ltPAGEREF:
   {
   }
   case ltPAGEREF:
   {


@@ -5041,14 +5064,14 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       wxFprintf(Chapters, _T("{\\field{\\*\\fldinst  PAGEREF %s \\\\* MERGEFORMAT }{\\fldrslt ??}}"),
               s);
     }
       wxFprintf(Chapters, _T("{\\field{\\*\\fldinst  PAGEREF %s \\\\* MERGEFORMAT }{\\fldrslt ??}}"),
               s);
     }

-    return FALSE;
+    return false;

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

-      inPopRefSection = TRUE;
+      inPopRefSection = true;

     else
     else

-      inPopRefSection = FALSE;
+      inPopRefSection = false;

     break;
   }
   case ltINSERTATLEVEL:
     break;
   }
   case ltINSERTATLEVEL:


@@ -5056,7 +5079,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     // This macro allows you to insert text at a different level
     // from the current level, e.g. into the Sections from within a subsubsection.
     if (!winHelp & useWord)
     // This macro allows you to insert text at a different level
     // from the current level, e.g. into the Sections from within a subsubsection.
     if (!winHelp & useWord)

-        return FALSE;
+        return false;

     static int currentLevelNo = 1;
     static FILE* oldLevelFile = Chapters;
     if (start)
     static int currentLevelNo = 1;
     static FILE* oldLevelFile = Chapters;
     if (start)


@@ -5101,16 +5124,16 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           }
           if (outputFile)
             CurrentOutput1 = outputFile;
           }
           if (outputFile)
             CurrentOutput1 = outputFile;

-          return FALSE;
+          return false;

         }
         case 2:
         {
         }
         case 2:
         {

-          return TRUE;
+          return true;

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

-      return TRUE;
+      return true;

     }
     else
     {
     }
     else
     {


@@ -5118,19 +5141,19 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         {
             CurrentOutput1 = oldLevelFile;
         }
         {
             CurrentOutput1 = oldLevelFile;
         }

-        return TRUE;
+        return true;

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

-  return TRUE;
+  return true;

 }
 
 bool RTFGo(void)
 {
   if (stopRunning)
 }
 
 bool RTFGo(void)
 {
   if (stopRunning)

-      return FALSE;
+      return false;

 
   // Reset variables
   indentLevel = 0;
 
   // Reset variables
   indentLevel = 0;


@@ -5138,15 +5161,15 @@ bool RTFGo(void)
   contentsLineSection = NULL;
   contentsLineValue = NULL;
   descriptionItemArg = NULL;
   contentsLineSection = NULL;
   contentsLineValue = NULL;
   descriptionItemArg = NULL;

-  inTabular = FALSE;
-  inTable = FALSE;
-  inFigure = FALSE;
-  startRows = FALSE;
-  tableVerticalLineLeft = FALSE;
-  tableVerticalLineRight = FALSE;
+  inTabular = false;
+  inTable = false;
+  inFigure = false;
+  startRows = false;
+  tableVerticalLineLeft = false;
+  tableVerticalLineRight = false;

   noColumns = 0;
   noColumns = 0;

-  startedSections = FALSE;
-  inVerbatim = FALSE;
+  startedSections = false;
+  inVerbatim = false;

   browseId = 0;
   
   if (InputFile && OutputFile)
   browseId = 0;
   
   if (InputFile && OutputFile)


@@ -5173,13 +5196,13 @@ bool RTFGo(void)
       if (!Sections || !Subsections || !Subsubsections || !Popups || (winHelpContents && !WinHelpContentsFile))
       {
         OnError(_T("Ouch! Could not open temporary file(s) for writing."));
       if (!Sections || !Subsections || !Subsubsections || !Popups || (winHelpContents && !WinHelpContentsFile))
       {
         OnError(_T("Ouch! Could not open temporary file(s) for writing."));

-        return FALSE;
+        return false;

       }
     }
     if (!Contents || !Chapters)
     {
       OnError(_T("Ouch! Could not open temporary file(s) for writing."));
       }
     }
     if (!Contents || !Chapters)
     {
       OnError(_T("Ouch! Could not open temporary file(s) for writing."));

-      return FALSE;
+      return false;

     }
 
     if (winHelp)
     }
 
     if (winHelp)


@@ -5209,7 +5232,7 @@ bool RTFGo(void)
     SetCurrentOutput(Chapters);
 
     if (stopRunning)
     SetCurrentOutput(Chapters);
 
     if (stopRunning)

-        return FALSE;
+        return false;

 
     OnInform(_T("Converting..."));
 
 
     OnInform(_T("Converting..."));
 


@@ -5219,14 +5242,14 @@ bool RTFGo(void)
     if (!Header)
     {
       OnError(_T("Ouch! Could not open temporary file header.rtf for writing."));
     if (!Header)
     {
       OnError(_T("Ouch! Could not open temporary file header.rtf for writing."));

-      return FALSE;
+      return false;

     }
     WriteRTFHeader(Header);
     fclose(Header);
 
     PopEnvironmentStyle();
     
     }
     WriteRTFHeader(Header);
     fclose(Header);
 
     PopEnvironmentStyle();
     

-    Tex2RTFYield(TRUE);
+    Tex2RTFYield(true);

     if (winHelp)
     {
 //      wxFprintf(Contents, _T("\\page\n"));
     if (winHelp)
     {
 //      wxFprintf(Contents, _T("\\page\n"));


@@ -5257,15 +5280,15 @@ bool RTFGo(void)
     if (winHelp)
     {
       wxConcatFiles(_T("header.rtf"), _T("chapters.rtf"), _T("tmp1.rtf"));
     if (winHelp)
     {
       wxConcatFiles(_T("header.rtf"), _T("chapters.rtf"), _T("tmp1.rtf"));

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

       wxConcatFiles(_T("tmp1.rtf"), _T("sections.rtf"), _T("tmp2.rtf"));
       wxConcatFiles(_T("tmp1.rtf"), _T("sections.rtf"), _T("tmp2.rtf"));

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

       wxConcatFiles(_T("tmp2.rtf"), _T("subsections.rtf"), _T("tmp3.rtf"));
       wxConcatFiles(_T("tmp2.rtf"), _T("subsections.rtf"), _T("tmp3.rtf"));

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

       wxConcatFiles(_T("tmp3.rtf"), _T("subsubsections.rtf"), _T("tmp4.rtf"));
       wxConcatFiles(_T("tmp3.rtf"), _T("subsubsections.rtf"), _T("tmp4.rtf"));

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

       wxConcatFiles(_T("tmp4.rtf"), _T("popups.rtf"), OutputFile);
       wxConcatFiles(_T("tmp4.rtf"), _T("popups.rtf"), OutputFile);

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

 
       wxRemoveFile(_T("tmp1.rtf"));
       wxRemoveFile(_T("tmp2.rtf"));
 
       wxRemoveFile(_T("tmp1.rtf"));
       wxRemoveFile(_T("tmp2.rtf"));


@@ -5275,7 +5298,7 @@ bool RTFGo(void)
     else
     {
       wxConcatFiles(_T("header.rtf"), _T("chapters.rtf"), _T("tmp1.rtf"));
     else
     {
       wxConcatFiles(_T("header.rtf"), _T("chapters.rtf"), _T("tmp1.rtf"));

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

       if (wxFileExists(OutputFile))
           wxRemoveFile(OutputFile);
 
       if (wxFileExists(OutputFile))
           wxRemoveFile(OutputFile);
 


@@ -5298,7 +5321,7 @@ bool RTFGo(void)
         wxCopyFile(_T("tmp1.rtf"), OutputFile);
       }
       delete [] cwdStr;
         wxCopyFile(_T("tmp1.rtf"), OutputFile);
       }
       delete [] cwdStr;

-      Tex2RTFYield(TRUE);
+      Tex2RTFYield(true);

       wxRemoveFile(_T("tmp1.rtf"));
     }
     
       wxRemoveFile(_T("tmp1.rtf"));
     }
     


@@ -5322,7 +5345,7 @@ bool RTFGo(void)
     }
     if (winHelp && generateHPJ)
       WriteHPJ(OutputFile);
     }
     if (winHelp && generateHPJ)
       WriteHPJ(OutputFile);

-    return TRUE;
+    return true;

   }
   }

-  return FALSE;
+  return false;

 }
 }