Fixed accidental removal in one of past editings.

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

diff --git a/utils/tex2rtf/src/htmlutil.cpp b/utils/tex2rtf/src/htmlutil.cpp
index a286f46279f422c4349e4f12ca32d0358d21c7fe..b68d0b5b2f73d53ae7ccdc984f4e4cef83f6b49f 100644 (file)
--- a/utils/tex2rtf/src/htmlutil.cpp
+++ b/utils/tex2rtf/src/htmlutil.cpp
@@ -2,17 +2,14 @@
 // 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: Wlodzimierz ABX Skiba 2003/2004 Unicode support
+//              Ron Lee

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

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

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


@@ -23,9 +20,13 @@
 #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"

+#include <stdio.h>
+#define HTML_FILENAME_PATTERN _T("%s_%s.html")

 
 #if !WXWIN_COMPATIBILITY_2_4
 static inline wxChar* copystring(const wxChar* s)
 
 #if !WXWIN_COMPATIBILITY_2_4
 static inline wxChar* copystring(const wxChar* s)


@@ -34,10 +35,13 @@ static inline wxChar* copystring(const wxChar* s)
 
 extern wxHashTable TexReferences;
 
 
 extern wxHashTable TexReferences;
 

+extern int passNumber;

 
 extern void DecToHex(int, wxChar *);
 void GenerateHTMLIndexFile(wxChar *fname);
 
 
 extern void DecToHex(int, wxChar *);
 void GenerateHTMLIndexFile(wxChar *fname);
 

+bool PrimaryAnchorOfTheFile( wxChar *file, wxChar *label );
+

 void GenerateHTMLWorkshopFiles(wxChar *fname);
 void HTMLWorkshopAddToContents(int level, wxChar *s, wxChar *file);
 void HTMLWorkshopStartContents();
 void GenerateHTMLWorkshopFiles(wxChar *fname);
 void HTMLWorkshopAddToContents(int level, wxChar *s, wxChar *file);
 void HTMLWorkshopStartContents();


@@ -67,18 +71,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 +179,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 +199,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), HTML_FILENAME_PATTERN, 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,10 +256,10 @@ void ReopenSectionContentsFile(void)
 
 void ProcessText2HTML(TexChunk *chunk)
 {
 
 void ProcessText2HTML(TexChunk *chunk)
 {

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

   int ptr = 0;
   int i = 0;
   int ptr = 0;
   int i = 0;

-  char ch = 1;
+  wxChar ch = 1;

   int len = wxStrlen(chunk->value);
   while (ch != 0)
   {
   int len = wxStrlen(chunk->value);
   while (ch != 0)
   {


@@ -256,35 +272,35 @@ 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] == '`'))
+    else if (!inVerbatim && ch == _T('`') && (len >= i+1 && chunk->value[i+1] == '`'))

     {
       BigBuffer[ptr] = '"'; ptr ++;
       i += 2;
     {
       BigBuffer[ptr] = '"'; ptr ++;
       i += 2;

-      changed = TRUE;
+      changed = true;

     }
     }

-    else if (!inVerbatim && ch == '`') // Change ` to '
+    else if (!inVerbatim && ch == _T('`')) // Change ` to '

     {
       BigBuffer[ptr] = 39; ptr ++;
       i += 1;
     {
       BigBuffer[ptr] = 39; ptr ++;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     }

-    else if (ch == '<') // Change < to &lt
+    else if (ch == _T('<')) // Change < to &lt

     {
       BigBuffer[ptr] = 0;
       wxStrcat(BigBuffer, _T("&lt;"));
       ptr += 4;
       i += 1;
     {
       BigBuffer[ptr] = 0;
       wxStrcat(BigBuffer, _T("&lt;"));
       ptr += 4;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     }

-    else if (ch == '>') // Change > to &gt
+    else if (ch == _T('>')) // Change > to &gt

     {
       BigBuffer[ptr] = 0;
       wxStrcat(BigBuffer, _T("&gt;"));
       ptr += 4;
       i += 1;
     {
       BigBuffer[ptr] = 0;
       wxStrcat(BigBuffer, _T("&gt;"));
       ptr += 4;
       i += 1;

-      changed = TRUE;
+      changed = true;

     }
     else
     {
     }
     else
     {


@@ -325,7 +341,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 +352,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 +400,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 +412,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 +424,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 +436,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 +454,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);


@@ -449,10 +477,14 @@ void AddBrowseButtons(wxChar *upLabel, wxChar *upFilename,
 
   if (upLabel && upFilename)
   {
 
   if (upLabel && upFilename)
   {

-    if (wxStrlen(upLabel) > 0)
-      wxSprintf(buf, _T("<A HREF=\"%s#%s\">%s</A> "), ConvertCase(upFilename), upLabel, upReference);
+    if ( (wxStrlen(upLabel) > 0) && !PrimaryAnchorOfTheFile(upFilename, upLabel) )
+      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 +502,14 @@ 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);
+    if (PrimaryAnchorOfTheFile(previousFilename, previousLabel))
+      wxSnprintf(buf, sizeof(buf),
+                 _T("<A HREF=\"%s\">%s</A> "),
+                 ConvertCase(previousFilename), backReference);
+    else
+      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 +522,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 +556,20 @@ 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);
+    if (PrimaryAnchorOfTheFile(nextFilename, nextLabel))
+      wxSnprintf(buf, sizeof(buf),
+                 _T("<A HREF=\"%s\">%s</A> "),
+                 ConvertCase(nextFilename), forwardReference);
+    else
+      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 +601,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,18 +654,18 @@ 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)
     {
       TexOutput(_T(" BACKGROUND=\""));
     wxChar *s = ParseColourString(backgroundImageString, &isPicture);
     if (s)
     {
       TexOutput(_T(" BACKGROUND=\""));

-      TexOutput(s); 
+      TexOutput(s);

       TexOutput(_T("\""));
     }
   }
   if (backgroundColourString)
   {
       TexOutput(_T("\""));
     }
   }
   if (backgroundColourString)
   {

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

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


@@ -631,7 +677,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 +687,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 +697,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 +746,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 +765,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);
 


@@ -729,12 +775,18 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
                        lastTopic, lastFileName,  // Last topic
                        topicName, ChaptersName); // This topic
 
                        lastTopic, lastFileName,  // Last topic
                        topicName, ChaptersName); // This topic
 

-      wxFprintf(Contents, _T("\n<LI><A HREF=\"%s#%s\">"), ConvertCase(ChaptersName), topicName);
+      if(PrimaryAnchorOfTheFile(ChaptersName, topicName))
+        wxFprintf(Contents, _T("\n<LI><A HREF=\"%s\">"), ConvertCase(ChaptersName));
+      else
+        wxFprintf(Contents, _T("\n<LI><A HREF=\"%s#%s\">"), ConvertCase(ChaptersName), topicName);

 
       if (htmlFrameContents && FrameContents)
       {
         SetCurrentOutput(FrameContents);
 
       if (htmlFrameContents && FrameContents)
       {
         SetCurrentOutput(FrameContents);

-        wxFprintf(FrameContents, _T("\n<LI><A HREF=\"%s#%s\" TARGET=\"mainwindow\">"), ConvertCase(ChaptersName), topicName);
+        if(PrimaryAnchorOfTheFile(ChaptersName, topicName))
+          wxFprintf(FrameContents, _T("\n<LI><A HREF=\"%s\" TARGET=\"mainwindow\">"), ConvertCase(ChaptersName));
+        else
+          wxFprintf(FrameContents, _T("\n<LI><A HREF=\"%s#%s\" TARGET=\"mainwindow\">"), ConvertCase(ChaptersName), topicName);

         OutputCurrentSection();
         wxFprintf(FrameContents, _T("</A>\n"));
       }
         OutputCurrentSection();
         wxFprintf(FrameContents, _T("</A>\n"));
       }


@@ -765,16 +817,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);


