Deprecated lib tweaks

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

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 93a6356748757b58b15ecfc967a54a3ef833fd48..e4e08c30bbefe225afceff8783fbed389dbd835a 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -58,6 +58,9 @@ extern FILE *WinHelpContentsFile;
 extern char *RTFCharset;
 // This is defined in the Tex2Any library and isn't in use after parsing
 extern char *BigBuffer;
 extern char *RTFCharset;
 // This is defined in the Tex2Any library and isn't in use after parsing
 extern char *BigBuffer;

+
+extern wxHashTable TexReferences;
+

 // Are we in verbatim mode? If so, format differently.
 static bool inVerbatim = FALSE;
 
 // Are we in verbatim mode? If so, format differently.
 static bool inVerbatim = FALSE;
 


@@ -90,6 +93,8 @@ static int TwoColWidthB = 3000;
 
 const int PageWidth = 12242; // 8.25 inches wide for A4
 
 
 const int PageWidth = 12242; // 8.25 inches wide for A4
 

+// Remember the anchor in a helpref
+static TexChunk *helpRefText = NULL;

 
 /*
  * Flag to say we've just issued a \par\pard command, so don't
 
 /*
  * Flag to say we've just issued a \par\pard command, so don't


@@ -208,18 +213,18 @@ void ResetContentsLevels(int l)
 // : for space.
 void OutputSectionKeyword(FILE *fd)
 {
 // : for space.
 void OutputSectionKeyword(FILE *fd)
 {

-  OutputCurrentSectionToString(wxBuffer);
+  OutputCurrentSectionToString(wxTex2RTFBuffer);

   
   

-  int i;
-  for (i = 0; i < strlen(wxBuffer); i++)
-    if (wxBuffer[i] == ':')
-      wxBuffer[i] = ' ';
+  unsigned int i;
+  for (i = 0; i < strlen(wxTex2RTFBuffer); i++)
+    if (wxTex2RTFBuffer[i] == ':')
+      wxTex2RTFBuffer[i] = ' ';

     // Don't write to index if there's some RTF in the string
     // Don't write to index if there's some RTF in the string

-    else if ( wxBuffer[i] == '{' )
+    else if ( wxTex2RTFBuffer[i] == '{' )

         return;
 
   fprintf(fd, "K{\\footnote {K} ");
         return;
 
   fprintf(fd, "K{\\footnote {K} ");

-  fprintf(fd, "%s", wxBuffer);
+  fprintf(fd, "%s", wxTex2RTFBuffer);

   
   fprintf(fd, "}\n");
 }
   
   fprintf(fd, "}\n");
 }


@@ -349,7 +354,7 @@ void GenerateKeywordsForTopic(char *topic)
       SplitIndexEntry(s, buf1, buf2);
       
       // Check for ':' which messes up index
       SplitIndexEntry(s, buf1, buf2);
       
       // Check for ':' which messes up index

-      int i;
+      unsigned int i;

       for (i = 0; i < strlen(buf1) ; i++)
         if (buf1[i] == ':')
           buf1[i] = ' ';
       for (i = 0; i < strlen(buf1) ; i++)
         if (buf1[i] == ':')
           buf1[i] = ' ';


@@ -522,7 +527,7 @@ bool WriteHPJ(char *filename)
   StripExtension(hpjFilename);
   strcat(hpjFilename, ".hpj");
 
   StripExtension(hpjFilename);
   strcat(hpjFilename, ".hpj");
 

-  strcpy(helpFile, FileNameFromPath(filename));
+  strcpy(helpFile, wxFileNameFromPath(filename));

   StripExtension(helpFile);
   strcpy(rtfFile, helpFile);
   strcat(helpFile, ".hlp");
   StripExtension(helpFile);
   strcpy(rtfFile, helpFile);
   strcat(helpFile, ".hlp");


@@ -662,7 +667,7 @@ void ProcessText2RTF(TexChunk *chunk)
       i += 1;
       changed = TRUE;
     }
       i += 1;
       changed = TRUE;
     }

-    else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curly bracket
+    else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curley bracket

     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;


@@ -1108,8 +1113,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
 
       if (winHelpContents && winHelp && !InPopups())
       {
 
       if (winHelpContents && winHelp && !InPopups())
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 1);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 1);

       }
       AddTexRef(topicName, NULL, ChapterNameString, chapterNo);
 
       }
       AddTexRef(topicName, NULL, ChapterNameString, chapterNo);
 


@@ -1190,7 +1195,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
             fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n");
           else
             fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
             fprintf(Chapters, "!{\\footnote DisableButton(\"Up\")}\n");
           else
             fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), "Contents");
+               wxFileNameFromPath(FileRoot), "Contents");

         }
       }
 
         }
       }
 


@@ -1250,8 +1255,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       NotifyParentHasChildren(1);
       if (winHelpContents && winHelp && !InPopups())
       {
       NotifyParentHasChildren(1);
       if (winHelpContents && winHelp && !InPopups())
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 2);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 2);

       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo);
 
       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo);
 


@@ -1345,12 +1350,12 @@ void RTFOnMacro(int macroId, int no_args, bool start)
           if (DocumentStyle == LATEX_ARTICLE)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
           if (DocumentStyle == LATEX_ARTICLE)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), "Contents");
+               wxFileNameFromPath(FileRoot), "Contents");

           }
           else if (CurrentChapterName)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
           }
           else if (CurrentChapterName)
           {
             fprintf(Sections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), CurrentChapterName);
+               wxFileNameFromPath(FileRoot), CurrentChapterName);

           }
         }
       }
           }
         }
       }


@@ -1434,8 +1439,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       NotifyParentHasChildren(2);
       if (winHelpContents && winHelp && !InPopups())
       {
       NotifyParentHasChildren(2);
       if (winHelpContents && winHelp && !InPopups())
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 3);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 3);

       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo);
 
       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo);
 


@@ -1496,7 +1501,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (useUpButton && CurrentSectionName)
         {
           fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
         if (useUpButton && CurrentSectionName)
         {
           fprintf(Subsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-             FileNameFromPath(FileRoot), CurrentSectionName);
+             wxFileNameFromPath(FileRoot), CurrentSectionName);

         }
       }
       if (!winHelp && indexSubsections && useWord)
         }
       }
       if (!winHelp && indexSubsections && useWord)


@@ -1584,8 +1589,8 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       NotifyParentHasChildren(3);
       if (winHelpContents && winHelp)
       {
       NotifyParentHasChildren(3);
       if (winHelpContents && winHelp)
       {

-        OutputCurrentSectionToString(wxBuffer);
-        WriteWinHelpContentsFileLine(topicName, wxBuffer, 4);
+        OutputCurrentSectionToString(wxTex2RTFBuffer);
+        WriteWinHelpContentsFileLine(topicName, wxTex2RTFBuffer, 4);

       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo, subsubsectionNo);
 
       }
       AddTexRef(topicName, NULL, SectionNameString, chapterNo, sectionNo, subsectionNo, subsubsectionNo);
 


@@ -1642,7 +1647,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         if (useUpButton && CurrentSubsectionName)
         {
           fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
         if (useUpButton && CurrentSubsectionName)
         {
           fprintf(Subsubsections, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-             FileNameFromPath(FileRoot), CurrentSubsectionName);
+             wxFileNameFromPath(FileRoot), CurrentSubsectionName);

         }
       }
       if (!winHelp && indexSubsections && useWord)
         }
       }
       if (!winHelp && indexSubsections && useWord)


@@ -2200,7 +2205,6 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       {
         struc->currentItem += 1;
 
       {
         struc->currentItem += 1;
 

-        int indentSize = struc->indentation;

         int oldIndent = 0;
         wxNode *node2 = NULL;
         if (itemizeStack.Number() > 1) // TODO: do I actually mean Nth(0) here??
         int oldIndent = 0;
         wxNode *node2 = NULL;
         if (itemizeStack.Number() > 1) // TODO: do I actually mean Nth(0) here??


@@ -3338,46 +3342,61 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           TexOutput("{\\i ");
         else
           TexOutput("}");
           TexOutput("{\\i ");
         else
           TexOutput("}");

+
+        if (start)
+          helpRefText = GetArgChunk();
+

         return TRUE;
       }
       else if ((GetNoArgs() - arg_no) == 0) // Arg = 2, or 3 if first is optional
       {
         if (macroId != ltHELPREFN)
         {
         return TRUE;
       }
       else if ((GetNoArgs() - arg_no) == 0) // Arg = 2, or 3 if first is optional
       {
         if (macroId != ltHELPREFN)
         {

+          char *refName = GetArgData();
+          TexRef *texRef = NULL;
+          if (refName)
+            texRef = FindReference(refName);

           if (start)
           {
           if (start)
           {

-            TexOutput(" (");
-            char *refName = GetArgData();
+            if (texRef || !ignoreBadRefs)
+              TexOutput(" (");

             if (refName)
             {
             if (refName)
             {

-                if (useWord)
+                if (texRef || !ignoreBadRefs)

                 {
                 {

-                    char *s = GetArgData();
-                    TexOutput("p. ");
-                    TexOutput("{\\field{\\*\\fldinst  PAGEREF ");
-                    TexOutput(refName);
-                    TexOutput(" \\\\* MERGEFORMAT }{\\fldrslt ??}}");
-                }
-                else
-                {
-                  // Only print section name if we're not in Word mode,
-                  // so can't do page references
-                  TexRef *texRef = FindReference(refName);
-                  if (texRef)
+                  if (useWord)

                   {
                   {

-                    TexOutput(texRef->sectionName) ; TexOutput(" "); TexOutput(texRef->sectionNumber);
+                      char *s = GetArgData();
+                      TexOutput("p. ");
+                      TexOutput("{\\field{\\*\\fldinst  PAGEREF ");
+                      TexOutput(refName);
+                      TexOutput(" \\\\* MERGEFORMAT }{\\fldrslt ??}}");

                   }
                   else
                   {
                   }
                   else
                   {

-                    TexOutput("??");
-                    sprintf(buf, "Warning: unresolved reference %s.", refName);
-                    OnInform(buf);
+                    // Only print section name if we're not in Word mode,
+                    // so can't do page references
+                    if (texRef)
+                    {
+                      TexOutput(texRef->sectionName) ; TexOutput(" "); TexOutput(texRef->sectionNumber);
+                    }
+                    else
+                    {
+                      if (!ignoreBadRefs)
+                        TexOutput("??");
+                      sprintf(buf, "Warning: unresolved reference '%s'", refName);
+                      OnInform(buf);
+                    }

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

-          else TexOutput(")");
+          else
+          {
+            if (texRef || !ignoreBadRefs)
+              TexOutput(")");
+          }

         }
         return FALSE;
       }
         }
         return FALSE;
       }


@@ -3482,6 +3501,8 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
       // Convert points to TWIPS (1 twip = 1/20th of point)
       imageWidth = (int)(20*(tok1 ? ParseUnitArgument(tok1) : 0));
       imageHeight = (int)(20*(tok2 ? ParseUnitArgument(tok2) : 0));
       // Convert points to TWIPS (1 twip = 1/20th of point)
       imageWidth = (int)(20*(tok1 ? ParseUnitArgument(tok1) : 0));
       imageHeight = (int)(20*(tok2 ? ParseUnitArgument(tok2) : 0));

+      if (imageDimensions)  // glt
+          delete [] imageDimensions;

       return FALSE;
     }  
     else if (start && (arg_no == 2 ))
       return FALSE;
     }  
     else if (start && (arg_no == 2 ))


@@ -3556,6 +3577,8 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
           sprintf(buf, "Warning: could not find a BMP or WMF equivalent for %s.", filename);
           OnInform(buf);
         }
           sprintf(buf, "Warning: could not find a BMP or WMF equivalent for %s.", filename);
           OnInform(buf);
         }

+        if (filename)  // glt
+            delete [] filename;

       }
       else // linear RTF
       {
       }
       else // linear RTF
       {


@@ -4874,7 +4897,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
         if (useUpButton)
         {
           fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",
         if (useUpButton)
         {
           fprintf(Chapters, "!{\\footnote EnableButton(\"Up\");ChangeButtonBinding(\"Up\", \"JumpId(`%s.hlp', `%s')\")}\n",

-               FileNameFromPath(FileRoot), "Contents");
+               wxFileNameFromPath(FileRoot), "Contents");

         }
       }
       
         }
       }
       


@@ -5081,6 +5104,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
 
 bool RTFGo(void)
 {
 
 bool RTFGo(void)
 {

+  if (stopRunning)
+      return FALSE;
+

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


@@ -5155,6 +5181,9 @@ bool RTFGo(void)
 
     SetCurrentOutput(Chapters);
 
 
     SetCurrentOutput(Chapters);
 

+    if (stopRunning)
+        return FALSE;
+

     OnInform("Converting...");
 
     TraverseDocument();
     OnInform("Converting...");
 
     TraverseDocument();


@@ -5218,13 +5247,33 @@ bool RTFGo(void)
     {
       wxConcatFiles("header.rtf", "chapters.rtf", "tmp1.rtf");
       Tex2RTFYield(TRUE);
     {
       wxConcatFiles("header.rtf", "chapters.rtf", "tmp1.rtf");
       Tex2RTFYield(TRUE);

-      if (FileExists(OutputFile)) wxRemoveFile(OutputFile);
-      wxCopyFile("tmp1.rtf", OutputFile);
+      if (wxFileExists(OutputFile))
+          wxRemoveFile(OutputFile);
+
+      char *cwdStr;
+      cwdStr = wxGetWorkingDirectory();
+
+      wxString outputDirStr;
+      outputDirStr = wxPathOnly(OutputFile);
+
+      // Determine if the temp file and the output file are in the same directory,
+      // and if they are, then just rename the temp file rather than copying
+      // it, as this is much faster when working with large (multi-megabyte files)
+      if ((wxStrcmp(outputDirStr.c_str(),"") == 0) ||  // no path specified on output file
+          (wxStrcmp(cwdStr,outputDirStr.c_str()) == 0)) // paths do not match
+      {
+        wxRenameFile("tmp1.rtf", OutputFile);
+      }
+      else
+      {
+        wxCopyFile("tmp1.rtf", OutputFile);
+      }
+      delete [] cwdStr;

       Tex2RTFYield(TRUE);
       wxRemoveFile("tmp1.rtf");
     }
     
       Tex2RTFYield(TRUE);
       wxRemoveFile("tmp1.rtf");
     }
     

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

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