Define SF_UNICODE if undefined

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

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index d99f91343994965869c7d2351d82525d4d8b8c4f..50b4466234068be1b5006e7c6c58d20fffa6aedf 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -25,11 +25,11 @@
 #endif
 
 #ifndef NO_GUI
 #endif
 
 #ifndef NO_GUI

-#include <wx/help.h>
-#include <wx/timer.h>
+#include "wx/help.h"
+#include "wx/timer.h"

 #endif
 
 #endif
 

-#ifdef NO_GUI
+#if defined(NO_GUI) || defined(__UNIX__)

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #include <fstream.h>


@@ -45,7 +45,7 @@
 #include "tex2rtf.h"
 #include "rtfutils.h"
 
 #include "tex2rtf.h"
 #include "rtfutils.h"
 

-#if (defined(__WXGTK__) || defined(__WXMOTIF__)) && !defined(NO_GUI)
+#if (defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)) && !defined(NO_GUI)

 #include "tex2rtf.xpm"
 #endif
 
 #include "tex2rtf.xpm"
 #endif
 


@@ -57,9 +57,41 @@ char *contentsString = NULL;
 bool suppressNameDecoration = FALSE;
 bool OkToClose = TRUE;
 int passNumber = 1;
 bool suppressNameDecoration = FALSE;
 bool OkToClose = TRUE;
 int passNumber = 1;

+int errorCount = 0;

 
 #ifndef NO_GUI
 
 #ifndef NO_GUI

+
+extern char *BigBuffer;
+extern char *TexFileRoot;
+extern char *TexBibName;         // Bibliography output file name
+extern char *TexTmpBibName;      // Temporary bibliography output file name
+extern wxList ColourTable;
+extern TexChunk *TopLevel;
+extern char *PageStyle;
+extern char *BibliographyStyleString;
+extern char *DocumentStyleString;
+extern char *bitmapMethod;
+extern char *backgroundColourString;
+extern char *ContentsNameString;
+extern char *AbstractNameString;
+extern char *GlossaryNameString;
+extern char *ReferencesNameString;
+extern char *FiguresNameString;
+extern char *TablesNameString;
+extern char *FigureNameString;
+extern char *TableNameString;
+extern char *IndexNameString;
+extern char *ChapterNameString;
+extern char *SectionNameString;
+extern char *SubsectionNameString;
+extern char *SubsubsectionNameString;
+extern char *UpNameString;
+
+
+
+#if wxUSE_HELP

 wxHelpController *HelpInstance = NULL;
 wxHelpController *HelpInstance = NULL;

+#endif // wxUSE_HELP

 
 #ifdef __WXMSW__
 static char *ipc_buffer = NULL;
 
 #ifdef __WXMSW__
 static char *ipc_buffer = NULL;


@@ -87,7 +119,7 @@ char *ContentsName = NULL;    // Contents page from last time around
 char *TmpContentsName = NULL; // Current contents page
 char *TmpFrameContentsName = NULL; // Current frame contents page
 char *WinHelpContentsFileName = NULL; // WinHelp .cnt file
 char *TmpContentsName = NULL; // Current contents page
 char *TmpFrameContentsName = NULL; // Current frame contents page
 char *WinHelpContentsFileName = NULL; // WinHelp .cnt file

-char *RefName = NULL;         // Reference file name
+char *RefFileName = NULL;         // Reference file name

 
 char *RTFCharset = copystring("ansi");
 
 
 char *RTFCharset = copystring("ansi");
 


@@ -101,6 +133,13 @@ bool Go(void);
 void ShowOptions(void);
 
 #ifdef NO_GUI
 void ShowOptions(void);
 
 #ifdef NO_GUI

+
+#if wxUSE_GUI || !defined(__UNIX__)
+// wxBase for Unix does not have wxBuffer
+extern 
+#endif
+char *wxBuffer; // we must init it, otherwise tex2rtf will crash
+

 int main(int argc, char **argv)
 #else
 wxMenuBar *menuBar = NULL;
 int main(int argc, char **argv)
 #else
 wxMenuBar *menuBar = NULL;