@@ -796,9 +848,19 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
 
       SetCurrentOutputs(jumpFrom, Sections);
       if (DocumentStyle == LATEX_ARTICLE)
 
       SetCurrentOutputs(jumpFrom, Sections);
       if (DocumentStyle == LATEX_ARTICLE)

-        wxFprintf(jumpFrom, _T("\n<LI><A HREF=\"%s#%s\">"), ConvertCase(SectionsName), topicName);
+      {
+        if(PrimaryAnchorOfTheFile(SectionsName, topicName))
+          wxFprintf(jumpFrom, _T("\n<LI><A HREF=\"%s\">"), ConvertCase(SectionsName));
+        else
+          wxFprintf(jumpFrom, _T("\n<LI><A HREF=\"%s#%s\">"), ConvertCase(SectionsName), topicName);
+      }

       else
       else

-        wxFprintf(jumpFrom, _T("\n<A HREF=\"%s#%s\"><B>"), ConvertCase(SectionsName), topicName);
+      {
+        if(PrimaryAnchorOfTheFile(SectionsName, topicName))
+          wxFprintf(jumpFrom, _T("\n<A HREF=\"%s\"><B>"), ConvertCase(SectionsName));
+        else
+          wxFprintf(jumpFrom, _T("\n<A HREF=\"%s#%s\"><B>"), ConvertCase(SectionsName), topicName);
+      }

 
       wxFprintf(Sections, _T("\n<H2>"));
       OutputCurrentSection();
 
       wxFprintf(Sections, _T("\n<H2>"));
       OutputCurrentSection();


@@ -839,6 +901,8 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
 
           if ( combineSubSections && !subsectionStarted )
           {
 
           if ( combineSubSections && !subsectionStarted )
           {

+            fflush(Sections);
+

             // Read old .con file in at this point
             wxChar buf[256];
             wxStrcpy(buf, CurrentSectionFile);
             // Read old .con file in at this point
             wxChar buf[256];
             wxStrcpy(buf, CurrentSectionFile);


@@ -850,7 +914,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
                 int ch = getc(fd);
                 while (ch != EOF)
                 {
                 int ch = getc(fd);
                 while (ch != EOF)
                 {

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

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


@@ -861,21 +925,21 @@ 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);
             SetCurrentOutput(Subsections);
 
             AddTexRef(topicName, SubsectionsName, SubsectionNameString);
             SetCurrentSubsectionName(topicName, SubsectionsName);
             if (htmlWorkshopFiles) HTMLWorkshopAddToContents(2, topicName, SubsectionsName);
             SetCurrentOutput(Subsections);
 

-           HTMLHead();
+            HTMLHead();

             TexOutput(_T("<title>"));
             OutputCurrentSection();
             TexOutput(_T("</title></head>\n"));
             TexOutput(_T("<title>"));
             OutputCurrentSection();
             TexOutput(_T("</title></head>\n"));


@@ -887,7 +951,10 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
                            topicName, SubsectionsName); // This topic
 
             SetCurrentOutputs(Sections, Subsections);
                            topicName, SubsectionsName); // This topic
 
             SetCurrentOutputs(Sections, Subsections);

-            wxFprintf(Sections, _T("\n<A HREF=\"%s#%s\"><B>"), ConvertCase(SubsectionsName), topicName);
+            if(PrimaryAnchorOfTheFile(SubsectionsName, topicName))
+              wxFprintf(Sections, _T("\n<A HREF=\"%s\"><B>"), ConvertCase(SubsectionsName));
+            else
+              wxFprintf(Sections, _T("\n<A HREF=\"%s#%s\"><B>"), ConvertCase(SubsectionsName), topicName);

 
             wxFprintf(Subsections, _T("\n<H3>"));
             OutputCurrentSection();
 
             wxFprintf(Subsections, _T("\n<H3>"));
             OutputCurrentSection();


@@ -943,20 +1010,20 @@ 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);
 
             SetCurrentOutput(Subsubsections);
             AddTexRef(topicName, SubsubsectionsName, SubsubsectionNameString);
             SetCurrentSubsubsectionName(topicName, SubsubsectionsName);
             if (htmlWorkshopFiles) HTMLWorkshopAddToContents(3, topicName, SubsubsectionsName);
 
             SetCurrentOutput(Subsubsections);

