applied valid part of patch #940683: "wxMessageBox autocompletion"

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

diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index a286f46279f422c4349e4f12ca32d0358d21c7fe..1e8def80c6e9132d801784a0696695b044c1001b 100644 (file)
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -2,7 +2,8 @@
 // Name:        htmlutil.cpp
 // Purpose:     Converts Latex to HTML
 // Author:      Julian Smart
 // Name:        htmlutil.cpp
 // Purpose:     Converts Latex to HTML
 // 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


@@ -23,6 +24,8 @@
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 

+#include "wx/arrstr.h"
+

 #include "tex2any.h"
 #include "tex2rtf.h"
 #include "table.h"
 #include "tex2any.h"
 #include "tex2rtf.h"
 #include "table.h"


@@ -67,18 +70,18 @@ FILE *FrameContents = NULL;
 FILE *Titlepage = NULL;
 // FILE *FrameTitlepage = NULL;
 int fileId = 0;
 FILE *Titlepage = NULL;
 // FILE *FrameTitlepage = NULL;
 int fileId = 0;

-bool subsectionStarted = FALSE;
+bool subsectionStarted = false;

 
 // Which column of a row are we in? (Assumes no nested tables, of course)
 int currentColumn = 0;
 
 // Are we in verbatim mode? If so, format differently.
 
 // Which column of a row are we in? (Assumes no nested tables, of course)
 int currentColumn = 0;
 
 // Are we in verbatim mode? If so, format differently.

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

 
 // 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;

 
 // This is defined in the Tex2Any library.
 extern wxChar *BigBuffer;
 
 // This is defined in the Tex2Any library.
 extern wxChar *BigBuffer;


@@ -175,12 +178,17 @@ void SetCurrentSubsubsectionName(wxChar *s, wxChar *file)
   SetCurrentTopic(s);
 }
 
   SetCurrentTopic(s);
 }
 

+
+// mapping between fileId and filenames if truncateFilenames=false:
+static wxArrayString gs_filenames;
+
+

 /*
  * Close former filedescriptor and reopen using another filename.
  *
  */
 
 /*
  * Close former filedescriptor and reopen using another filename.
  *
  */
 

-void ReopenFile(FILE **fd, wxChar **fileName)
+void ReopenFile(FILE **fd, wxChar **fileName, const wxChar *label)

 {
   if (*fd)
   {
 {
   if (*fd)
   {


@@ -190,9 +198,16 @@ void ReopenFile(FILE **fd, wxChar **fileName)
   fileId ++;
   wxChar buf[400];
   if (truncateFilenames)
   fileId ++;
   wxChar buf[400];
   if (truncateFilenames)

-    wxSprintf(buf, _T("%s%d.htm"), FileRoot, fileId);
+  {
+    wxSnprintf(buf, sizeof(buf), _T("%s%d.htm"), FileRoot, fileId);
+  }

   else
   else

-    wxSprintf(buf, _T("%s%d.html"), FileRoot, fileId);
+  {
+    if (fileId == 1)
+      gs_filenames.Add(wxEmptyString);
+    wxSnprintf(buf, sizeof(buf), _T("%s_%s.html"), FileRoot, label);
+    gs_filenames.Add(buf);
+  }

   if (*fileName) delete[] *fileName;
   *fileName = copystring(wxFileNameFromPath(buf));
   *fd = wxFopen(buf, _T("w"));
   if (*fileName) delete[] *fileName;
   *fileName = copystring(wxFileNameFromPath(buf));
   *fd = wxFopen(buf, _T("w"));


@@ -240,7 +255,7 @@ void ReopenSectionContentsFile(void)
 
 void ProcessText2HTML(TexChunk *chunk)
 {
 
 void ProcessText2HTML(TexChunk *chunk)
 {

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

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


@@ -256,19 +271,19 @@ void ProcessText2HTML(TexChunk *chunk)
     {
       BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("<P>\n\n")); ptr += 5;
       i += 2;
     {
       BigBuffer[ptr] = 0; wxStrcat(BigBuffer, _T("<P>\n\n")); ptr += 5;
       i += 2;

-      changed = TRUE;
+      changed = true;

     }
     else if (!inVerbatim && ch == '`' && (len >= i+1 && chunk->value[i+1] == '`'))
     {
       BigBuffer[ptr] = '"'; ptr ++;
       i += 2;
     }
     else if (!inVerbatim && ch == '`' && (len >= i+1 && chunk->value[i+1] == '`'))
     {
       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 (ch == '<') // Change < to &lt
     {
     }
     else if (ch == '<') // Change < to &lt
     {


@@ -276,7 +291,7 @@ void ProcessText2HTML(TexChunk *chunk)
       wxStrcat(BigBuffer, _T("&lt;"));
       ptr += 4;
       i += 1;
       wxStrcat(BigBuffer, _T("&lt;"));
       ptr += 4;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     else if (ch == '>') // Change > to &gt
     {
     }
     else if (ch == '>') // Change > to &gt
     {


@@ -284,7 +299,7 @@ void ProcessText2HTML(TexChunk *chunk)
       wxStrcat(BigBuffer, _T("&gt;"));
       ptr += 4;
       i += 1;
       wxStrcat(BigBuffer, _T("&gt;"));
       ptr += 4;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     else
     {
     }
     else
     {


@@ -325,7 +340,7 @@ void Text2HTML(TexChunk *chunk)
         return;
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB || def->macroId == ltSPECIAL))
         return;
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB || def->macroId == ltSPECIAL))

-        inVerbatim = TRUE;
+        inVerbatim = true;

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


@@ -336,7 +351,7 @@ void Text2HTML(TexChunk *chunk)
       }
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB || def->macroId == ltSPECIAL))
       }
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB || def->macroId == ltSPECIAL))

-        inVerbatim = FALSE;
+        inVerbatim = false;

 
       break;
     }
 
       break;
     }