@@ -122,10 +161,12 @@ bool MyApp::OnInit()
   TmpContentsName = new char[300];
   TmpFrameContentsName = new char[300];
   WinHelpContentsFileName = new char[300];
   TmpContentsName = new char[300];
   TmpFrameContentsName = new char[300];
   WinHelpContentsFileName = new char[300];

-  RefName = new char[300];
+  RefFileName = new char[300];
+
+  ColourTable.DeleteContents(TRUE);

 
   int n = 1;
 
   int n = 1;

-  
+

   // Read input/output files
   if (argc > 1)
   {
   // Read input/output files
   if (argc > 1)
   {


@@ -146,12 +187,16 @@ bool MyApp::OnInit()
   }
 
 #ifdef NO_GUI
   }
 
 #ifdef NO_GUI

+  wxBuffer = new char[1500];
+  // this is done in wxApp, but NO_GUI version doesn't call it :-(
+

   if (!InputFile || !OutputFile)
   {
   if (!InputFile || !OutputFile)
   {

-    cout << "Tex2RTF: input or output file is missing.\n";
+    wxSTD cout << "Tex2RTF: input or output file is missing.\n";

     ShowOptions();
     exit(1);
   }
     ShowOptions();
     exit(1);
   }

+

 #endif
   if (InputFile)
   {
 #endif
   if (InputFile)
   {


@@ -160,7 +205,8 @@ bool MyApp::OnInit()
   if (!InputFile || !OutputFile)
     isInteractive = TRUE;
 
   if (!InputFile || !OutputFile)
     isInteractive = TRUE;
 

-  for (int i = n; i < argc;)
+  int i;
+  for (i = n; i < argc;)

   {
     if (strcmp(argv[i], "-winhelp") == 0)
     {
   {
     if (strcmp(argv[i], "-winhelp") == 0)
     {


@@ -231,19 +277,31 @@ bool MyApp::OnInit()
         else
         {
           OnError("Incorrect argument for -charset");
         else
         {
           OnError("Incorrect argument for -charset");

+          return FALSE;

         }
       }
     }
         }
       }
     }

+    else if (strcmp(argv[i], "-checkcurleybraces") == 0)
+    {
+      i ++;
+      checkCurleyBraces = TRUE;
+    }
+    else if (strcmp(argv[i], "-checksyntax") == 0)
+    {
+      i ++;
+      checkSyntax = TRUE;
+    }

     else
     {
     else
     {

-      char buf[100];
-      sprintf(buf, "Invalid switch %s.\n", argv[i]);
-      OnError(buf);
+      wxString buf;
+      buf.Printf("Invalid switch %s.\n", argv[i]);
+      OnError((char *)buf.c_str());

       i++;
 #ifdef NO_GUI
       ShowOptions();
       exit(1);
 #endif
       i++;
 #ifdef NO_GUI
       ShowOptions();
       exit(1);
 #endif

+      return FALSE;

     }
   }
 
     }
   }
 


@@ -306,6 +364,14 @@ bool MyApp::OnInit()
     mode_menu->Append(TEX_MODE_HTML, "Output &HTML",        "HTML World Wide Web hypertext file");
     mode_menu->Append(TEX_MODE_XLP, "Output &XLP",          "wxHelp hypertext help file");
 
     mode_menu->Append(TEX_MODE_HTML, "Output &HTML",        "HTML World Wide Web hypertext file");
     mode_menu->Append(TEX_MODE_XLP, "Output &XLP",          "wxHelp hypertext help file");
 

+    wxMenu *options_menu = new wxMenu;
+
+    options_menu->Append(TEX_OPTIONS_CURELY_BRACE, "Curley brace matching",   "Checks for mismatched curley braces",TRUE);
+    options_menu->Append(TEX_OPTIONS_SYNTAX_CHECKING, "Syntax checking", "Syntax checking for common errors",TRUE);
+
+    options_menu->Check(TEX_OPTIONS_CURELY_BRACE, checkCurleyBraces);
+    options_menu->Check(TEX_OPTIONS_SYNTAX_CHECKING, checkSyntax);
+

     wxMenu *help_menu = new wxMenu;
 
     help_menu->Append(TEX_HELP, "&Help", "Tex2RTF Contents Page");
     wxMenu *help_menu = new wxMenu;
 
     help_menu->Append(TEX_HELP, "&Help", "Tex2RTF Contents Page");