-           HTMLHead();
+            HTMLHead();

             TexOutput(_T("<title>"));
             OutputCurrentSection();
             TexOutput(_T("</title></head>\n"));
             TexOutput(_T("<title>"));
             OutputCurrentSection();
             TexOutput(_T("</title></head>\n"));


@@ -969,7 +1036,10 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
                          topicName, SubsubsectionsName); // This topic
 
             SetCurrentOutputs(Subsections, Subsubsections);
                          topicName, SubsubsectionsName); // This topic
 
             SetCurrentOutputs(Subsections, Subsubsections);

-            wxFprintf(Subsections, _T("\n<A HREF=\"%s#%s\"><B>"), ConvertCase(SubsubsectionsName), topicName);
+            if(PrimaryAnchorOfTheFile(SubsubsectionsName, topicName))
+              wxFprintf(Subsections, _T("\n<A HREF=\"%s\"><B>"), ConvertCase(SubsubsectionsName));
+            else
+              wxFprintf(Subsections, _T("\n<A HREF=\"%s#%s\"><B>"), ConvertCase(SubsubsectionsName), topicName);

 
             wxFprintf(Subsubsections, _T("\n<H3>"));
             OutputCurrentSection();
 
             wxFprintf(Subsubsections, _T("\n<H3>"));
             OutputCurrentSection();


@@ -1082,9 +1152,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,12 +1163,12 @@ 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);
         TexOutput(buf);

-               OutputFont();
+        OutputFont();

       }
       else
         TexOutput(_T("&amp;"));
       }
       else
         TexOutput(_T("&amp;"));


@@ -1131,9 +1201,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,12 +1212,12 @@ 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);
       TexOutput(buf);

-         OutputFont();
+      OutputFont();

     }
     else
     {
     }
     else
     {


@@ -1170,10 +1240,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;
   }


@@ -1249,7 +1320,7 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
         TexOutput(_T("\n<TABLE>\n"));
     else {
         TexOutput(_T("\n</TABLE>\n"));
         TexOutput(_T("\n<TABLE>\n"));
     else {
         TexOutput(_T("\n</TABLE>\n"));

-    // DHS 
+    // DHS

         TwoColWidthA = -1;
         TwoColWidthB = -1;
     }
         TwoColWidthA = -1;
         TwoColWidthB = -1;
     }


@@ -1286,7 +1357,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 +1510,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