@@ -384,7 +399,9 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   {
 //    contentsReference = "<img align=center src=\"contents.gif\" BORDER=0 ALT=\"Contents\">";
     contentsReference = contentsReferenceBuf;
   {
 //    contentsReference = "<img align=center src=\"contents.gif\" BORDER=0 ALT=\"Contents\">";
     contentsReference = contentsReferenceBuf;

-    wxSprintf(contentsReference, _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Contents\">"), ConvertCase(_T("contents.gif")));
+    wxSnprintf(contentsReference, sizeof(contentsReferenceBuf),
+               _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Contents\">"),
+               ConvertCase(_T("contents.gif")));

   }
 
   wxChar *upReference; // no need to initialize because always assigned below
   }
 
   wxChar *upReference; // no need to initialize because always assigned below


@@ -394,7 +411,9 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   {
 //    upReference = "<img align=center src=\"up.gif\" ALT=\"Up\">";
     upReference = upReferenceBuf;
   {
 //    upReference = "<img align=center src=\"up.gif\" ALT=\"Up\">";
     upReference = upReferenceBuf;

-    wxSprintf(upReference, _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Up\">"), ConvertCase(_T("up.gif")));
+    wxSnprintf(upReference, sizeof(upReferenceBuf),
+               _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Up\">"),
+               ConvertCase(_T("up.gif")));

   }
 
   wxChar *backReference; // no need to initialize because always assigned below
   }
 
   wxChar *backReference; // no need to initialize because always assigned below


@@ -404,7 +423,9 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   {
 //    backReference = "<img align=center src=\"back.gif\" ALT=\"Previous\">";
     backReference = backReferenceBuf;
   {
 //    backReference = "<img align=center src=\"back.gif\" ALT=\"Previous\">";
     backReference = backReferenceBuf;

-    wxSprintf(backReference, _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Previous\">"), ConvertCase(_T("back.gif")));
+    wxSnprintf(backReference, sizeof(backReferenceBuf),
+               _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Previous\">"),
+               ConvertCase(_T("back.gif")));

   }
 
   wxChar *forwardReference; // no need to initialize because always assigned below
   }
 
   wxChar *forwardReference; // no need to initialize because always assigned below


@@ -414,7 +435,9 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   {
 //    forwardReference = "<img align=center src=\"forward.gif\" ALT=\"Next\">";
     forwardReference = forwardReferenceBuf;
   {
 //    forwardReference = "<img align=center src=\"forward.gif\" ALT=\"Next\">";
     forwardReference = forwardReferenceBuf;

-    wxSprintf(forwardReference, _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Next\">"), ConvertCase(_T("forward.gif")));
+    wxSnprintf(forwardReference, sizeof(forwardReferenceBuf),
+               _T("<img align=center src=\"%s\" BORDER=0 ALT=\"Next\">"),
+               ConvertCase(_T("forward.gif")));

   }
 
   TexOutput(_T("<CENTER>"));
   }
 
   TexOutput(_T("<CENTER>"));


@@ -430,13 +453,17 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   {
     wxChar buf1[80];
     wxStrcpy(buf1, ConvertCase(wxFileNameFromPath(FileRoot)));
   {
     wxChar buf1[80];
     wxStrcpy(buf1, ConvertCase(wxFileNameFromPath(FileRoot)));

-    wxSprintf(buf, _T("\n<A HREF=\"%s.%s\">%s</A> "), buf1, ConvertCase(_T("htm")), contentsReference);
+    wxSnprintf(buf, sizeof(buf),
+               _T("\n<A HREF=\"%s.%s\">%s</A> "),
+               buf1, ConvertCase(_T("htm")), contentsReference);

   }
   else
   {
     wxChar buf1[80];
     wxStrcpy(buf1, ConvertCase(wxFileNameFromPath(FileRoot)));
   }
   else
   {
     wxChar buf1[80];
     wxStrcpy(buf1, ConvertCase(wxFileNameFromPath(FileRoot)));

-    wxSprintf(buf, _T("\n<A HREF=\"%s%s\">%s</A> "), buf1, ConvertCase(_T("_contents.html")), contentsReference);
+    wxSnprintf(buf, sizeof(buf),
+               _T("\n<A HREF=\"%s%s\">%s</A> "),
+               buf1, ConvertCase(_T("_contents.html")), contentsReference);

   }
 //  TexOutput(_T("<NOFRAMES>"));
   TexOutput(buf);
   }
 //  TexOutput(_T("<NOFRAMES>"));
   TexOutput(buf);


