Bitmap updates

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

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index 7e8062f12a94b9ba0944ba473f0fa8bbc86b58e6..51fdab5dbd83f42ad87f553f6593413429ed52bd 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -144,6 +144,8 @@ char            *linkColourString = NULL;
 char            *followedLinkColourString = NULL;
 bool            combineSubSections = FALSE;
 bool            htmlWorkshopFiles = FALSE;
 char            *followedLinkColourString = NULL;
 bool            combineSubSections = FALSE;
 bool            htmlWorkshopFiles = FALSE;

+bool            ignoreBadRefs = FALSE;
+char                   *htmlFaceName = copystring("Times New Roman");

 
 extern int passNumber;
 
 
 extern int passNumber;
 


@@ -218,7 +220,8 @@ TexMacroDef *VerbatimMacroDef = NULL;
 #define IncrementLineNumber() LineNumbers[CurrentInputIndex] ++
 
 
 #define IncrementLineNumber() LineNumbers[CurrentInputIndex] ++
 
 

-TexRef::TexRef(char *label, char *file, char *section, char *sectionN)
+TexRef::TexRef(const char *label, const char *file,
+              const char *section, const char *sectionN)

 {
     refLabel = copystring(label);
     refFile = file ? copystring(file) : (char*) NULL;
 {
     refLabel = copystring(label);
     refFile = file ? copystring(file) : (char*) NULL;


@@ -243,7 +246,7 @@ CustomMacro::~CustomMacro()
         delete [] macroBody;
 }
 
         delete [] macroBody;
 }
 

-void TexOutput(char *s, bool ordinaryText)
+void TexOutput(const char *s, bool ordinaryText)

 {
   int len = strlen(s);
 
 {
   int len = strlen(s);
 


@@ -581,31 +584,34 @@ bool read_a_line(char *buf)
                 break;
             }
 
                 break;
             }
 