@@ -1613,16 +1684,22 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
   {
     if (start)
     {
   {
     if (start)
     {

+      // NB: if this is uncommented, the table of contents
+      // completely disappears. If left commented, it's in the wrong
+      // place.
+      //fflush(Titlepage);
+

       FILE *fd = wxFopen(ContentsName, _T("r"));
       if (fd)
       {
         int ch = getc(fd);
         while (ch != EOF)
         {
       FILE *fd = wxFopen(ContentsName, _T("r"));
       if (fd)
       {
         int ch = getc(fd);
         while (ch != EOF)
         {

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

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

+        fflush(Titlepage);

       }
       else
       {
       }
       else
       {


@@ -1668,18 +1745,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 +1783,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:


@@ -1721,7 +1798,74 @@ void HTMLOnMacro(int macroId, int no_args, bool start)
     break;
   }
 }
     break;
   }
 }

-
+/*     CheckTypeRef()
+
+       should be called at of argument which usually is
+       type declaration which propably contains name of
+       documented class
+
+       examples:
+               HTMLOnArgument
+                       - ltFUNC,
+                       - ltPARAM
+                       - ltCPARAM
+
+       checks: GetArgData() if contains Type Declaration
+                               and can be referenced to some file
+       prints:
+               before<a href="xxx&yyy">type</a>after
+
+       returns:
+               false   - if no reference was found
+               true    - if reference was found and HREF printed
+*/
+static bool CheckTypeRef()
+{
+  wxString typeDecl = GetArgData();
+  if( !typeDecl.empty() ) {
+    typeDecl.Replace(wxT("\\"),wxT(""));
+    wxString label = typeDecl;
+    label.Replace(wxT("const"),wxT(""));
+    label.Replace(wxT("virtual"),wxT(""));
+    label.Replace(wxT("static"),wxT(""));
+    label.Replace(wxT("extern"),wxT(""));
+    label = label.BeforeFirst('&');
+    label = label.BeforeFirst(wxT('*'));
+    label = label.BeforeFirst(wxT('\\'));
+    label.Trim(true); label.Trim(false);
+    wxString typeName = label;
+    label.MakeLower();
+    TexRef *texRef = FindReference((wxChar*)label.c_str());
+
+    if (texRef && texRef->refFile && wxStrcmp(texRef->refFile, _T("??")) != 0) {
+      int a = typeDecl.Find(typeName);
+      wxString before = typeDecl.Mid( 0, a );
+      wxString after = typeDecl.Mid( a+typeName.Length() );
+      //wxFprintf(stderr,wxT("%s <%s> %s to ... %s#%s !!!!\n"),
+       //      before.c_str(),
+       //      typeName.c_str(),
+       //      after.c_str(),
+       //      texRef->refFile,label.c_str());
+      TexOutput(before);
+      TexOutput(_T("<A HREF=\""));
+      TexOutput(texRef->refFile);
+      TexOutput(_T("#"));
+      TexOutput(label);
+      TexOutput(wxT("\">"));
+      TexOutput(typeName);
+      TexOutput(wxT("</A>"));
+      TexOutput(after);
+      return true;
+    } else {
+      //wxFprintf(stderr,wxT("'%s' from (%s) -> label %s NOT FOUND\n"),
+       //      typeName.c_str(),
+       //      typeDecl.c_str(),
+       //      label.c_str());
+      return false;
+    }
+  }
+  return false;
+}

 // Called on start/end of argument examination
 bool HTMLOnArgument(int macroId, int arg_no, bool start)
 {
 // Called on start/end of argument examination
 bool HTMLOnArgument(int macroId, int arg_no, bool start)
 {


@@ -1743,12 +1887,17 @@ 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:
   {

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

       TexOutput(_T("<B>"));
       TexOutput(_T("<B>"));

+      if( CheckTypeRef() ) {
+       TexOutput(_T("</B> "));
+       return false;
+      }
+    }

 
     if (!start && (arg_no == 1))
       TexOutput(_T("</B> "));
 
     if (!start && (arg_no == 1))
       TexOutput(_T("</B> "));


@@ -1809,27 +1958,21 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
     break;
   }
   case ltPARAM:
     break;
   }
   case ltPARAM:

-  {
-    if (start && (arg_no == 1))
-      TexOutput(_T("<B>"));
-    if (!start && (arg_no == 1))
-      TexOutput(_T("</B>"));
-    if (start && (arg_no == 2))
-    {
-      TexOutput(_T("<I>"));
-    }
-    if (!start && (arg_no == 2))
-    {
-      TexOutput(_T("</I>"));
-    }
-    break;
-  }

   case ltCPARAM:
   {
   case ltCPARAM:
   {

-    if (start && (arg_no == 1))
-      TexOutput(_T("<B>"));
-    if (!start && (arg_no == 1))
-      TexOutput(_T("</B> "));  // This is the difference from param - one space!
+    const wxChar* pend = macroId == ltCPARAM ?
+       _T("</B> ") : _T("</B>");
+    if( arg_no == 1) {
+      if( start ) {
+       TexOutput(_T("<B>"));
+       if( CheckTypeRef() ) {
+         TexOutput(pend);
+         return false;
+       }
+      } else {
+       TexOutput(pend);
+      }
+    }

     if (start && (arg_no == 2))
     {
       TexOutput(_T("<I>"));
     if (start && (arg_no == 2))
     {
       TexOutput(_T("<I>"));


@@ -1868,19 +2011,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,18 +2031,19 @@ 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;
   }

+

   case ltHELPREF:
   case ltHELPREFN:
   case ltPOPREF:
   case ltHELPREF:
   case ltHELPREFN:
   case ltPOPREF:


@@ -1908,13 +2052,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
     {


@@ -1935,16 +2079,20 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
             // If a filename is supplied, use it, otherwise try to
             // use the filename associated with the reference (from this document).
             if (helpRefFilename)
             // If a filename is supplied, use it, otherwise try to
             // use the filename associated with the reference (from this document).
             if (helpRefFilename)

-               {
+            {

               TraverseChildrenFromChunk(helpRefFilename);
               TexOutput(_T("#"));
               TraverseChildrenFromChunk(helpRefFilename);
               TexOutput(_T("#"));

-               }
+              TexOutput(refName);
+            }

             else if (refFilename)
             else if (refFilename)

-               {
+            {

               TexOutput(ConvertCase(refFilename));
               TexOutput(ConvertCase(refFilename));

-              TexOutput(_T("#"));
-               }
-            TexOutput(refName);
+              if(!PrimaryAnchorOfTheFile(texRef->refFile, refName))
+              {
+                TexOutput(_T("#"));
+                TexOutput(refName);
+              }
+            }

             TexOutput(_T("\">"));
             if (helpRefText)
               TraverseChildrenFromChunk(helpRefText);
             TexOutput(_T("\">"));
             if (helpRefText)
               TraverseChildrenFromChunk(helpRefText);


@@ -1956,14 +2104,20 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
               TraverseChildrenFromChunk(helpRefText);
             if (!ignoreBadRefs)
               TexOutput(_T(" (REF NOT FOUND)"));
               TraverseChildrenFromChunk(helpRefText);
             if (!ignoreBadRefs)
               TexOutput(_T(" (REF NOT FOUND)"));

-            wxString errBuf;
-            errBuf.Printf(_T("Warning: unresolved reference '%s'"), refName);
-            OnInform((wxChar *)errBuf.c_str());
+
+            // for launching twice do not warn in preparation pass
+            if ((passNumber == 1 && !runTwice) ||
+                (passNumber == 2 && runTwice))
+            {
+              wxString errBuf;
+              errBuf.Printf(_T("Warning: unresolved reference '%s'"), refName);
+              OnInform((wxChar *)errBuf.c_str());
+            }

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

-      return FALSE;
+      return false;

     }
     break;
   }
     }
     break;
   }


@@ -2023,26 +2177,26 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
           // If we have found the existing filename, make the inline
           // image point to the original file (could be PS, for example)
           if (originalFilename && (wxStrcmp(inlineFilename, originalFilename) != 0))
           // If we have found the existing filename, make the inline
           // image point to the original file (could be PS, for example)
           if (originalFilename && (wxStrcmp(inlineFilename, originalFilename) != 0))

-         {
+          {

             TexOutput(_T("<A HREF=\""));
             TexOutput(ConvertCase(originalFilename));
             TexOutput(_T("\">"));
             TexOutput(_T("<img src=\""));
             TexOutput(ConvertCase(wxFileNameFromPath(inlineFilename)));
             TexOutput(_T("\""));
             TexOutput(_T("<A HREF=\""));
             TexOutput(ConvertCase(originalFilename));
             TexOutput(_T("\">"));
             TexOutput(_T("<img src=\""));
             TexOutput(ConvertCase(wxFileNameFromPath(inlineFilename)));
             TexOutput(_T("\""));

-            TexOutput(alignment); 
+            TexOutput(alignment);

             TexOutput(_T("></A>"));
             TexOutput(_T("></A>"));

-         }
+          }

           else
 #endif
           else
 #endif

-         {
+          {

             TexOutput(_T("<img src=\""));
             TexOutput(ConvertCase(wxFileNameFromPath(inlineFilename)));
             TexOutput(_T("\""));
             TexOutput(_T("<img src=\""));
             TexOutput(ConvertCase(wxFileNameFromPath(inlineFilename)));
             TexOutput(_T("\""));

-            TexOutput(alignment); 
+            TexOutput(alignment);

             TexOutput(_T(">"));
             delete[] inlineFilename;
             TexOutput(_T(">"));
             delete[] inlineFilename;

-         }
+          }

         }
         else
         {
         }
         else
         {


@@ -2050,12 +2204,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,14 +2236,14 @@ 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;
       if (imageFile)
         delete[] imageFile;
       imageFile = NULL;
         OnInform(buf);
       }
       delete[] filename;
       if (imageFile)
         delete[] imageFile;
       imageFile = NULL;

-      if (!f.IsEmpty())
+      if (!f.empty())

       {
         imageFile = copystring(f);
       }
       {
         imageFile = copystring(f);
       }


@@ -2126,15 +2280,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 +2296,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:


@@ -2159,31 +2313,40 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
     {
       if ( start ) {
         // DHS
     {
       if ( start ) {
         // DHS

-       if (TwoColWidthA > -1) {
+        if (TwoColWidthA > -1)
+        {

           wxChar buf[100];
           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);
           TexOutput(buf);

-        } else
+        }
+        else
+        {

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

-               OutputFont();
+        }
+        OutputFont();

       }  else
             TexOutput(_T("\n</FONT></TD>\n"));
     }
     if (arg_no == 2)
     {
       // DHS
       }  else
             TexOutput(_T("\n</FONT></TD>\n"));
     }
     if (arg_no == 2)
     {
       // DHS

-      if ( start ) {
-       if (TwoColWidthB > -1) {
+      if ( start )
+      {
+        if (TwoColWidthB > -1)
+        {

           wxChar buf[100];
           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);
           TexOutput(buf);

-        } else 
-           TexOutput(_T("\n<TD VALIGN=TOP>\n"));
-               OutputFont();
+        }
+        else
+        {
+          TexOutput(_T("\n<TD VALIGN=TOP>\n"));
+        }
+        OutputFont();

       }  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 +2368,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 +2390,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 +2405,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 +2416,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 +2466,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltACCENT_ACUTE:
   {
   }
   case ltACCENT_ACUTE:
   {


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

-    return FALSE;
+    return false;

   }
   case ltACCENT_CARET:
   {
   }
   case ltACCENT_CARET:
   {


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

-    return FALSE;
+    return false;

   }
   case ltACCENT_TILDE:
   {
   }
   case ltACCENT_TILDE:
   {


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

-    return FALSE;
+    return false;

   }
   case ltACCENT_UMLAUT:
   {
   }
   case ltACCENT_UMLAUT:
   {


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

-    return FALSE;
+    return false;

   }
   case ltACCENT_DOT:
   {
   }
   case ltACCENT_DOT:
   {


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

-    return FALSE;
+    return false;

   }
   case ltBACKGROUND:
   {
   }
   case ltBACKGROUND:
   {


@@ -2521,7 +2684,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 +2700,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
       }
     }
         }
       }
     }