@@ -315,22 +381,25 @@ bool MyApp::OnInit()
     menuBar->Append(file_menu, "&File");
     menuBar->Append(macro_menu, "&Macros");
     menuBar->Append(mode_menu, "&Conversion Mode");
     menuBar->Append(file_menu, "&File");
     menuBar->Append(macro_menu, "&Macros");
     menuBar->Append(mode_menu, "&Conversion Mode");

+    menuBar->Append(options_menu, "&Options");

     menuBar->Append(help_menu, "&Help");
 
     frame->SetMenuBar(menuBar);
     frame->textWindow = new wxTextCtrl(frame, -1, "", wxPoint(-1, -1), wxSize(-1, -1), wxTE_READONLY|wxTE_MULTILINE);
 
     (*frame->textWindow) << "Welcome to Julian Smart's LaTeX to RTF converter.\n";
     menuBar->Append(help_menu, "&Help");
 
     frame->SetMenuBar(menuBar);
     frame->textWindow = new wxTextCtrl(frame, -1, "", wxPoint(-1, -1), wxSize(-1, -1), wxTE_READONLY|wxTE_MULTILINE);
 
     (*frame->textWindow) << "Welcome to Julian Smart's LaTeX to RTF converter.\n";

-//    ShowOptions();    
+//    ShowOptions();

 
 

+#if wxUSE_HELP

     HelpInstance = new wxHelpController();
     HelpInstance->Initialize("tex2rtf");
     HelpInstance = new wxHelpController();
     HelpInstance->Initialize("tex2rtf");

+#endif // wxUSE_HELP

 
     /*
      * Read macro/initialisation file
      *
      */
 
     /*
      * Read macro/initialisation file
      *
      */

-   
+

     wxString path;
     if ((path = TexPathList.FindValidPath(MacroFile)) != "")
       ReadCustomMacros((char*) (const char*) path);
     wxString path;
     if ((path = TexPathList.FindValidPath(MacroFile)) != "")
       ReadCustomMacros((char*) (const char*) path);


@@ -345,7 +414,7 @@ bool MyApp::OnInit()
     else if (convertMode == TEX_XLP) strcat(buf, "XLP");
       strcat(buf, " mode.");
     frame->SetStatusText(buf, 1);
     else if (convertMode == TEX_XLP) strcat(buf, "XLP");
       strcat(buf, " mode.");
     frame->SetStatusText(buf, 1);

-  
+

     frame->Show(TRUE);
     return TRUE;
   }
     frame->Show(TRUE);
     return TRUE;
   }


@@ -356,13 +425,16 @@ bool MyApp::OnInit()
      * Read macro/initialisation file
      *
      */
      * Read macro/initialisation file
      *
      */

-   
+

     wxString path;
     if ((path = TexPathList.FindValidPath(MacroFile)) != "")
       ReadCustomMacros((char*) (const char*) path);
 
     Go();
     wxString path;
     if ((path = TexPathList.FindValidPath(MacroFile)) != "")
       ReadCustomMacros((char*) (const char*) path);
 
     Go();

-    if (runTwice) Go();
+    if (runTwice) 
+    {
+        Go();
+    }

 #ifdef NO_GUI
     return 0;
 #else
 #ifdef NO_GUI
     return 0;
 #else


@@ -374,10 +446,12 @@ bool MyApp::OnInit()
   // Return the main frame window
   return TRUE;
 #else
   // Return the main frame window
   return TRUE;
 #else

+  delete[] wxBuffer;

   return FALSE;
 #endif
 }
 
   return FALSE;
 #endif
 }
 

