added newline conversion

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

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index 51fdab5dbd83f42ad87f553f6593413429ed52bd..2e5df17be9c157c8707aacd1e1d18409de66b986 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -21,7 +21,6 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"

 #endif
 
 #include <ctype.h>
 #endif
 
 #include <ctype.h>


@@ -29,6 +28,11 @@
 #include <stdlib.h>
 #include <time.h>
 
 #include <stdlib.h>
 #include <time.h>
 

+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+#endif
+

 /*
  * Variables accessible from clients
  *
 /*
  * Variables accessible from clients
  *


@@ -129,6 +133,7 @@ int             winHelpVersion = 3; // WinHelp Version (3 for Windows 3.1, 4 for
 bool            winHelpContents = FALSE; // Generate .cnt file for WinHelp 4
 bool            htmlIndex = FALSE; // Generate .htx file for HTML
 bool            htmlFrameContents = FALSE; // Use frames for HTML contents page
 bool            winHelpContents = FALSE; // Generate .cnt file for WinHelp 4
 bool            htmlIndex = FALSE; // Generate .htx file for HTML
 bool            htmlFrameContents = FALSE; // Use frames for HTML contents page

+char           *htmlStylesheet = NULL; // Use this CSS stylesheet for HTML pages

 bool            useHeadingStyles = TRUE; // Insert \s1, s2 etc.
 bool            useWord = TRUE; // Insert proper Word table of contents, etc etc
 int             contentsDepth = 4; // Depth of Word table of contents
 bool            useHeadingStyles = TRUE; // Insert \s1, s2 etc.
 bool            useWord = TRUE; // Insert proper Word table of contents, etc etc
 int             contentsDepth = 4; // Depth of Word table of contents


@@ -145,7 +150,7 @@ char            *followedLinkColourString = NULL;
 bool            combineSubSections = FALSE;
 bool            htmlWorkshopFiles = FALSE;
 bool            ignoreBadRefs = FALSE;
 bool            combineSubSections = FALSE;
 bool            htmlWorkshopFiles = FALSE;
 bool            ignoreBadRefs = FALSE;

-char                   *htmlFaceName = copystring("Times New Roman");
+char                   *htmlFaceName = NULL;

 
 extern int passNumber;
 
 
 extern int passNumber;
 


@@ -191,7 +196,7 @@ int             tableNo = 0;
 FILE *CurrentOutput1 = NULL;
 FILE *CurrentOutput2 = NULL;
 FILE *Inputs[15];
 FILE *CurrentOutput1 = NULL;
 FILE *CurrentOutput2 = NULL;
 FILE *Inputs[15];

-int LineNumbers[15];
+unsigned long LineNumbers[15];

 char *FileNames[15];
 int CurrentInputIndex = 0;
 
 char *FileNames[15];
 int CurrentInputIndex = 0;
 


@@ -435,7 +440,7 @@ bool read_a_line(char *buf)
   }
 
   int ch = -2;
   }
 
   int ch = -2;

-  int bufIndex = 0;
+  unsigned long bufIndex = 0;

   buf[0] = 0;
 
   while (ch != EOF && ch != 10)
   buf[0] = 0;
 
   while (ch != EOF && ch != 10)


@@ -444,7 +449,7 @@ bool read_a_line(char *buf)
     {
        wxString errBuf;
        errBuf.Printf("Line %lu of file %s is too long.  Lines can be no longer than %lu characters.  Truncated.",
     {
        wxString errBuf;
        errBuf.Printf("Line %lu of file %s is too long.  Lines can be no longer than %lu characters.  Truncated.",

-           LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str(),MAX_LINE_BUFFER_SIZE);
+           LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str(), MAX_LINE_BUFFER_SIZE);

        OnError((char *)errBuf.c_str());
        return FALSE;
     }
        OnError((char *)errBuf.c_str());
        return FALSE;
     }


@@ -465,7 +470,7 @@ bool read_a_line(char *buf)
            if (rightCurley > leftCurley)
            {
                wxString errBuf;
            if (rightCurley > leftCurley)
            {
                wxString errBuf;

-               errBuf.Printf("An extra right Curley brace ('}') was detected at line %lu inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
+               errBuf.Printf("An extra right Curley brace ('}') was detected at line %lu inside file %s", LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());

                OnError((char *)errBuf.c_str());
 
                // Reduce the count of right Curley braces, so the mismatched count
                OnError((char *)errBuf.c_str());
 
                // Reduce the count of right Curley braces, so the mismatched count


@@ -749,7 +754,7 @@ bool read_a_line(char *buf)
     fileNameStr.Replace("\\", "");
 
     // Ignore some types of input files (e.g. macro definition files)
     fileNameStr.Replace("\\", "");
 
     // Ignore some types of input files (e.g. macro definition files)

-    char *fileOnly = FileNameFromPath((char*) (const char*) fileNameStr);
+    char *fileOnly = wxFileNameFromPath((char*) (const char*) fileNameStr);

     currentFileName = fileOnly;
     if (IgnorableInputFiles.Member(fileOnly))
       return read_a_line(buf);
     currentFileName = fileOnly;
     if (IgnorableInputFiles.Member(fileOnly))
       return read_a_line(buf);