-            if (readInVerbatim)
+            if (checkSyntax)

             {
             {

-                // There should NOT be a '\' before the '_'
-                if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%'))
+                if (readInVerbatim)

                 {
                 {

-                   wxString errBuf;
-                   errBuf.Printf("An underscore ('_') was detected at line %lu inside file %s that should NOT have a '\\' before it.",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
-                   OnError((char *)errBuf.c_str());
+                    // There should NOT be a '\' before the '_'
+                    if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%'))
+                    {
+                        wxString errBuf;
+                        errBuf.Printf("An underscore ('_') was detected at line %lu inside file %s that should NOT have a '\\' before it.",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
+                        OnError((char *)errBuf.c_str());
+                    }

                 }
                 }

-            }
-            else
-            {
-                // There should be a '\' before the '_'
-                if (bufIndex == 0)
+                else

                 {
                 {

-                   wxString errBuf;
-                   errBuf.Printf("An underscore ('_') was detected at line %lu inside file %s that may need a '\\' before it.",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
-                   OnError((char *)errBuf.c_str());
-                }
-                else if ((buf[bufIndex-1] != '\\') && (buf[0] != '%') &&  // If it is a comment line, then no warnings
-                         (strncmp(buf, "\\input", 6))) // do not report filenames that have underscores in them
-                {
-                   wxString errBuf;
-                   errBuf.Printf("An underscore ('_') was detected at line %lu inside file %s that may need a '\\' before it.",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
-                   OnError((char *)errBuf.c_str());
+                    // There should be a '\' before the '_'
+                    if (bufIndex == 0)
+                    {
+                        wxString errBuf;
+                        errBuf.Printf("An underscore ('_') was detected at line %lu inside file %s that may need a '\\' before it.",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
+                        OnError((char *)errBuf.c_str());
+                    }
+                    else if ((buf[bufIndex-1] != '\\') && (buf[0] != '%') &&  // If it is a comment line, then no warnings
+                        (strncmp(buf, "\\input", 6))) // do not report filenames that have underscores in them
+                    {
+                        wxString errBuf;
+                        errBuf.Printf("An underscore ('_') was detected at line %lu inside file %s that may need a '\\' before it.",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
+                        OnError((char *)errBuf.c_str());
+                    }

                 }
             }
             buf[bufIndex++] = ch;
                 }
             }
             buf[bufIndex++] = ch;


@@ -1139,7 +1145,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
           pos ++;
           int noBraces = 1;
 
           pos ++;
           int noBraces = 1;
 

-          wxBuffer[0] = 0;
+          wxTex2RTFBuffer[0] = 0;

           int i = 0;
           bool end = FALSE;
           while (!end)
           int i = 0;
           bool end = FALSE;
           while (!end)


@@ -1150,37 +1156,37 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
               noBraces --;
               if (noBraces == 0)
               {
               noBraces --;
               if (noBraces == 0)
               {

-                wxBuffer[i] = 0;
+                wxTex2RTFBuffer[i] = 0;

                 end = TRUE;
               }
               else
               {
                 end = TRUE;
               }
               else
               {

-                wxBuffer[i] = '}';
+                wxTex2RTFBuffer[i] = '}';

                 i ++;
               }
               pos ++;
             }
             else if (ch == '{')
             {
                 i ++;
               }
               pos ++;
             }
             else if (ch == '{')
             {

-              wxBuffer[i] = '{';
+              wxTex2RTFBuffer[i] = '{';

               i ++;
               pos ++;
             }
             else if (ch == '\\' && buffer[pos+1] == '}')
             {
               i ++;
               pos ++;
             }
             else if (ch == '\\' && buffer[pos+1] == '}')
             {

-              wxBuffer[i] = '}';
+              wxTex2RTFBuffer[i] = '}';

               pos += 2;
               i++;
             }
             else if (ch == '\\' && buffer[pos+1] == '{')
             {
               pos += 2;
               i++;
             }
             else if (ch == '\\' && buffer[pos+1] == '{')
             {

-              wxBuffer[i] = '{';
+              wxTex2RTFBuffer[i] = '{';

               pos += 2;
               i++;
             }
             else
             {
               pos += 2;
               i++;
             }
             else
             {

-              wxBuffer[i] = ch;
+              wxTex2RTFBuffer[i] = ch;

               pos ++;
               i ++;
               if (ch == 0)
               pos ++;
               i ++;
               if (ch == 0)


@@ -1201,7 +1207,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
           TexChunk *argValue = new TexChunk(CHUNK_TYPE_STRING);
           arg->children.Append((wxObject *)argValue);
           argValue->argn = 1;
           TexChunk *argValue = new TexChunk(CHUNK_TYPE_STRING);
           arg->children.Append((wxObject *)argValue);
           argValue->argn = 1;

-          argValue->value = copystring(wxBuffer);
+          argValue->value = copystring(wxTex2RTFBuffer);

 
           children.Append((wxObject *)chunk);
         }
 
           children.Append((wxObject *)chunk);
         }


@@ -1548,7 +1554,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e
  *
  */
  
  *
  */
  

-int ParseMacroBody(char *macro_name, TexChunk *parent,
+int ParseMacroBody(const char *macro_name, TexChunk *parent,

                    int no_args, char *buffer, int pos,
                    char *environment, bool parseToBrace,
                    TexChunk *customMacroArgs)
                    int no_args, char *buffer, int pos,
                    char *environment, bool parseToBrace,
                    TexChunk *customMacroArgs)


@@ -1683,7 +1689,7 @@ bool TexLoadFile(char *filename)
   return FALSE;
 }
 
   return FALSE;
 }
 

-TexMacroDef::TexMacroDef(int the_id, char *the_name, int n, bool ig, bool forbidLevel)
+TexMacroDef::TexMacroDef(int the_id, const char *the_name, int n, bool ig, bool forbidLevel)

 {
   name = copystring(the_name);
   no_args = n;
 {
   name = copystring(the_name);
   no_args = n;


@@ -1958,7 +1964,7 @@ void SetCurrentOutputs(FILE *fd1, FILE *fd2)
   CurrentOutput2 = fd2;
 }
 
   CurrentOutput2 = fd2;
 }
 

-void AddMacroDef(int the_id, char *name, int n, bool ignore, bool forbid)
+void AddMacroDef(int the_id, const char *name, int n, bool ignore, bool forbid)

 {
   MacroDefs.Put(name, new TexMacroDef(the_id, name, n, ignore, forbid));
 }
 {
   MacroDefs.Put(name, new TexMacroDef(the_id, name, n, ignore, forbid));
 }