+#ifndef NO_GUI

 int MyApp::OnExit()
 {
   wxNode *node = CustomMacroList.First();
 int MyApp::OnExit()
 {
   wxNode *node = CustomMacroList.First();


@@ -401,17 +475,115 @@ int MyApp::OnExit()
   delete TheTex2RTFServer;
   wxDDECleanUp();
 #endif
   delete TheTex2RTFServer;
   wxDDECleanUp();
 #endif

+
+#if wxUSE_HELP

   delete HelpInstance;
   delete HelpInstance;

+#endif // wxUSE_HELP
+
+    if (BigBuffer)
+    {
+      delete BigBuffer;
+      BigBuffer = NULL;
+    }
+    if (currentArgData)
+    {
+      delete currentArgData;
+      currentArgData = NULL;
+    }
+    if (TexFileRoot)
+    {
+      delete TexFileRoot;
+      TexFileRoot = NULL;
+    }
+    if (TexBibName)
+    {
+      delete TexBibName;
+      TexBibName = NULL;
+    }
+    if (TexTmpBibName)
+    {
+      delete TexTmpBibName;
+      TexTmpBibName = NULL;
+    }
+    if (FileRoot)
+    {
+      delete FileRoot;
+      FileRoot = NULL;
+    }
+    if (ContentsName)
+    {
+      delete ContentsName;
+      ContentsName = NULL;
+    }
+    if (TmpContentsName)
+    {
+      delete TmpContentsName;
+      TmpContentsName = NULL;
+    }
+    if (TmpFrameContentsName)
+    {
+      delete TmpFrameContentsName;
+      TmpFrameContentsName = NULL;
+    }
+    if (WinHelpContentsFileName)
+    {
+      delete WinHelpContentsFileName;
+      WinHelpContentsFileName = NULL;
+    }
+    if (RefFileName)
+    {
+      delete RefFileName;
+      RefFileName = NULL;
+    }
+    if (TopLevel)
+    {
+      delete TopLevel;
+      TopLevel = NULL;
+    }
+    if (MacroFile)
+    {
+      delete MacroFile;
+      MacroFile = NULL;
+    }
+    if (RTFCharset)
+    {
+      delete RTFCharset;
+      RTFCharset = NULL;
+    }
+
+    delete [] PageStyle;
+    delete [] BibliographyStyleString;
+    delete [] DocumentStyleString;
+    delete [] bitmapMethod;
+    delete [] backgroundColourString;
+    delete [] ContentsNameString;
+    delete [] AbstractNameString;
+    delete [] GlossaryNameString;
+    delete [] ReferencesNameString;
+    delete [] FiguresNameString;
+    delete [] TablesNameString;
+    delete [] FigureNameString;
+    delete [] TableNameString;
+    delete [] IndexNameString;
+    delete [] ChapterNameString;
+    delete [] SectionNameString;
+    delete [] SubsectionNameString;
+    delete [] SubsubsectionNameString;
+    delete [] UpNameString;
+    if (winHelpTitle)
+      delete[] winHelpTitle;

 
   // TODO: this simulates zero-memory leaks!
   // Otherwise there are just too many...
 #ifndef __WXGTK__
 
   // TODO: this simulates zero-memory leaks!
   // Otherwise there are just too many...
 #ifndef __WXGTK__

+#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT

   wxDebugContext::SetCheckpoint();
   wxDebugContext::SetCheckpoint();

+#endif

 #endif
 
   return 0;
 }
 #endif
 
   return 0;
 }