-    return FALSE;
+    return false;

   }
   case ltBACKGROUNDIMAGE:
   {
   }
   case ltBACKGROUNDIMAGE:
   {


@@ -2551,7 +2714,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 +2728,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 +2742,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 +2756,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 +2770,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 +2792,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 +2813,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);


@@ -2665,12 +2828,12 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         if (compatibilityMode)
         {
           TexOutput(_T("<TR>\n<TD>"));
         if (compatibilityMode)
         {
           TexOutput(_T("<TR>\n<TD>"));

-                 OutputFont();
+          OutputFont();

 /*
           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 +2841,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 +2855,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 +2865,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>"));


@@ -2718,18 +2881,21 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
                        _T("bibliography"), ChaptersName); // This topic
 
       SetCurrentOutputs(Contents, Chapters);
                        _T("bibliography"), ChaptersName); // This topic
 
       SetCurrentOutputs(Contents, Chapters);

-      wxFprintf(Contents, _T("\n<LI><A HREF=\"%s#%s\">"), ConvertCase(ChaptersName), "bibliography");
+      if(PrimaryAnchorOfTheFile(ChaptersName, _T("bibliography")))
+        wxFprintf(Contents, _T("\n<LI><A HREF=\"%s\">"), ConvertCase(ChaptersName));
+      else
+        wxFprintf(Contents, _T("\n<LI><A HREF=\"%s#%s\">"), ConvertCase(ChaptersName), _T("bibliography"));

 
       wxFprintf(Contents, _T("%s</A>\n"), ReferencesNameString);
       wxFprintf(Chapters, _T("</H2>\n</A>\n"));
 
       SetCurrentOutput(Chapters);
 
       wxFprintf(Contents, _T("%s</A>\n"), ReferencesNameString);
       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 +2910,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 +2927,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 +2937,7 @@ bool HTMLOnArgument(int macroId, int arg_no, bool start)
         }
         case 2:
         {
         }
         case 2:
         {

-          return TRUE;
+          return true;

         }
         default:
           break;
         }
         default:
           break;


@@ -2781,14 +2947,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 +2999,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,233 +3016,233 @@ 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)
 {
 }
 
 bool HTMLGo(void)
 {

-  fileId = 0;
-  inVerbatim = FALSE;
-  indentLevel = 0;
-  inTabular = FALSE;
-  startRows = FALSE;
-  tableVerticalLineLeft = FALSE;
-  tableVerticalLineRight = FALSE;
-  noColumns = 0;
-
-  if (InputFile && OutputFile)
-  {
-    // Do some HTML-specific transformations on all the strings,
-    // recursively
-    Text2HTML(GetTopLevelChunk());
-
-    wxChar buf[300];
-    if (truncateFilenames)
-      wxSprintf(buf, _T("%s.htm"), FileRoot);
-    else
-      wxSprintf(buf, _T("%s_contents.html"), FileRoot);
-    if (TitlepageName) delete[] TitlepageName;
-    TitlepageName = copystring(buf);
-    Titlepage = wxFopen(buf, _T("w"));
+    fileId = 0;
+    inVerbatim = false;
+    indentLevel = 0;
+    inTabular = false;
+    startRows = false;
+    tableVerticalLineLeft = false;
+    tableVerticalLineRight = false;
+    noColumns = 0;

 
 

-    if (truncateFilenames)
-      wxSprintf(buf, _T("%s_fc.htm"), FileRoot);
-    else
-      wxSprintf(buf, _T("%s_fcontents.html"), FileRoot);
+    if (!InputFile.empty() && !OutputFile.empty())
+    {
+        // Do some HTML-specific transformations on all the strings,
+        // recursively
+        Text2HTML(GetTopLevelChunk());

 
 

-    contentsFrameName = copystring(buf);
+        wxChar buf[300];
+        if (truncateFilenames)
+            wxSnprintf(buf, sizeof(buf), _T("%s.htm"), FileRoot);
+        else
+            wxSnprintf(buf, sizeof(buf), _T("%s_contents.html"), FileRoot);
+        if (TitlepageName) delete[] TitlepageName;
+        TitlepageName = copystring(buf);
+        Titlepage = wxFopen(buf, _T("w"));

 
 

-    Contents = wxFopen(TmpContentsName, _T("w"));
+        if (truncateFilenames)
+            wxSnprintf(buf, sizeof(buf), _T("%s_fc.htm"), FileRoot);
+        else
+            wxSnprintf(buf, sizeof(buf), _T("%s_fcontents.html"), FileRoot);

 
 

-    if (htmlFrameContents)
-    {
-//      FrameContents = wxFopen(TmpFrameContentsName, _T("w"));
-      FrameContents = wxFopen(contentsFrameName, _T("w"));
-      wxFprintf(FrameContents, _T("<HTML>\n<UL>\n"));
-    }
+        contentsFrameName = copystring(buf);

 
 

-    if (!Titlepage || !Contents)
-    {
-      OnError(_T("Cannot open output file!"));
-      return FALSE;
-    }
-    AddTexRef(_T("contents"), wxFileNameFromPath(TitlepageName), ContentsNameString);
+        Contents = wxFopen(TmpContentsName, _T("w"));

 
 

-    wxFprintf(Contents, _T("<P><P><H2>%s</H2><P><P>\n"), ContentsNameString);
+        if (htmlFrameContents)
+        {
+//          FrameContents = wxFopen(TmpFrameContentsName, _T("w"));
+            FrameContents = wxFopen(contentsFrameName, _T("w"));
+            wxFprintf(FrameContents, _T("<HTML>\n<UL>\n"));
+        }

 
 

-    wxFprintf(Contents, _T("<UL>\n"));
+        if (!Titlepage || !Contents)
+        {
+            OnError(_T("Cannot open output file!"));
+            return false;
+        }
+        AddTexRef(_T("contents"), wxFileNameFromPath(TitlepageName), ContentsNameString);

 
 

-    SetCurrentOutput(Titlepage);
-    if (htmlWorkshopFiles) HTMLWorkshopStartContents();
-    OnInform(_T("Converting..."));
+        wxFprintf(Contents, _T("<P><P><H2>%s</H2><P><P>\n"), ContentsNameString);

 
 

-    TraverseDocument();
-    wxFprintf(Contents, _T("</UL>\n\n"));
+        wxFprintf(Contents, _T("<UL>\n"));

 
 

-//    SetCurrentOutput(Titlepage);
-    fclose(Titlepage);
+        SetCurrentOutput(Titlepage);
+        if (htmlWorkshopFiles) HTMLWorkshopStartContents();
+        OnInform(_T("Converting..."));

 
 

-    if (Contents)
-    {
-//      wxFprintf(Titlepage, _T("\n</BODY></HTML>\n"));
-      fclose(Contents);
-      Contents = NULL;
-    }
+        TraverseDocument();
+        wxFprintf(Contents, _T("</UL>\n\n"));

 
 

-    if (FrameContents)
-    {
-      wxFprintf(FrameContents, _T("\n</UL>\n"));
-      wxFprintf(FrameContents, _T("</HTML>\n"));
-      fclose(FrameContents);
-      FrameContents = NULL;
-    }
+//        SetCurrentOutput(Titlepage);
+        fclose(Titlepage);

 
 

-    if (Chapters)
-    {
-      wxFprintf(Chapters, _T("\n</FONT></BODY></HTML>\n"));
-      fclose(Chapters);
-      Chapters = NULL;
-    }
-    if (Sections)
-    {
-      wxFprintf(Sections, _T("\n</FONT></BODY></HTML>\n"));
-      fclose(Sections);
-      Sections = NULL;
-    }
-    if (Subsections && !combineSubSections)
-    {
-      wxFprintf(Subsections, _T("\n</FONT></BODY></HTML>\n"));
-      fclose(Subsections);
-      Subsections = NULL;
-    }
-    if (Subsubsections && !combineSubSections)
-    {
-      wxFprintf(Subsubsections, _T("\n</FONT></BODY></HTML>\n"));
-      fclose(Subsubsections);
-      Subsubsections = NULL;
-    }
-    if ( SectionContentsFD )
-    {
-        fclose(SectionContentsFD);
-        SectionContentsFD = NULL;
-    }
+        if (Contents)
+        {
+//            wxFprintf(Titlepage, _T("\n</BODY></HTML>\n"));
+            fclose(Contents);
+            Contents = NULL;
+        }

 
 

-    // Create a temporary file for the title page header, add some info,
-    // and concat the titlepage just generated.
-    // This is necessary in order to put the title of the document
-    // at the TOP of the file within <HEAD>, even though we only find out
-    // what it is later on.
-    FILE *tmpTitle = wxFopen(_T("title.tmp"), _T("w"));
-    if (tmpTitle)
-    {
-      if (DocumentTitle)
-      {
-        SetCurrentOutput(tmpTitle);
-       HTMLHead();
-        TexOutput(_T("\n<HEAD><TITLE>"));
-        TraverseChildrenFromChunk(DocumentTitle);
-        TexOutput(_T("</TITLE></HEAD>\n"));
-      }
-      else
-      {
-        SetCurrentOutput(tmpTitle);
-       HTMLHeadTo(tmpTitle);
-        if (contentsString)
-          wxFprintf(tmpTitle, _T("<TITLE>%s</TITLE></HEAD>\n\n"), contentsString);
-        else
-          wxFprintf(tmpTitle, _T("<TITLE>%s</TITLE></HEAD>\n\n"), wxFileNameFromPath(FileRoot));
-      }
+        if (FrameContents)
+        {
+            wxFprintf(FrameContents, _T("\n</UL>\n"));
+            wxFprintf(FrameContents, _T("</HTML>\n"));
+            fclose(FrameContents);
+            FrameContents = NULL;
+        }

 
 

-      // Output frame information
-      if (htmlFrameContents)
-      {
-        wxChar firstFileName[300];
-        if (truncateFilenames)
-          wxSprintf(firstFileName, _T("%s1.htm"), FileRoot);
-        else
-          wxSprintf(firstFileName, _T("%s1.html"), FileRoot);
+        if (Chapters)
+        {
+            wxFprintf(Chapters, _T("\n</FONT></BODY></HTML>\n"));
+            fclose(Chapters);
+            Chapters = NULL;
+        }
+        if (Sections)
+        {
+            wxFprintf(Sections, _T("\n</FONT></BODY></HTML>\n"));
+            fclose(Sections);
+            Sections = NULL;
+        }
+        if (Subsections && !combineSubSections)
+        {
+            wxFprintf(Subsections, _T("\n</FONT></BODY></HTML>\n"));
+            fclose(Subsections);
+            Subsections = NULL;
+        }
+        if (Subsubsections && !combineSubSections)
+        {
+            wxFprintf(Subsubsections, _T("\n</FONT></BODY></HTML>\n"));
+            fclose(Subsubsections);
+            Subsubsections = NULL;
+        }
+        if ( SectionContentsFD )
+        {
+            fclose(SectionContentsFD);
+            SectionContentsFD = NULL;
+        }

 
 

-        wxFprintf(tmpTitle, _T("<FRAMESET COLS=\"30%%,70%%\">\n"));
+        // Create a temporary file for the title page header, add some info,
+        // and concat the titlepage just generated.
+        // This is necessary in order to put the title of the document
+        // at the TOP of the file within <HEAD>, even though we only find out
+        // what it is later on.
+        FILE *tmpTitle = wxFopen(_T("title.tmp"), _T("w"));
+        if (tmpTitle)
+        {
+            if (DocumentTitle)
+            {
+                SetCurrentOutput(tmpTitle);
+                HTMLHead();
+                TexOutput(_T("\n<TITLE>"));
+                TraverseChildrenFromChunk(DocumentTitle);
+                TexOutput(_T("</TITLE></HEAD>\n"));
+            }
+            else
+            {
+                SetCurrentOutput(tmpTitle);
+                HTMLHeadTo(tmpTitle);
+                if (contentsString)
+                    wxFprintf(tmpTitle, _T("<TITLE>%s</TITLE></HEAD>\n\n"), contentsString);
+                else
+                    wxFprintf(tmpTitle, _T("<TITLE>%s</TITLE></HEAD>\n\n"), wxFileNameFromPath(FileRoot));
+            }

 
 

-        wxFprintf(tmpTitle, _T("<FRAME SRC=\"%s\">\n"), ConvertCase(wxFileNameFromPath(contentsFrameName)));
-        wxFprintf(tmpTitle, _T("<FRAME SRC=\"%s\" NAME=\"mainwindow\">\n"), ConvertCase(wxFileNameFromPath(firstFileName)));
-        wxFprintf(tmpTitle, _T("</FRAMESET>\n"));
+            // Output frame information
+            if (htmlFrameContents)
+            {
+                wxChar firstFileName[300];
+                if (truncateFilenames)
+                    wxSnprintf(firstFileName, sizeof(firstFileName), _T("%s1.htm"), FileRoot);
+                else
+                    wxStrcpy(firstFileName, gs_filenames[1].c_str());

 
 

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

 
 

-      // Output <BODY...> to temporary title page
-      OutputBodyStart();
+                wxFprintf(tmpTitle, _T("<FRAME SRC=\"%s\">\n"), ConvertCase(wxFileNameFromPath(contentsFrameName)));
+                wxFprintf(tmpTitle, _T("<FRAME SRC=\"%s\" NAME=\"mainwindow\">\n"), ConvertCase(wxFileNameFromPath(firstFileName)));
+                wxFprintf(tmpTitle, _T("</FRAMESET>\n"));

 
 

-      // Concat titlepage
-      FILE *fd = wxFopen(TitlepageName, _T("r"));
-      if (fd)
-      {
-        int ch = getc(fd);
-        while (ch != EOF)
-        {
-          putc(ch, tmpTitle);
-          ch = getc(fd);
-        }
-        fclose(fd);
-      }
+                wxFprintf(tmpTitle, _T("<NOFRAMES>\n"));
+            }

 
 

-      wxFprintf(tmpTitle, _T("\n</FONT></BODY>\n"));
+            // Output <BODY...> to temporary title page
+            OutputBodyStart();
+            fflush(tmpTitle);

 
 

-      if (htmlFrameContents)
-      {
-        wxFprintf(tmpTitle, _T("\n</NOFRAMES>\n"));
-      }
-      wxFprintf(tmpTitle, _T("\n</HTML>\n"));
+            // Concat titlepage
+            FILE *fd = wxFopen(TitlepageName, _T("r"));
+            if (fd)
+            {
+                int ch = getc(fd);
+                while (ch != EOF)
+                {
+                    wxPutc(ch, tmpTitle);
+                    ch = getc(fd);
+                }
+                fclose(fd);
+            }

 
 

-      fclose(tmpTitle);
-      if (wxFileExists(TitlepageName)) wxRemoveFile(TitlepageName);
-      if (!wxRenameFile(_T("title.tmp"), TitlepageName))
-      {
-        wxCopyFile(_T("title.tmp"), TitlepageName);
-        wxRemoveFile(_T("title.tmp"));
-      }
-    }
+            wxFprintf(tmpTitle, _T("\n</FONT></BODY>\n"));
+
+            if (htmlFrameContents)
+            {
+                wxFprintf(tmpTitle, _T("\n</NOFRAMES>\n"));
+            }
+            wxFprintf(tmpTitle, _T("\n</HTML>\n"));

 
 

-    if (lastFileName) delete[] lastFileName;
-    lastFileName = NULL;
-    if (lastTopic) delete[] lastTopic;
-    lastTopic = NULL;
+            fclose(tmpTitle);
+            if (wxFileExists(TitlepageName)) wxRemoveFile(TitlepageName);
+            if (!wxRenameFile(_T("title.tmp"), TitlepageName))
+            {
+                wxCopyFile(_T("title.tmp"), TitlepageName);
+                wxRemoveFile(_T("title.tmp"));
+            }
+        }

 
 

-    if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);
+        if (lastFileName) delete[] lastFileName;
+        lastFileName = NULL;
+        if (lastTopic) delete[] lastTopic;
+        lastTopic = NULL;

 
 

-    if (!wxRenameFile(TmpContentsName, ContentsName))
-    {
-      wxCopyFile(TmpContentsName, ContentsName);
-      wxRemoveFile(TmpContentsName);
-    }
+        if (wxFileExists(ContentsName)) wxRemoveFile(ContentsName);

 
 

-    // Generate .htx file if requested
-    if (htmlIndex)
-    {
-      wxChar htmlIndexName[300];
-      wxSprintf(htmlIndexName, _T("%s.htx"), FileRoot);
-      GenerateHTMLIndexFile(htmlIndexName);
-    }
+        if (!wxRenameFile(TmpContentsName, ContentsName))
+        {
+            wxCopyFile(TmpContentsName, ContentsName);
+            wxRemoveFile(TmpContentsName);
+        }

 
 

-    // Generate HTML Help Workshop files if requested
-    if (htmlWorkshopFiles)
-    {
-      HTMLWorkshopEndContents();
-      GenerateHTMLWorkshopFiles(FileRoot);
-    }
+        // Generate .htx file if requested
+        if (htmlIndex)
+        {
+            wxChar htmlIndexName[300];
+            wxSnprintf(htmlIndexName, sizeof(htmlIndexName), _T("%s.htx"), FileRoot);
+            GenerateHTMLIndexFile(htmlIndexName);
+        }

 
 

+        // Generate HTML Help Workshop files if requested
+        if (htmlWorkshopFiles)
+        {
+            HTMLWorkshopEndContents();
+            GenerateHTMLWorkshopFiles(FileRoot);
+        }

 
 

-    return TRUE;
-  }
+        return true;
+    }

 
 

-  return FALSE;
+    return false;

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


@@ -3087,7 +3253,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 +3289,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 +3326,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 +3353,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();


@@ -3203,7 +3369,7 @@ void GenerateHTMLWorkshopFiles(wxChar *fname)
             _T("  <param name=\"Local\" value=\"%s#%s\">\n")
             _T("  <param name=\"Name\" value=\"%s\">\n")
             _T("  </OBJECT>\n"),
             _T("  <param name=\"Local\" value=\"%s#%s\">\n")
             _T("  <param name=\"Name\" value=\"%s\">\n")
             _T("  </OBJECT>\n"),

-           texTopic->filename, topicName, s);
+        texTopic->filename, topicName, s);

         node1 = node1->GetNext();
       }
     }
         node1 = node1->GetNext();
       }
     }


@@ -3235,10 +3401,10 @@ void HTMLWorkshopAddToContents(int level, wxChar *s, wxChar *file)
             _T(" <LI> <OBJECT type=\"text/sitemap\">\n")
             _T("  <param name=\"Local\" value=\"%s#%s\">\n")
             _T("  <param name=\"Name\" value=\""),
             _T(" <LI> <OBJECT type=\"text/sitemap\">\n")
             _T("  <param name=\"Local\" value=\"%s#%s\">\n")
             _T("  <param name=\"Name\" value=\""),

-           file, s);
+            file, s);

   OutputCurrentSection();
   wxFprintf(HTMLWorkshopContents,
   OutputCurrentSection();
   wxFprintf(HTMLWorkshopContents,

-                 _T("\">\n")
+            _T("\">\n")

             _T("  </OBJECT>\n"));
   HTMLWorkshopLastLevel = level;
 }
             _T("  </OBJECT>\n"));
   HTMLWorkshopLastLevel = level;
 }


@@ -3247,7 +3413,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;
 


@@ -3275,7 +3441,15 @@ void HTMLWorkshopStartContents()
 
 void HTMLWorkshopEndContents()
 {
 
 void HTMLWorkshopEndContents()
 {

-  for (int i = HTMLWorkshopLastLevel; i >= 0; i--)
-    wxFprintf(HTMLWorkshopContents, _T("</UL>\n"));
-  fclose(HTMLWorkshopContents);
+    for (int i = HTMLWorkshopLastLevel; i >= 0; i--)
+        wxFprintf(HTMLWorkshopContents, _T("</UL>\n"));
+    fclose(HTMLWorkshopContents);
+}
+
+
+bool PrimaryAnchorOfTheFile( wxChar *file, wxChar *label )
+{
+    wxString file_label;
+    file_label.Printf( HTML_FILENAME_PATTERN, FileRoot, label );
+    return file_label.IsSameAs( file , false );

 }
 }