@@ -450,9 +477,13 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   if (upLabel && upFilename)
   {
     if (wxStrlen(upLabel) > 0)
   if (upLabel && upFilename)
   {
     if (wxStrlen(upLabel) > 0)

-      wxSprintf(buf, _T("<A HREF=\"%s#%s\">%s</A> "), ConvertCase(upFilename), upLabel, upReference);
+      wxSnprintf(buf, sizeof(buf),
+                 _T("<A HREF=\"%s#%s\">%s</A> "),
+                 ConvertCase(upFilename), upLabel, upReference);

     else
     else

-      wxSprintf(buf, _T("<A HREF=\"%s\">%s</A> "), ConvertCase(upFilename), upReference);
+      wxSnprintf(buf, sizeof(buf),
+                 _T("<A HREF=\"%s\">%s</A> "),
+                 ConvertCase(upFilename), upReference);

     if (wxStrcmp(upLabel, _T("contents")) == 0)
     {
 //      TexOutput(_T("<NOFRAMES>"));
     if (wxStrcmp(upLabel, _T("contents")) == 0)
     {
 //      TexOutput(_T("<NOFRAMES>"));


@@ -470,7 +501,9 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
 
   if (previousLabel && previousFilename)
   {
 
   if (previousLabel && previousFilename)
   {

-    wxSprintf(buf, _T("<A HREF=\"%s#%s\">%s</A> "), ConvertCase(previousFilename), previousLabel, backReference);
+    wxSnprintf(buf, sizeof(buf),
+               _T("<A HREF=\"%s#%s\">%s</A> "),
+               ConvertCase(previousFilename), previousLabel, backReference);

     if (wxStrcmp(previousLabel, _T("contents")) == 0)
     {
 //      TexOutput(_T("<NOFRAMES>"));
     if (wxStrcmp(previousLabel, _T("contents")) == 0)
     {
 //      TexOutput(_T("<NOFRAMES>"));


@@ -483,7 +516,7 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
   else
   {
     // A placeholder so the buttons don't keep moving position
   else
   {
     // A placeholder so the buttons don't keep moving position

-    wxSprintf(buf, _T("%s "), backReference);
+    wxSnprintf(buf, sizeof(buf), _T("%s "), backReference);

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


@@ -517,13 +550,15 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
 
   if (nextLabel && nextFilename)
   {
 
   if (nextLabel && nextFilename)
   {

-    wxSprintf(buf, _T("<A HREF=\"%s#%s\">%s</A> "), ConvertCase(nextFilename), nextLabel, forwardReference);
+    wxSnprintf(buf, sizeof(buf),
+               _T("<A HREF=\"%s#%s\">%s</A> "),
+               ConvertCase(nextFilename), nextLabel, forwardReference);

     TexOutput(buf);
   }
   else
   {
     // A placeholder so the buttons don't keep moving position
     TexOutput(buf);
   }
   else
   {
     // A placeholder so the buttons don't keep moving position

-    wxSprintf(buf, _T("%s "), forwardReference);
+    wxSnprintf(buf, sizeof(buf), _T("%s "), forwardReference);

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


@@ -555,13 +590,13 @@ wxChar *ParseColourString(wxChar *bkStr, bool *isPicture)
     wxString token1 = tok.GetNextToken();
     if (!tok.HasMoreTokens())
     {
     wxString token1 = tok.GetNextToken();
     if (!tok.HasMoreTokens())
     {

-      *isPicture = TRUE;
+      *isPicture = true;

       return resStr;
     }
     else
     {
       wxString token2 = tok.GetNextToken();
       return resStr;
     }
     else
     {
       wxString token2 = tok.GetNextToken();

-      *isPicture = FALSE;
+      *isPicture = false;

       if (tok.HasMoreTokens())
       {
         wxString token3 = tok.GetNextToken();
       if (tok.HasMoreTokens())
       {
         wxString token3 = tok.GetNextToken();


@@ -608,7 +643,7 @@ void OutputBodyStart(void)
   TexOutput(_T("\n<BODY"));
   if (backgroundImageString)
   {
   TexOutput(_T("\n<BODY"));
   if (backgroundImageString)
   {

-    bool isPicture = FALSE;
+    bool isPicture = false;

     wxChar *s = ParseColourString(backgroundImageString, &isPicture);
     if (s)
     {
     wxChar *s = ParseColourString(backgroundImageString, &isPicture);
     if (s)
     {


@@ -619,7 +654,7 @@ void OutputBodyStart(void)
   }
   if (backgroundColourString)
   {
   }
   if (backgroundColourString)
   {

-    bool isPicture = FALSE;
+    bool isPicture = false;

     wxChar *s = ParseColourString(backgroundColourString, &isPicture);
     if (s)
     {
     wxChar *s = ParseColourString(backgroundColourString, &isPicture);
     if (s)
     {


@@ -631,7 +666,7 @@ void OutputBodyStart(void)
   // Set foreground text colour, if one is specified
   if (textColourString)
   {
   // Set foreground text colour, if one is specified
   if (textColourString)
   {

-    bool isPicture = FALSE;
+    bool isPicture = false;

     wxChar *s = ParseColourString(textColourString, &isPicture);
     if (s)
     {
     wxChar *s = ParseColourString(textColourString, &isPicture);
     if (s)
     {


@@ -641,7 +676,7 @@ void OutputBodyStart(void)
   // Set link text colour, if one is specified
   if (linkColourString)
   {
   // Set link text colour, if one is specified
   if (linkColourString)
   {

-    bool isPicture = FALSE;
+    bool isPicture = false;

     wxChar *s = ParseColourString(linkColourString, &isPicture);
     if (s)
     {
     wxChar *s = ParseColourString(linkColourString, &isPicture);
     if (s)
     {


@@ -651,7 +686,7 @@ void OutputBodyStart(void)
   // Set followed link text colour, if one is specified
   if (followedLinkColourString)
   {
   // Set followed link text colour, if one is specified
   if (followedLinkColourString)
   {

-    bool isPicture = FALSE;
+    bool isPicture = false;

     wxChar *s = ParseColourString(followedLinkColourString, &isPicture);
     if (s)
     {
     wxChar *s = ParseColourString(followedLinkColourString, &isPicture);
     if (s)
     {


@@ -700,10 +735,10 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
         chapterNo ++;
 
       SetCurrentOutput(NULL);
         chapterNo ++;
 
       SetCurrentOutput(NULL);

-      startedSections = TRUE;
+      startedSections = true;

 
       wxChar *topicName = FindTopicName(GetNextChunk());
 
       wxChar *topicName = FindTopicName(GetNextChunk());

-      ReopenFile(&Chapters, &ChaptersName);
+      ReopenFile(&Chapters, &ChaptersName, topicName);

       AddTexRef(topicName, ChaptersName, ChapterNameString);
 
       SetCurrentChapterName(topicName, ChaptersName);
       AddTexRef(topicName, ChaptersName, ChapterNameString);
 
       SetCurrentChapterName(topicName, ChaptersName);


@@ -719,9 +754,9 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
 
       wxChar titleBuf[200];
       if (truncateFilenames)
 
       wxChar titleBuf[200];
       if (truncateFilenames)

-        wxSprintf(titleBuf, _T("%s.htm"), wxFileNameFromPath(FileRoot));
+        wxSnprintf(titleBuf, sizeof(titleBuf), _T("%s.htm"), wxFileNameFromPath(FileRoot));

       else
       else

-        wxSprintf(titleBuf, _T("%s_contents.html"), wxFileNameFromPath(FileRoot));
+        wxSnprintf(titleBuf, sizeof(titleBuf), _T("%s_contents.html"), wxFileNameFromPath(FileRoot));

 
       wxFprintf(Chapters, _T("<A NAME=\"%s\"></A>"), topicName);
 
 
       wxFprintf(Chapters, _T("<A NAME=\"%s\"></A>"), topicName);
 


@@ -765,16 +800,16 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
     {
       subsectionNo = 0;
       subsubsectionNo = 0;
     {
       subsectionNo = 0;
       subsubsectionNo = 0;

-      subsectionStarted = FALSE;
+      subsectionStarted = false;

 
       if (macroId != ltSECTIONSTAR)
         sectionNo ++;
 
       SetCurrentOutput(NULL);
 
       if (macroId != ltSECTIONSTAR)
         sectionNo ++;
 
       SetCurrentOutput(NULL);

-      startedSections = TRUE;
+      startedSections = true;

 
       wxChar *topicName = FindTopicName(GetNextChunk());
 
       wxChar *topicName = FindTopicName(GetNextChunk());

-      ReopenFile(&Sections, &SectionsName);
+      ReopenFile(&Sections, &SectionsName, topicName);

       AddTexRef(topicName, SectionsName, SectionNameString);
 
       SetCurrentSectionName(topicName, SectionsName);
       AddTexRef(topicName, SectionsName, SectionNameString);
 
       SetCurrentSectionName(topicName, SectionsName);


@@ -861,15 +896,15 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
             ReopenSectionContentsFile();
           }
 
             ReopenSectionContentsFile();
           }
 

-          startedSections = TRUE;
-          subsectionStarted = TRUE;
+          startedSections = true;
+          subsectionStarted = true;

 
           wxChar *topicName = FindTopicName(GetNextChunk());
 
           if ( !combineSubSections )
           {
             SetCurrentOutput(NULL);
 
           wxChar *topicName = FindTopicName(GetNextChunk());
 
           if ( !combineSubSections )
           {
             SetCurrentOutput(NULL);

-            ReopenFile(&Subsections, &SubsectionsName);
+            ReopenFile(&Subsections, &SubsectionsName, topicName);

             AddTexRef(topicName, SubsectionsName, SubsectionNameString);
             SetCurrentSubsectionName(topicName, SubsectionsName);
             if (htmlWorkshopFiles) HTMLWorkshopAddToContents(2, topicName, SubsectionsName);
             AddTexRef(topicName, SubsectionsName, SubsectionNameString);
             SetCurrentSubsectionName(topicName, SubsectionsName);
             if (htmlWorkshopFiles) HTMLWorkshopAddToContents(2, topicName, SubsectionsName);


@@ -943,14 +978,14 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
         if (macroId != ltSUBSUBSECTIONSTAR)
           subsubsectionNo ++;
 
         if (macroId != ltSUBSUBSECTIONSTAR)
           subsubsectionNo ++;
 

-        startedSections = TRUE;
+        startedSections = true;

 
         wxChar *topicName = FindTopicName(GetNextChunk());
 
         if ( !combineSubSections )
         {
             SetCurrentOutput(NULL);
 
         wxChar *topicName = FindTopicName(GetNextChunk());
 
         if ( !combineSubSections )
         {
             SetCurrentOutput(NULL);

-            ReopenFile(&Subsubsections, &SubsubsectionsName);
+            ReopenFile(&Subsubsections, &SubsubsectionsName, topicName);

             AddTexRef(topicName, SubsubsectionsName, SubsubsectionNameString);
             SetCurrentSubsubsectionName(topicName, SubsubsectionsName);
             if (htmlWorkshopFiles) HTMLWorkshopAddToContents(3, topicName, SubsubsectionsName);
             AddTexRef(topicName, SubsubsectionsName, SubsubsectionNameString);
             SetCurrentSubsubsectionName(topicName, SubsubsectionsName);
             if (htmlWorkshopFiles) HTMLWorkshopAddToContents(3, topicName, SubsubsectionsName);


@@ -1082,9 +1117,9 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
 
         wxChar buf[100];
         if (TableData[currentColumn].justification == 'c')
 
         wxChar buf[100];
         if (TableData[currentColumn].justification == 'c')

-          wxSprintf(buf, _T("\n<TD ALIGN=CENTER>"));
+          wxSnprintf(buf, sizeof(buf), _T("\n<TD ALIGN=CENTER>"));

         else if (TableData[currentColumn].justification == 'r')
         else if (TableData[currentColumn].justification == 'r')

-          wxSprintf(buf, _T("\n<TD ALIGN=RIGHT>"));
+          wxSnprintf(buf, sizeof(buf), _T("\n<TD ALIGN=RIGHT>"));

         else if (TableData[currentColumn].absWidth)
         {
           // Convert from points * 20 into pixels.
         else if (TableData[currentColumn].absWidth)
         {
           // Convert from points * 20 into pixels.


@@ -1093,10 +1128,10 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
           // Say the display is 100 DPI (dots/pixels per inch).
           // There are 72 pts to the inch. So 1pt = 1/72 inch, or 100 * 1/72 dots.
           int pixels = (int)(points * 100.0 / 72.0);
           // Say the display is 100 DPI (dots/pixels per inch).
           // There are 72 pts to the inch. So 1pt = 1/72 inch, or 100 * 1/72 dots.
           int pixels = (int)(points * 100.0 / 72.0);

-          wxSprintf(buf, _T("<TD ALIGN=CENTER WIDTH=%d>"), pixels);
+          wxSnprintf(buf, sizeof(buf), _T("<TD ALIGN=CENTER WIDTH=%d>"), pixels);

         }
         else
         }
         else

-          wxSprintf(buf, _T("\n<TD ALIGN=LEFT>"));
+          wxSnprintf(buf, sizeof(buf), _T("\n<TD ALIGN=LEFT>"));

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


@@ -1131,9 +1166,9 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
       // Start new row and cell, setting alignment for the first cell.
       wxChar buf[100];
       if (TableData[currentColumn].justification == 'c')
       // Start new row and cell, setting alignment for the first cell.
       wxChar buf[100];
       if (TableData[currentColumn].justification == 'c')

-        wxSprintf(buf, _T("<TR>\n<TD ALIGN=CENTER>"));
+        wxSnprintf(buf, sizeof(buf), _T("<TR>\n<TD ALIGN=CENTER>"));

       else if (TableData[currentColumn].justification == 'r')
       else if (TableData[currentColumn].justification == 'r')

-        wxSprintf(buf, _T("<TR>\n<TD ALIGN=RIGHT>"));
+        wxSnprintf(buf, sizeof(buf), _T("<TR>\n<TD ALIGN=RIGHT>"));

       else if (TableData[currentColumn].absWidth)
       {
         // Convert from points * 20 into pixels.
       else if (TableData[currentColumn].absWidth)
       {
         // Convert from points * 20 into pixels.


@@ -1142,10 +1177,10 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
         // Say the display is 100 DPI (dots/pixels per inch).
         // There are 72 pts to the inch. So 1pt = 1/72 inch, or 100 * 1/72 dots.
         int pixels = (int)(points * 100.0 / 72.0);
         // Say the display is 100 DPI (dots/pixels per inch).
         // There are 72 pts to the inch. So 1pt = 1/72 inch, or 100 * 1/72 dots.
         int pixels = (int)(points * 100.0 / 72.0);

-        wxSprintf(buf, _T("<TR>\n<TD ALIGN=CENTER WIDTH=%d>"), pixels);
+        wxSnprintf(buf, sizeof(buf), _T("<TR>\n<TD ALIGN=CENTER WIDTH=%d>"), pixels);

       }
       else
       }
       else

-        wxSprintf(buf, _T("<TR>\n<TD ALIGN=LEFT>"));
+        wxSnprintf(buf, sizeof(buf), _T("<TR>\n<TD ALIGN=LEFT>"));

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


@@ -1170,10 +1205,11 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

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

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

-      else
+      #else

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

+      #endif

     }
     break;
   }
     }
     break;
   }


@@ -1286,7 +1322,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
     if (start)
     {
       wxChar buf[100];
     if (start)
     {
       wxChar buf[100];

-      wxSprintf(buf, _T("<PRE>\n"));
+      wxSnprintf(buf, sizeof(buf), _T("<PRE>\n"));

       TexOutput(buf);
     }
     else TexOutput(_T("</PRE>\n"));
       TexOutput(buf);
     }
     else TexOutput(_T("</PRE>\n"));


@@ -1439,13 +1475,13 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
   case ltCOPYRIGHT:
   {
     if (start)
   case ltCOPYRIGHT:
   {
     if (start)

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

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

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

     break;
   }
   // Arrows
     break;
   }
   // Arrows


@@ -1668,18 +1704,18 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
           figureNo ++;
 
           if (DocumentStyle != LATEX_ARTICLE)
           figureNo ++;
 
           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
       {
           tableNo ++;
 
           if (DocumentStyle != LATEX_ARTICLE)
       }
       else
       {
           tableNo ++;
 
           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);

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


@@ -1706,14 +1742,14 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
   }
   case ltFIGURE:
   {
   }
   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:


@@ -1743,7 +1779,7 @@ bool HTMLOnArgument(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:
   {


@@ -1868,19 +1904,19 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       {
         TexOutput(sec);
       }
       {
         TexOutput(sec);
       }

-      return FALSE;
+      return false;

     }
     break;
   }
   case ltURLREF:
   {
     if (IsArgOptional())
     }
     break;
   }
   case ltURLREF:
   {
     if (IsArgOptional())

-      return FALSE;
+      return false;

     else if ((GetNoArgs() - arg_no) == 1)
     {
       if (start)
         helpRefText = GetArgChunk();
     else if ((GetNoArgs() - arg_no) == 1)
     {
       if (start)
         helpRefText = GetArgChunk();

-      return FALSE;
+      return false;

     }
     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
     {


@@ -1888,15 +1924,15 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       {
         TexChunk *ref = GetArgChunk();
         TexOutput(_T("<A HREF=\""));
       {
         TexChunk *ref = GetArgChunk();
         TexOutput(_T("<A HREF=\""));

-        inVerbatim = TRUE;
+        inVerbatim = true;

         TraverseChildrenFromChunk(ref);
         TraverseChildrenFromChunk(ref);

-        inVerbatim = FALSE;
+        inVerbatim = false;

         TexOutput(_T("\">"));
         if (helpRefText)
           TraverseChildrenFromChunk(helpRefText);
         TexOutput(_T("</A>"));
       }
         TexOutput(_T("\">"));
         if (helpRefText)
           TraverseChildrenFromChunk(helpRefText);
         TexOutput(_T("</A>"));
       }

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -1908,13 +1944,13 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
     {
       if (start)
         helpRefFilename = GetArgChunk();
     {
       if (start)
         helpRefFilename = GetArgChunk();

-      return FALSE;
+      return false;

     }
     if ((GetNoArgs() - arg_no) == 1)
     {
       if (start)
         helpRefText = GetArgChunk();
     }
     if ((GetNoArgs() - arg_no) == 1)
     {
       if (start)
         helpRefText = GetArgChunk();

-      return FALSE;
+      return false;

     }
     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
     {


@@ -1963,7 +1999,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
         else TexOutput(_T("??"));
       }
         }
         else TexOutput(_T("??"));
       }

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -2050,12 +2086,12 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
           TexOutput(_T("<A HREF=\""));
           TexOutput(ConvertCase(wxFileNameFromPath(filename)));
           TexOutput(_T("\">Picture</A>\n"));
           TexOutput(_T("<A HREF=\""));
           TexOutput(ConvertCase(wxFileNameFromPath(filename)));
           TexOutput(_T("\">Picture</A>\n"));

-          wxSprintf(buf, _T("Warning: could not find an inline XBM/GIF for %s."), filename);
+          wxSnprintf(buf, sizeof(buf), _T("Warning: could not find an inline XBM/GIF for %s."), filename);

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

-    return FALSE;
+    return false;

   }
   // First arg is PSBOX spec (ignored), second is image file, third is map name.
   case ltIMAGEMAP:
   }
   // First arg is PSBOX spec (ignored), second is image file, third is map name.
   case ltIMAGEMAP:


@@ -2082,7 +2118,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       if (f == _T(""))
       {
         wxChar buf[300];
       if (f == _T(""))
       {
         wxChar buf[300];

-        wxSprintf(buf, _T("Warning: could not find an inline XBM/GIF for %s."), filename);
+        wxSnprintf(buf, sizeof(buf), _T("Warning: could not find an inline XBM/GIF for %s."), filename);

         OnInform(buf);
       }
       delete[] filename;
         OnInform(buf);
       }
       delete[] filename;


@@ -2126,15 +2162,15 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         imageFile = NULL;
       }
     }
         imageFile = NULL;
       }
     }

-    return FALSE;
+    return false;

   }
   case ltINDENTED :
   {
     if ( arg_no == 1 )
   }
   case ltINDENTED :
   {
     if ( arg_no == 1 )

-        return FALSE;
+        return false;

     else
     {
     else
     {

-        return TRUE;
+        return true;

     }
   }
   case ltITEM:
     }
   }
   case ltITEM:


@@ -2142,9 +2178,9 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
     if (start)
     {
       descriptionItemArg = GetArgChunk();
     if (start)
     {
       descriptionItemArg = GetArgChunk();

-      return FALSE;
+      return false;

     }
     }

-    return TRUE;
+    return true;

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


@@ -2161,7 +2197,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         // DHS
        if (TwoColWidthA > -1) {
           wxChar buf[100];
         // DHS
        if (TwoColWidthA > -1) {
           wxChar buf[100];

-          wxSprintf(buf,_T("\n<TR><TD VALIGN=TOP WIDTH=%d>\n"),TwoColWidthA);
+          wxSnprintf(buf, sizeof(buf), _T("\n<TR><TD VALIGN=TOP WIDTH=%d>\n"),TwoColWidthA);

           TexOutput(buf);
         } else
           TexOutput(_T("\n<TR><TD VALIGN=TOP>\n"));
           TexOutput(buf);
         } else
           TexOutput(_T("\n<TR><TD VALIGN=TOP>\n"));


@@ -2175,7 +2211,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       if ( start ) {
        if (TwoColWidthB > -1) {
           wxChar buf[100];
       if ( start ) {
        if (TwoColWidthB > -1) {
           wxChar buf[100];

-          wxSprintf(buf,_T("\n<TD VALIGN=TOP WIDTH=%d>\n"),TwoColWidthB);
+          wxSnprintf(buf, sizeof(buf), _T("\n<TD VALIGN=TOP WIDTH=%d>\n"),TwoColWidthB);

           TexOutput(buf);
         } else 
            TexOutput(_T("\n<TD VALIGN=TOP>\n"));
           TexOutput(buf);
         } else 
            TexOutput(_T("\n<TD VALIGN=TOP>\n"));


@@ -2183,7 +2219,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       }  else
            TexOutput(_T("\n</FONT></TD></TR>\n"));
     }
       }  else
            TexOutput(_T("\n</FONT></TD></TR>\n"));
     }

-    return TRUE;
+    return true;

   }
   case ltNUMBEREDBIBITEM:
   {
   }
   case ltNUMBEREDBIBITEM:
   {


@@ -2205,18 +2241,18 @@ bool HTMLOnArgument(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("\n<DT> [%d] "), citeCount);
+      wxSnprintf(buf, sizeof(buf), _T("\n<DT> [%d] "), citeCount);

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

-      return FALSE;
+      return false;

     }
     if (arg_no == 2 && !start)
       TexOutput(_T("<P>\n"));
     }
     if (arg_no == 2 && !start)
       TexOutput(_T("<P>\n"));

-    return TRUE;
+    return true;

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


@@ -2227,7 +2263,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
     if (start)
     {
       TexOutput(_T("<HR>\n"));
     if (start)
     {
       TexOutput(_T("<HR>\n"));

-      return TRUE;
+      return true;

     }
     else
       TexOutput(_T("<HR><P>\n"));
     }
     else
       TexOutput(_T("<HR><P>\n"));


@@ -2242,7 +2278,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       float points = ParseUnitArgument(val);
       TwoColWidthA = (int)((points * 100.0) / 72.0);
     }
       float points = ParseUnitArgument(val);
       TwoColWidthA = (int)((points * 100.0) / 72.0);
     }

-    return FALSE;
+    return false;

   }
   // DHS
   case ltTWOCOLWIDTHB:
   }
   // DHS
   case ltTWOCOLWIDTHB:


@@ -2253,7 +2289,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       float points = ParseUnitArgument(val);
       TwoColWidthB = (int)((points * 100.0) / 72.0);
     }
       float points = ParseUnitArgument(val);
       TwoColWidthB = (int)((points * 100.0) / 72.0);
     }

-    return FALSE;
+    return false;

   }
   /*
    * Accents
   }
   /*
    * Accents


@@ -2303,7 +2339,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_ACUTE:
   {
   }
   case ltACCENT_ACUTE:
   {


@@ -2355,7 +2391,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_CARET:
   {
   }
   case ltACCENT_CARET:
   {


@@ -2401,7 +2437,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_TILDE:
   {
   }
   case ltACCENT_TILDE:
   {


@@ -2438,7 +2474,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_UMLAUT:
   {
   }
   case ltACCENT_UMLAUT:
   {


@@ -2490,7 +2526,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_DOT:
   {
   }
   case ltACCENT_DOT:
   {


@@ -2512,7 +2548,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltBACKGROUND:
   {
   }
   case ltBACKGROUND:
   {


@@ -2521,7 +2557,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       wxChar *val = GetArgData();
       if (val)
       {
       wxChar *val = GetArgData();
       if (val)
       {

-        bool isPicture = FALSE;
+        bool isPicture = false;

         ParseColourString(val, &isPicture);
         if (isPicture)
         {
         ParseColourString(val, &isPicture);
         if (isPicture)
         {


@@ -2537,7 +2573,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltBACKGROUNDIMAGE:
   {
   }
   case ltBACKGROUNDIMAGE:
   {


@@ -2551,7 +2587,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         backgroundImageString = copystring(val);
       }
     }
         backgroundImageString = copystring(val);
       }
     }

-    return FALSE;
+    return false;

   }
   case ltBACKGROUNDCOLOUR:
   {
   }
   case ltBACKGROUNDCOLOUR:
   {


@@ -2565,7 +2601,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         backgroundColourString = copystring(val);
       }
     }
         backgroundColourString = copystring(val);
       }
     }

-    return FALSE;
+    return false;

   }
   case ltTEXTCOLOUR:
   {
   }
   case ltTEXTCOLOUR:
   {


@@ -2579,7 +2615,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         textColourString = copystring(val);
       }
     }
         textColourString = copystring(val);
       }
     }

-    return FALSE;
+    return false;

   }
   case ltLINKCOLOUR:
   {
   }
   case ltLINKCOLOUR:
   {


@@ -2593,7 +2629,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         linkColourString = copystring(val);
       }
     }
         linkColourString = copystring(val);
       }
     }

-    return FALSE;
+    return false;

   }
   case ltFOLLOWEDLINKCOLOUR:
   {
   }
   case ltFOLLOWEDLINKCOLOUR:
   {


@@ -2607,7 +2643,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         followedLinkColourString = copystring(val);
       }
     }
         followedLinkColourString = copystring(val);
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_CADILLA:
   {
   }
   case ltACCENT_CADILLA:
   {


@@ -2629,16 +2665,16 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
 /*
   case ltFOOTNOTE:
   case ltFOOTNOTEPOPUP:
   {
     if (arg_no == 1)
   }
 /*
   case ltFOOTNOTE:
   case ltFOOTNOTEPOPUP:
   {
     if (arg_no == 1)

-      return TRUE;
+      return true;

     else
     else

-      return FALSE;
+      return false;

     break;
   }
 */
     break;
   }
 */


@@ -2650,10 +2686,10 @@ bool HTMLOnArgument(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;

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


@@ -2670,7 +2706,7 @@ bool HTMLOnArgument(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"));
             TexOutput(buf);
           }
           TexOutput(_T("\\pard\\intbl\n"));


@@ -2678,13 +2714,13 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
         delete[] alignString;
 
         }
         delete[] alignString;
 

-        return FALSE;
+        return false;

       }
     }
     else if (arg_no == 2 && !start)
     {
       TexOutput(_T("</TABLE>\n"));
       }
     }
     else if (arg_no == 2 && !start)
     {
       TexOutput(_T("</TABLE>\n"));

-      inTabular = FALSE;
+      inTabular = false;

     }
     break;
   }
     }
     break;
   }


@@ -2692,7 +2728,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
   {
     if (start && (arg_no == 1))
     {
   {
     if (start && (arg_no == 1))
     {

-      ReopenFile(&Chapters, &ChaptersName);
+      ReopenFile(&Chapters, &ChaptersName, _T("bibliography"));

       AddTexRef(_T("bibliography"), ChaptersName, _T("bibliography"));
       SetCurrentSubsectionName(_T("bibliography"), ChaptersName);
 
       AddTexRef(_T("bibliography"), ChaptersName, _T("bibliography"));
       SetCurrentSubsectionName(_T("bibliography"), ChaptersName);
 


@@ -2702,9 +2738,9 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
 
       wxChar titleBuf[150];
       if (truncateFilenames)
 
       wxChar titleBuf[150];
       if (truncateFilenames)

-        wxSprintf(titleBuf, _T("%s.htm"), wxFileNameFromPath(FileRoot));
+        wxSnprintf(titleBuf, sizeof(titleBuf), _T("%s.htm"), wxFileNameFromPath(FileRoot));

       else
       else

-        wxSprintf(titleBuf, _T("%s_contents.html"), wxFileNameFromPath(FileRoot));
+        wxSnprintf(titleBuf, sizeof(titleBuf), _T("%s_contents.html"), wxFileNameFromPath(FileRoot));

 
       HTMLHead();
       TexOutput(_T("<title>"));
 
       HTMLHead();
       TexOutput(_T("<title>"));


@@ -2724,12 +2760,12 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
       wxFprintf(Chapters, _T("</H2>\n</A>\n"));
 
       SetCurrentOutput(Chapters);
       wxFprintf(Chapters, _T("</H2>\n</A>\n"));
 
       SetCurrentOutput(Chapters);

-      return FALSE;
+      return false;

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

-    return TRUE;
+    return true;

   }
   case ltINDEX:
   {
   }
   case ltINDEX:
   {


@@ -2744,7 +2780,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         AddKeyWordForTopic(CurrentTopic, buf, currentFileName);
       }
     }
         AddKeyWordForTopic(CurrentTopic, buf, currentFileName);
       }
     }

-    return FALSE;
+    return false;

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


@@ -2761,7 +2797,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
           {
             wxStrcpy(buf2, _T("#000000"));
             wxChar buf[100];
           {
             wxStrcpy(buf2, _T("#000000"));
             wxChar buf[100];

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

             OnError(buf);
           }
           TexOutput(_T("<FONT COLOR=\""));
             OnError(buf);
           }
           TexOutput(_T("<FONT COLOR=\""));


@@ -2771,7 +2807,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
         case 2:
         {
         }
         case 2:
         {

-          return TRUE;
+          return true;

         }
         default:
           break;
         }
         default:
           break;


@@ -2781,14 +2817,14 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
     {
       if (arg_no == 2) TexOutput(_T("</FONT>"));
     }
     {
       if (arg_no == 2) TexOutput(_T("</FONT>"));
     }

-    return FALSE;
+    return false;

   }
   case ltINSERTATLEVEL:
   {
     // 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 (useWord)
   }
   case ltINSERTATLEVEL:
   {
     // 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 (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)


@@ -2833,16 +2869,16 @@ bool HTMLOnArgument(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
     {


@@ -2850,24 +2886,24 @@ bool HTMLOnArgument(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 HTMLGo(void)
 {
   fileId = 0;
 }
 
 bool HTMLGo(void)
 {
   fileId = 0;

-  inVerbatim = FALSE;
+  inVerbatim = false;

   indentLevel = 0;
   indentLevel = 0;

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

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


@@ -2878,17 +2914,17 @@ bool HTMLGo(void)
 
     wxChar buf[300];
     if (truncateFilenames)
 
     wxChar buf[300];
     if (truncateFilenames)

-      wxSprintf(buf, _T("%s.htm"), FileRoot);
+      wxSnprintf(buf, sizeof(buf), _T("%s.htm"), FileRoot);

     else
     else

-      wxSprintf(buf, _T("%s_contents.html"), FileRoot);
+      wxSnprintf(buf, sizeof(buf), _T("%s_contents.html"), FileRoot);

     if (TitlepageName) delete[] TitlepageName;
     TitlepageName = copystring(buf);
     Titlepage = wxFopen(buf, _T("w"));
 
     if (truncateFilenames)
     if (TitlepageName) delete[] TitlepageName;
     TitlepageName = copystring(buf);
     Titlepage = wxFopen(buf, _T("w"));
 
     if (truncateFilenames)

-      wxSprintf(buf, _T("%s_fc.htm"), FileRoot);
+      wxSnprintf(buf, sizeof(buf), _T("%s_fc.htm"), FileRoot);

     else
     else

-      wxSprintf(buf, _T("%s_fcontents.html"), FileRoot);
+      wxSnprintf(buf, sizeof(buf), _T("%s_fcontents.html"), FileRoot);

 
     contentsFrameName = copystring(buf);
 
 
     contentsFrameName = copystring(buf);
 


@@ -2904,7 +2940,7 @@ bool HTMLGo(void)
     if (!Titlepage || !Contents)
     {
       OnError(_T("Cannot open output file!"));
     if (!Titlepage || !Contents)
     {
       OnError(_T("Cannot open output file!"));

-      return FALSE;
+      return false;

     }
     AddTexRef(_T("contents"), wxFileNameFromPath(TitlepageName), ContentsNameString);
 
     }
     AddTexRef(_T("contents"), wxFileNameFromPath(TitlepageName), ContentsNameString);
 


@@ -2998,9 +3034,9 @@ bool HTMLGo(void)
       {
         wxChar firstFileName[300];
         if (truncateFilenames)
       {
         wxChar firstFileName[300];
         if (truncateFilenames)

-          wxSprintf(firstFileName, _T("%s1.htm"), FileRoot);
+          wxSnprintf(firstFileName, sizeof(firstFileName), _T("%s1.htm"), FileRoot);

         else
         else

-          wxSprintf(firstFileName, _T("%s1.html"), FileRoot);
+          wxStrcpy(firstFileName, gs_filenames[1].c_str());

 
         wxFprintf(tmpTitle, _T("<FRAMESET COLS=\"30%%,70%%\">\n"));
 
 
         wxFprintf(tmpTitle, _T("<FRAMESET COLS=\"30%%,70%%\">\n"));
 


@@ -3061,7 +3097,7 @@ bool HTMLGo(void)
     if (htmlIndex)
     {
       wxChar htmlIndexName[300];
     if (htmlIndex)
     {
       wxChar htmlIndexName[300];

-      wxSprintf(htmlIndexName, _T("%s.htx"), FileRoot);
+      wxSnprintf(htmlIndexName, sizeof(htmlIndexName), _T("%s.htx"), FileRoot);

       GenerateHTMLIndexFile(htmlIndexName);
     }
 
       GenerateHTMLIndexFile(htmlIndexName);
     }
 


@@ -3073,10 +3109,10 @@ bool HTMLGo(void)
     }
 
 
     }
 
 

-    return TRUE;
+    return true;

   }
 
   }
 

-  return FALSE;
+  return false;

 }
 
 // Output .htx index file
 }
 
 // Output .htx index file


@@ -3087,7 +3123,7 @@ void GenerateHTMLIndexFile(wxChar *fname)
     return;
 
   TopicTable.BeginFind();
     return;
 
   TopicTable.BeginFind();

-  wxNode *node = TopicTable.Next();
+  wxHashTable::Node *node = TopicTable.Next();

   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();
   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();


@@ -3123,7 +3159,7 @@ void GenerateHTMLWorkshopFiles(wxChar *fname)
 
   /* Generate project file : */
 
 
   /* Generate project file : */
 

-  wxSprintf(buf, _T("%s.hhp"), fname);
+  wxSnprintf(buf, sizeof(buf), _T("%s.hhp"), fname);

   f = wxFopen(buf, _T("wt"));
   wxFprintf(f,
       _T("[OPTIONS]\n")
   f = wxFopen(buf, _T("wt"));
   wxFprintf(f,
       _T("[OPTIONS]\n")


@@ -3160,16 +3196,16 @@ void GenerateHTMLWorkshopFiles(wxChar *fname)
   wxFprintf(f, _T("%s\n"), wxFileNameFromPath(TitlepageName));
   for (int i = 1; i <= fileId; i++) {
     if (truncateFilenames)
   wxFprintf(f, _T("%s\n"), wxFileNameFromPath(TitlepageName));
   for (int i = 1; i <= fileId; i++) {
     if (truncateFilenames)

-      wxSprintf(buf, _T("%s%d.htm"), wxFileNameFromPath(FileRoot), i);
+      wxSnprintf(buf, sizeof(buf), _T("%s%d.htm"), wxFileNameFromPath(FileRoot), i);

     else
     else

-      wxSprintf(buf, _T("%s%d.html"), wxFileNameFromPath(FileRoot), i);
+      wxStrcpy(buf, wxFileNameFromPath(gs_filenames[i].c_str()));

     wxFprintf(f, _T("%s\n"), buf);
   }
   fclose(f);
 
   /* Generate index file : */
 
     wxFprintf(f, _T("%s\n"), buf);
   }
   fclose(f);
 
   /* Generate index file : */
 

-  wxSprintf(buf, _T("%s.hhk"), fname);
+  wxSnprintf(buf, sizeof(buf), _T("%s.hhk"), fname);

   f = wxFopen(buf, _T("wt"));
 
   wxFprintf(f,
   f = wxFopen(buf, _T("wt"));
 
   wxFprintf(f,


@@ -3187,7 +3223,7 @@ void GenerateHTMLWorkshopFiles(wxChar *fname)
       _T("<UL>\n"));
 
   TopicTable.BeginFind();
       _T("<UL>\n"));
 
   TopicTable.BeginFind();

-  wxNode *node = TopicTable.Next();
+  wxHashTable::Node *node = TopicTable.Next();

   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();
   while (node)
   {
     TexTopic *texTopic = (TexTopic *)node->GetData();


@@ -3247,7 +3283,7 @@ void HTMLWorkshopAddToContents(int level, wxChar *s, wxChar *file)
 void HTMLWorkshopStartContents()
 {
   wxChar buf[300];
 void HTMLWorkshopStartContents()
 {
   wxChar buf[300];

-  wxSprintf(buf, _T("%s.hhc"), FileRoot);
+  wxSnprintf(buf, sizeof(buf), _T("%s.hhc"), FileRoot);

   HTMLWorkshopContents = wxFopen(buf, _T("wt"));
   HTMLWorkshopLastLevel = 0;
 
   HTMLWorkshopContents = wxFopen(buf, _T("wt"));
   HTMLWorkshopLastLevel = 0;