-
+#endif

 void ShowOptions(void)
 {
     char buf[100];
 void ShowOptions(void)
 {
     char buf[100];


@@ -419,11 +591,15 @@ void ShowOptions(void)
     OnInform(buf);
     OnInform("Usage: tex2rtf [input] [output] [switches]\n");
     OnInform("where valid switches are");
     OnInform(buf);
     OnInform("Usage: tex2rtf [input] [output] [switches]\n");
     OnInform("where valid switches are");

+#ifndef NO_GUI

     OnInform("    -interactive");
     OnInform("    -interactive");

+#endif

     OnInform("    -bufsize <size in K>");
     OnInform("    -charset <pc | pca | ansi | mac> (default ansi)");
     OnInform("    -twice");
     OnInform("    -sync");
     OnInform("    -bufsize <size in K>");
     OnInform("    -charset <pc | pca | ansi | mac> (default ansi)");
     OnInform("    -twice");
     OnInform("    -sync");

+    OnInform("    -checkcurleybraces");
+    OnInform("    -checksyntax");

     OnInform("    -macros <filename>");
     OnInform("    -winhelp");
     OnInform("    -rtf");
     OnInform("    -macros <filename>");
     OnInform("    -winhelp");
     OnInform("    -rtf");


@@ -448,6 +624,8 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TEX_MODE_WINHELP, MyFrame::OnModeWinHelp)
     EVT_MENU(TEX_MODE_HTML, MyFrame::OnModeHTML)
     EVT_MENU(TEX_MODE_XLP, MyFrame::OnModeXLP)
     EVT_MENU(TEX_MODE_WINHELP, MyFrame::OnModeWinHelp)
     EVT_MENU(TEX_MODE_HTML, MyFrame::OnModeHTML)
     EVT_MENU(TEX_MODE_XLP, MyFrame::OnModeXLP)

+    EVT_MENU(TEX_OPTIONS_CURELY_BRACE, MyFrame::OnOptionsCurleyBrace)
+    EVT_MENU(TEX_OPTIONS_SYNTAX_CHECKING, MyFrame::OnOptionsSyntaxChecking)

     EVT_MENU(TEX_HELP, MyFrame::OnHelp)
     EVT_MENU(TEX_ABOUT, MyFrame::OnAbout)
 END_EVENT_TABLE()
     EVT_MENU(TEX_HELP, MyFrame::OnHelp)
     EVT_MENU(TEX_ABOUT, MyFrame::OnAbout)
 END_EVENT_TABLE()


@@ -473,11 +651,14 @@ void MyFrame::OnCloseWindow(wxCloseEvent& event)
 
 void MyFrame::OnExit(wxCommandEvent& event)
 {
 
 void MyFrame::OnExit(wxCommandEvent& event)
 {

-    this->Destroy();
+  Close();
+//    this->Destroy();

 }
 
 void MyFrame::OnGo(wxCommandEvent& event)
 {
 }
 
 void MyFrame::OnGo(wxCommandEvent& event)
 {

+      passNumber = 1;
+      errorCount = 0;

       menuBar->EnableTop(0, FALSE);
       menuBar->EnableTop(1, FALSE);
       menuBar->EnableTop(2, FALSE);
       menuBar->EnableTop(0, FALSE);
       menuBar->EnableTop(1, FALSE);
       menuBar->EnableTop(2, FALSE);


@@ -486,7 +667,16 @@ void MyFrame::OnGo(wxCommandEvent& event)
       Tex2RTFYield(TRUE);
       Go();
 
       Tex2RTFYield(TRUE);
       Go();
 

-      if (runTwice)
+      if (stopRunning)
+      {
+        SetStatusText("Build aborted!");
+        wxString errBuf;
+        errBuf.Printf("\nErrors encountered during this pass: %lu\n", errorCount);
+        OnInform((char *)errBuf.c_str());
+      }
+
+
+      if (runTwice && !stopRunning)

       {
         Tex2RTFYield(TRUE);
         Go();
       {
         Tex2RTFYield(TRUE);
         Go();


@@ -599,10 +789,40 @@ void MyFrame::OnModeXLP(wxCommandEvent& event)
       SetStatusText("In XLP mode.", 1);
 }
 
       SetStatusText("In XLP mode.", 1);
 }
 

+void MyFrame::OnOptionsCurleyBrace(wxCommandEvent& event)
+{
+    checkCurleyBraces = !checkCurleyBraces;
+    if (checkCurleyBraces)
+    {
+        SetStatusText("Checking curley braces: YES", 1);
+    }
+    else
+    {
+        SetStatusText("Checking curley braces: NO", 1);
+    }
+}
+
+
+void MyFrame::OnOptionsSyntaxChecking(wxCommandEvent& event)
+{
+    checkSyntax = !checkSyntax;
+    if (checkSyntax)
+    {
+        SetStatusText("Checking syntax: YES", 1);
+    }
+    else
+    {
+        SetStatusText("Checking syntax: NO", 1);
+    }
+}
+
+

 void MyFrame::OnHelp(wxCommandEvent& event)
 {
 void MyFrame::OnHelp(wxCommandEvent& event)
 {

+#if wxUSE_HELP

       HelpInstance->LoadFile();
       HelpInstance->DisplayContents();
       HelpInstance->LoadFile();
       HelpInstance->DisplayContents();

+#endif // wxUSE_HELP

 }
 
 void MyFrame::OnAbout(wxCommandEvent& event)
 }
 
 void MyFrame::OnAbout(wxCommandEvent& event)


@@ -632,11 +852,13 @@ void ChooseInputFile(bool force)
       ClearKeyWordTable();
       ResetContentsLevels(0);
       passNumber = 1;
       ClearKeyWordTable();
       ResetContentsLevels(0);
       passNumber = 1;

-      char buf[300];
+      errorCount = 0;
+

       InputFile = copystring(s);
       wxString str = wxFileNameFromPath(InputFile);
       InputFile = copystring(s);
       wxString str = wxFileNameFromPath(InputFile);

-      sprintf(buf, "Tex2RTF [%s]", (const char*) str);
-      frame->SetTitle(buf);
+      wxString buf;
+      buf.Printf("Tex2RTF [%s]", str.c_str());
+      frame->SetTitle((char *)buf.c_str());

       OutputFile = NULL;
     }
   }
       OutputFile = NULL;
     }
   }


@@ -647,12 +869,12 @@ void ChooseOutputFile(bool force)
   char extensionBuf[10];
   char wildBuf[10];
   strcpy(wildBuf, "*.");
   char extensionBuf[10];
   char wildBuf[10];
   strcpy(wildBuf, "*.");

-  char *path = NULL;
+  wxString path;

   if (OutputFile)
     path = wxPathOnly(OutputFile);
   else if (InputFile)
     path = wxPathOnly(InputFile);
   if (OutputFile)
     path = wxPathOnly(OutputFile);
   else if (InputFile)
     path = wxPathOnly(InputFile);

-    
+

   switch (convertMode)
   {
     case TEX_RTF:
   switch (convertMode)
   {
     case TEX_RTF:


@@ -696,7 +918,7 @@ bool Go(void)
   ChooseOutputFile();
 #endif
 
   ChooseOutputFile();
 #endif
 

-  if (!InputFile || !OutputFile)
+  if (!InputFile || !OutputFile || stopRunning)

     return FALSE;
 
 #ifndef NO_GUI
     return FALSE;
 
 #ifndef NO_GUI


@@ -727,12 +949,12 @@ bool Go(void)
       if(strlen( sName) > 5)
         sName[5] = '\0';  // that should do!
   }
       if(strlen( sName) > 5)
         sName[5] = '\0';  // that should do!
   }

-  
+

   sprintf(ContentsName, "%s.con", FileRoot);
   sprintf(TmpContentsName, "%s.cn1", FileRoot);
   sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
   sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);
   sprintf(ContentsName, "%s.con", FileRoot);
   sprintf(TmpContentsName, "%s.cn1", FileRoot);
   sprintf(TmpFrameContentsName, "%s.frc", FileRoot);
   sprintf(WinHelpContentsFileName, "%s.cnt", FileRoot);

-  sprintf(RefName, "%s.ref", FileRoot);
+  sprintf(RefFileName, "%s.ref", FileRoot);

 
   TexPathList.EnsureFileAccessible(InputFile);
   if (!bulletFile)
 
   TexPathList.EnsureFileAccessible(InputFile);
   if (!bulletFile)


@@ -745,9 +967,9 @@ bool Go(void)
     }
   }
 
     }
   }
 

-  if (wxFileExists(RefName))
-    ReadTexReferences(RefName);
-    
+  if (wxFileExists(RefFileName))
+    ReadTexReferences(RefFileName);
+

   bool success = FALSE;
 
   if (InputFile && OutputFile)
   bool success = FALSE;
 
   if (InputFile && OutputFile)


@@ -761,15 +983,21 @@ bool Go(void)
 #ifndef NO_GUI
     if (isInteractive)
     {
 #ifndef NO_GUI
     if (isInteractive)
     {

-      char buf[50];
-      sprintf(buf, "Working, pass %d...", passNumber);
-      frame->SetStatusText(buf);
+      wxString buf;
+      buf.Printf("Working, pass %d...Click CLOSE to abort", passNumber);
+      frame->SetStatusText((char *)buf.c_str());

     }
 #endif
     OkToClose = FALSE;
     OnInform("Reading LaTeX file...");
     TexLoadFile(InputFile);
 
     }
 #endif
     OkToClose = FALSE;
     OnInform("Reading LaTeX file...");
     TexLoadFile(InputFile);
 

+    if (stopRunning)
+    {
+        OkToClose = TRUE;
+        return FALSE;
+    }
+

     switch (convertMode)
     {
       case TEX_RTF:
     switch (convertMode)
     {
       case TEX_RTF:


@@ -794,29 +1022,43 @@ bool Go(void)
     OnInform("*** Aborted by user.");
     success = FALSE;
     stopRunning = FALSE;
     OnInform("*** Aborted by user.");
     success = FALSE;
     stopRunning = FALSE;

+    OkToClose = TRUE;

   }
 
   if (success)
   {
   }
 
   if (success)
   {

-    WriteTexReferences(RefName);
+    WriteTexReferences(RefFileName);

     TexCleanUp();
     startedSections = FALSE;
 
     TexCleanUp();
     startedSections = FALSE;
 

-    char buf[100];
+    wxString buf;

 #ifndef NO_GUI
     long tim = wxGetElapsedTime();
 #ifndef NO_GUI
     long tim = wxGetElapsedTime();

-    sprintf(buf, "Finished in %ld seconds.", (long)(tim/1000.0));
-    OnInform(buf);
+    buf.Printf("Finished PASS #%d in %ld seconds.\n", passNumber, (long)(tim/1000.0));
+    OnInform((char *)buf.c_str());
+
+    if (errorCount)
+    {
+        buf.Printf("Errors encountered during this pass: %lu\n", errorCount);
+        OnInform((char *)buf.c_str());
+    }
+

     if (isInteractive)
     {
     if (isInteractive)
     {

-      sprintf(buf, "Done, %d %s.", passNumber, (passNumber > 1) ? "passes" : "pass");
-      frame->SetStatusText(buf);
+      buf.Printf("Done, %d %s.", passNumber, (passNumber > 1) ? "passes" : "pass");
+      frame->SetStatusText((char *)buf.c_str());

     }
 #else
     }
 #else

-    sprintf(buf, "Done, %d %s.", passNumber, (passNumber > 1) ? "passes" : "pass");
-    OnInform(buf);
+    buf.Printf("Done, %d %s.", passNumber, (passNumber > 1) ? "passes" : "pass");
+    OnInform((char *)buf.c_str());
+    if (errorCount)
+    {
+        buf.Printf("Errors encountered during this pass: %lu\n", errorCount);
+        OnInform((char *)buf.c_str());
+    }

 #endif
     passNumber ++;
 #endif
     passNumber ++;

+    errorCount = 0;

     OkToClose = TRUE;
     return TRUE;
   }
     OkToClose = TRUE;
     return TRUE;
   }


@@ -824,26 +1066,33 @@ bool Go(void)
   TexCleanUp();
   startedSections = FALSE;
 
   TexCleanUp();
   startedSections = FALSE;
 

+#ifndef NO_GUI
+  frame->SetStatusText("Aborted by user.");
+#endif // GUI
+

   OnInform("Sorry, unsuccessful.");
   OkToClose = TRUE;
   return FALSE;
 }
 
   OnInform("Sorry, unsuccessful.");
   OkToClose = TRUE;
   return FALSE;
 }
 

-void OnError(char *msg)
+void OnError(const char *msg)

 {
 {

+  errorCount++;
+

 #ifdef NO_GUI
 #ifdef NO_GUI

-  cerr << "Error: " << msg << "\n";
-  cerr.flush();
+  wxSTD cerr << "Error: " << msg << "\n";
+  wxSTD cerr.flush();

 #else
 #else

-  if (isInteractive)
+  if (isInteractive && frame)

     (*frame->textWindow) << "Error: " << msg << "\n";
   else
 #ifdef __UNIX__
   {
     (*frame->textWindow) << "Error: " << msg << "\n";
   else
 #ifdef __UNIX__
   {

-    cerr << "Error: " << msg << "\n";
-    cerr.flush();
+    wxSTD cerr << "Error: " << msg << "\n";
+    wxSTD cerr.flush();

   }
 #endif
   }
 #endif

+

 #ifdef __WXMSW__
     wxError(msg);
 #endif
 #ifdef __WXMSW__
     wxError(msg);
 #endif


@@ -851,24 +1100,30 @@ void OnError(char *msg)
 #endif // NO_GUI
 }
 
 #endif // NO_GUI
 }
 

-void OnInform(char *msg)
+void OnInform(const char *msg)

 {
 #ifdef NO_GUI
 {
 #ifdef NO_GUI

-  cout << msg << "\n";
-  cout.flush();
+  wxSTD cout << msg << "\n";
+  wxSTD cout.flush();

 #else
 #else

-  if (isInteractive)
+  if (isInteractive && frame)

     (*frame->textWindow) << msg << "\n";
     (*frame->textWindow) << msg << "\n";

+/* This whole block of code is just wrong I think.  It would behave
+   completely wrong under anything other than MSW due to the ELSE
+       with no statement, and the cout calls would fail under MSW, as
+       the code in this block is compiled if !NO_GUI This code has been 
+       here since v1.1 of this file too. - gt

   else
 #ifdef __WXMSW__
   {
   else
 #ifdef __WXMSW__
   {

-    cout << msg << "\n";
-    cout.flush();
+    wxSTD cout << msg << "\n";
+    wxSTD cout.flush();

   }
 #endif
 #ifdef __WXMSW__
     {}
 #endif
   }
 #endif
 #ifdef __WXMSW__
     {}
 #endif

+*/

   if (isInteractive)
   {
     Tex2RTFYield(TRUE);
   if (isInteractive)
   {
     Tex2RTFYield(TRUE);


@@ -936,7 +1191,7 @@ wxConnectionBase *Tex2RTFServer::OnAcceptConnection(const wxString& topic)
   {
     if (!ipc_buffer)
       ipc_buffer = new char[1000];
   {
     if (!ipc_buffer)
       ipc_buffer = new char[1000];

-      
+

     return new Tex2RTFConnection(ipc_buffer, 4000);
   }
   else
     return new Tex2RTFConnection(ipc_buffer, 4000);
   }
   else


@@ -946,7 +1201,7 @@ wxConnectionBase *Tex2RTFServer::OnAcceptConnection(const wxString& topic)
  /*
   * Connection
   */
  /*
   * Connection
   */

-  
+

 Tex2RTFConnection::Tex2RTFConnection(char *buf, int size):wxDDEConnection(buf, size)
 {
 }
 Tex2RTFConnection::Tex2RTFConnection(char *buf, int size):wxDDEConnection(buf, size)
 {
 }


@@ -1026,8 +1281,7 @@ bool Tex2RTFConnection::OnExecute(const wxString& topic, char *data, int size, i
     }
     else if (strcmp(firstArg, "EXIT") == 0)
     {
     }
     else if (strcmp(firstArg, "EXIT") == 0)
     {

-      if (frame && frame->OnClose())
-        delete frame;
+      if (frame) frame->Close();

     }
     else if (strcmp(firstArg, "MINIMIZE") == 0 || strcmp(firstArg, "ICONIZE") == 0)
     {
     }
     else if (strcmp(firstArg, "MINIMIZE") == 0 || strcmp(firstArg, "ICONIZE") == 0)
     {


@@ -1074,3 +1328,14 @@ char *Tex2RTFConnection::OnRequest(const wxString& topic, const wxString& item,
 
 #endif
 
 
 #endif
 

+#ifndef NO_GUI
+#ifndef __WXGTK__
+//void wxObject::Dump(wxSTD ostream& str)
+//{
+//  if (GetClassInfo() && GetClassInfo()->GetClassName())
+//    str << GetClassInfo()->GetClassName();
+//  else
+//    str << "unknown object class";
+//}
+#endif
+#endif