Unicode fixes. Avoid int 'ch' and '(wx)char ch' in the same scope.

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

diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp
index 70f3eec1c759f278d61015b36ade7138c43de02b..769638cf2ded5b48b0d93cfdc29be0982824ef40 100644 (file)
--- a/utils/tex2rtf/src/texutils.cpp
+++ b/utils/tex2rtf/src/texutils.cpp
@@ -88,20 +88,20 @@ void OutputChunkToString(TexChunk *chunk, wxChar *buf)
   FILE *tempfd = wxFopen(_T("tmp.tmp"), _T("w"));
   if (!tempfd)
     return;
   FILE *tempfd = wxFopen(_T("tmp.tmp"), _T("w"));
   if (!tempfd)
     return;

-    
+

   FILE *old1 = CurrentOutput1;
   FILE *old2 = CurrentOutput2;
   FILE *old1 = CurrentOutput1;
   FILE *old2 = CurrentOutput2;

-  
+

   CurrentOutput1 = tempfd;
   CurrentOutput2 = NULL;
   CurrentOutput1 = tempfd;
   CurrentOutput2 = NULL;

-  
+

   TraverseChildrenFromChunk(chunk);
   TraverseChildrenFromChunk(chunk);

-    
+

   CurrentOutput1 = old1;
   CurrentOutput2 = old2;
   CurrentOutput1 = old1;
   CurrentOutput2 = old2;

-  
+

   fclose(tempfd);
   fclose(tempfd);

-  
+

   // Read from file into string
   tempfd = wxFopen(_T("tmp.tmp"), _T("r"));
   if (!tempfd)
   // Read from file into string
   tempfd = wxFopen(_T("tmp.tmp"), _T("r"));
   if (!tempfd)


@@ -117,7 +117,7 @@ void OutputChunkToString(TexChunk *chunk, wxChar *buf)
       buf[i] = 0;
     else
     {
       buf[i] = 0;
     else
     {

-      buf[i] = ch;
+      buf[i] = (wxChar)ch;

       i ++;
     }
   }
       i ++;
     }
   }


@@ -177,7 +177,7 @@ wxChar *FindTopicName(TexChunk *chunk)
 {
   if (forceTopicName)
     return forceTopicName;
 {
   if (forceTopicName)
     return forceTopicName;

-    
+

   wxChar *topicName = NULL;
   static wxChar topicBuf[100];
 
   wxChar *topicName = NULL;
   static wxChar topicBuf[100];
 


@@ -216,7 +216,7 @@ wxChar *FindTopicName(TexChunk *chunk)
  * Snag is that some save a TexChunk, so don't use yet...
  *
  */
  * Snag is that some save a TexChunk, so don't use yet...
  *
  */

- 
+

 void StartSimulateArgument(wxChar *data)
 {
   wxStrcpy(currentArgData, data);
 void StartSimulateArgument(wxChar *data)
 {
   wxStrcpy(currentArgData, data);


@@ -243,13 +243,13 @@ int ParseUnitArgument(wxChar *unitArg)
     if (unitArg[i] == '\\')
       unitArg[i] = 0;
   len = wxStrlen(unitArg);
     if (unitArg[i] == '\\')
       unitArg[i] = 0;
   len = wxStrlen(unitArg);

-      
+

   if (unitArg && (len > 0) && (isdigit(unitArg[0]) || unitArg[0] == '-'))
   {
     wxSscanf(unitArg, _T("%f"), &unitValue);
     if (len > 1)
     {
   if (unitArg && (len > 0) && (isdigit(unitArg[0]) || unitArg[0] == '-'))
   {
     wxSscanf(unitArg, _T("%f"), &unitValue);
     if (len > 1)
     {

-      wxChar units[3]; 
+      wxChar units[3];

       units[0] = unitArg[len-2];
       units[1] = unitArg[len-1];
       units[2] = 0;
       units[0] = unitArg[len-2];
       units[1] = unitArg[len-1];
       units[2] = 0;


@@ -272,7 +272,7 @@ int ParseUnitArgument(wxChar *unitArg)
  * IF one exists. Inserts zero into buffer.
  *
  */
  * IF one exists. Inserts zero into buffer.
  *
  */

- 
+

 void StripExtension(wxChar *buffer)
 {
   int len = wxStrlen(buffer);
 void StripExtension(wxChar *buffer)
 {
   int len = wxStrlen(buffer);


@@ -339,18 +339,18 @@ void SetFontSizes(int pointSize)
   }
 }
 
   }
 }
 

- 
+

 /*
  * Latex references
  *
  */
 /*
  * Latex references
  *
  */

- 
+

 void AddTexRef(wxChar *name, wxChar *file, wxChar *sectionName,
                int chapter, int section, int subsection, int subsubsection)
 {
   TexRef *texRef = (TexRef *)TexReferences.Get(name);
   if (texRef) TexReferences.Delete(name);
 void AddTexRef(wxChar *name, wxChar *file, wxChar *sectionName,
                int chapter, int section, int subsection, int subsubsection)
 {
   TexRef *texRef = (TexRef *)TexReferences.Get(name);
   if (texRef) TexReferences.Delete(name);

-  
+

   wxChar buf[100];
   buf[0] = 0;
 /*
   wxChar buf[100];
   buf[0] = 0;
 /*


@@ -399,7 +399,7 @@ void WriteTexReferences(wxChar *filename)
   wxString name = filename;
   wxSTD ofstream ostr((char const *)name.fn_str());
   if (ostr.bad()) return;
   wxString name = filename;
   wxSTD ofstream ostr((char const *)name.fn_str());
   if (ostr.bad()) return;

-  
+

   TexReferences.BeginFind();
   wxHashTable::Node *node = TexReferences.Next();
   while (node)
   TexReferences.BeginFind();
   wxHashTable::Node *node = TexReferences.Next();
   while (node)


@@ -449,7 +449,7 @@ void ReadTexReferences(wxChar *filename)
     if (!istr.eof())
     {
       istr >> file;
     if (!istr.eof())
     {
       istr >> file;

-         istr >> sectionName;
+      istr >> sectionName;

       char ch;
       istr.get(ch); // Read past space
       istr.get(ch);
       char ch;
       istr.get(ch); // Read past space
       istr.get(ch);


@@ -467,17 +467,17 @@ void ReadTexReferences(wxChar *filename)
       wxString sectionName_string = wxString::FromAscii(sectionName);
       wxString section_string     = wxString::FromAscii(section);
 
       wxString sectionName_string = wxString::FromAscii(sectionName);
       wxString section_string     = wxString::FromAscii(section);
 

-      // gt - needed to trick the hash table "TexReferences" into deleting the key 
+      // gt - needed to trick the hash table "TexReferences" into deleting the key

       // strings it creates in the Put() function, but not the item that is
       // created here, as that is destroyed elsewhere.  Without doing this, there
       // were massive memory leaks
       TexReferences.DeleteContents(true);
       TexReferences.Put(
       // strings it creates in the Put() function, but not the item that is
       // created here, as that is destroyed elsewhere.  Without doing this, there
       // were massive memory leaks
       TexReferences.DeleteContents(true);
       TexReferences.Put(

-        label_string.c_str(), 
+        label_string.c_str(),

         new TexRef(
         new TexRef(

-              label_string.c_str(), 
-              file_string.c_str(), 
-              section_string.c_str(), 
+              label_string.c_str(),
+              file_string.c_str(),
+              section_string.c_str(),

               sectionName_string.c_str()
         )
       );
               sectionName_string.c_str()
         )
       );


@@ -494,26 +494,26 @@ void ReadTexReferences(wxChar *filename)
 
 void BibEatWhiteSpace(wxSTD istream& str)
 {
 
 void BibEatWhiteSpace(wxSTD istream& str)
 {

-  char ch = str.peek();
-  
-  while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == EOF))
+  char ch = (char)str.peek();
+
+  while (!str.eof() && (ch == ' ' || ch == '\t' || ch == 13 || ch == 10 || ch == (char)EOF))

   {
     if (ch == 10)
       BibLine ++;
     str.get(ch);
   {
     if (ch == 10)
       BibLine ++;
     str.get(ch);

-    if ((ch == EOF) || str.eof()) return;
-    ch = str.peek();
+    if ((ch == (char)EOF) || str.eof()) return;
+    ch = (char)str.peek();

   }
 
   // Ignore end-of-line comments
   if (ch == '%' || ch == ';' || ch == '#')
   {
     str.get(ch);
   }
 
   // Ignore end-of-line comments
   if (ch == '%' || ch == ';' || ch == '#')
   {
     str.get(ch);

-    ch = str.peek();
+    ch = (char)str.peek();

     while (ch != 10 && ch != 13 && !str.eof())
     {
       str.get(ch);
     while (ch != 10 && ch != 13 && !str.eof())
     {
       str.get(ch);

-      ch = str.peek();
+      ch = (char)str.peek();

     }
     BibEatWhiteSpace(str);
   }
     }
     BibEatWhiteSpace(str);
   }


@@ -524,14 +524,14 @@ void BibReadWord(wxSTD istream& istr, wxChar *buffer)
 {
   int i = 0;
   buffer[i] = 0;
 {
   int i = 0;
   buffer[i] = 0;

-  char ch = istr.peek();
+  char ch = (char)istr.peek();

   while (!istr.eof() && ch != ' ' && ch != '{' && ch != '(' && ch != 13 && ch != 10 && ch != '\t' &&
          ch != ',' && ch != '=')
   {
     istr.get(ch);
     buffer[i] = ch;
     i ++;
   while (!istr.eof() && ch != ' ' && ch != '{' && ch != '(' && ch != 13 && ch != 10 && ch != '\t' &&
          ch != ',' && ch != '=')
   {
     istr.get(ch);
     buffer[i] = ch;
     i ++;

-    ch = istr.peek();
+    ch = (char)istr.peek();

   }
   buffer[i] = 0;
 }
   }
   buffer[i] = 0;
 }


@@ -541,12 +541,12 @@ void BibReadToEOL(wxSTD istream& istr, wxChar *buffer)
 {
   int i = 0;
   buffer[i] = 0;
 {
   int i = 0;
   buffer[i] = 0;

-  char ch = istr.peek();
+  char ch = (char)istr.peek();

   bool inQuotes = false;
   if (ch == '"')
   {
     istr.get(ch);
   bool inQuotes = false;
   if (ch == '"')
   {
     istr.get(ch);

-    ch = istr.peek();
+    ch = (char)istr.peek();

     inQuotes = true;
   }
   // If in quotes, read white space too. If not,
     inQuotes = true;
   }
   // If in quotes, read white space too. If not,


@@ -558,7 +558,7 @@ void BibReadToEOL(wxSTD istream& istr, wxChar *buffer)
     istr.get(ch);
     buffer[i] = ch;
     i ++;
     istr.get(ch);
     buffer[i] = ch;
     i ++;

-    ch = istr.peek();
+    ch = (char)istr.peek();

   }
   if (ch == '"')
     istr.get(ch);
   }
   if (ch == '"')
     istr.get(ch);


@@ -572,7 +572,7 @@ void BibReadValue(wxSTD istream& istr, wxChar *buffer, bool ignoreBraces = true,
   int braceCount = 1;
   int i = 0;
   buffer[i] = 0;
   int braceCount = 1;
   int i = 0;
   buffer[i] = 0;

-  char ch = istr.peek();
+  char ch = (char)istr.peek();

   bool stopping = false;
   while (!istr.eof() && !stopping)
   {
   bool stopping = false;
   while (!istr.eof() && !stopping)
   {


@@ -585,7 +585,7 @@ void BibReadValue(wxSTD istream& istr, wxChar *buffer, bool ignoreBraces = true,
       return;
     }
     istr.get(ch);
       return;
     }
     istr.get(ch);

-    
+

     if (ch == '{')
       braceCount ++;
 
     if (ch == '{')
       braceCount ++;
 


@@ -617,7 +617,7 @@ void BibReadValue(wxSTD istream& istr, wxChar *buffer, bool ignoreBraces = true,
   buffer[i] = 0;
   wxUnusedVar(stopping);
 }
   buffer[i] = 0;
   wxUnusedVar(stopping);
 }

- 
+

 bool ReadBib(wxChar *filename)
 {
   if (!wxFileExists(filename))
 bool ReadBib(wxChar *filename)
 {
   if (!wxFileExists(filename))


@@ -1377,7 +1377,7 @@ bool ReadCustomMacros(wxChar *filename)
     istr.get(ch);
     if (istr.eof())
       break;
     istr.get(ch);
     if (istr.eof())
       break;

-      
+

     if (ch != '\\') // Not a macro definition, so must be NAME=VALUE
     {
       wxChar settingName[100];
     if (ch != '\\') // Not a macro definition, so must be NAME=VALUE
     {
       wxChar settingName[100];


@@ -1426,7 +1426,7 @@ bool ReadCustomMacros(wxChar *filename)
       BibReadValue(istr, macroBody, false, false); // Don't ignore extra braces
       if (wxStrlen(macroBody) > 0)
         macro->macroBody = copystring(macroBody);
       BibReadValue(istr, macroBody, false, false); // Don't ignore extra braces
       if (wxStrlen(macroBody) > 0)
         macro->macroBody = copystring(macroBody);

-    
+

       BibEatWhiteSpace(istr);
       CustomMacroList.Append(macroName, macro);
       AddMacroDef(ltCUSTOM_MACRO, macroName, noArgs);
       BibEatWhiteSpace(istr);
       CustomMacroList.Append(macroName, macro);
       AddMacroDef(ltCUSTOM_MACRO, macroName, noArgs);


@@ -1437,7 +1437,7 @@ bool ReadCustomMacros(wxChar *filename)
   OnInform(mbuf);
   return true;
 }
   OnInform(mbuf);
   return true;
 }

- 
+

 CustomMacro *FindCustomMacro(wxChar *name)
 {
   wxNode *node = CustomMacroList.Find(name);
 CustomMacro *FindCustomMacro(wxChar *name)
 {
   wxNode *node = CustomMacroList.Find(name);


@@ -1458,7 +1458,7 @@ void ShowCustomMacros(void)
     OnInform(_T("No custom macros loaded.\n"));
     return;
   }
     OnInform(_T("No custom macros loaded.\n"));
     return;
   }

-  
+

   wxChar buf[400];
   while (node)
   {
   wxChar buf[400];
   while (node)
   {


@@ -1506,7 +1506,7 @@ wxChar *ParseMultifieldString(wxChar *allFields, int *pos)
   buffer[i] = 0;
   if (oldPos == (*pos))
     *pos = len + 1;
   buffer[i] = 0;
   if (oldPos == (*pos))
     *pos = len + 1;

-    
+

   if (i == 0)
     return NULL;
   else
   if (i == 0)
     return NULL;
   else


@@ -1517,7 +1517,7 @@ wxChar *ParseMultifieldString(wxChar *allFields, int *pos)
  * Colour tables
  *
  */
  * Colour tables
  *
  */

- 
+

 ColourTableEntry::ColourTableEntry(const wxChar *theName, unsigned int r,  unsigned int g,  unsigned int b)
 {
   name = copystring(theName);
 ColourTableEntry::ColourTableEntry(const wxChar *theName, unsigned int r,  unsigned int g,  unsigned int b)
 {
   name = copystring(theName);


@@ -1575,7 +1575,7 @@ bool FindColourHTMLString(wxChar *theName, wxChar *buf)
     if (wxStrcmp(theName, entry->name) == 0)
     {
         wxStrcpy(buf, _T("#"));
     if (wxStrcmp(theName, entry->name) == 0)
     {
         wxStrcpy(buf, _T("#"));

-        
+

         wxChar buf2[3];
         DecToHex(entry->red, buf2);
         wxStrcat(buf, buf2);
         wxChar buf2[3];
         DecToHex(entry->red, buf2);
         wxStrcat(buf, buf2);


@@ -1591,7 +1591,7 @@ bool FindColourHTMLString(wxChar *theName, wxChar *buf)
   return false;
 }
 
   return false;
 }
 

-  
+

 void InitialiseColourTable(void)
 {
   // \\red0\\green0\\blue0;
 void InitialiseColourTable(void)
 {
   // \\red0\\green0\\blue0;


@@ -1602,16 +1602,16 @@ void InitialiseColourTable(void)
 
   // \\red0\\green255\\blue0;
   AddColour(_T("green"), 0,255,0);
 
   // \\red0\\green255\\blue0;
   AddColour(_T("green"), 0,255,0);

-  
+

   // \\red255\\green0\\blue255;
   AddColour(_T("magenta"), 255,0,255);
 
   // \\red255\\green0\\blue0;
   AddColour(_T("red"), 255,0,0);
   // \\red255\\green0\\blue255;
   AddColour(_T("magenta"), 255,0,255);
 
   // \\red255\\green0\\blue0;
   AddColour(_T("red"), 255,0,0);

-  
+

   // \\red255\\green255\\blue0;
   AddColour(_T("yellow"), 255,255,0);
   // \\red255\\green255\\blue0;
   AddColour(_T("yellow"), 255,255,0);

-  
+

   // \\red255\\green255\\blue255;}");
   AddColour(_T("white"), 255,255,255);
 }
   // \\red255\\green255\\blue255;}");
   AddColour(_T("white"), 255,255,255);
 }


@@ -1625,17 +1625,17 @@ void Tex2RTFYield(bool force)
 {
 #ifdef __WXMSW__
     static int yieldCount = 0;
 {
 #ifdef __WXMSW__
     static int yieldCount = 0;

-    
+

     if (isSync)
     if (isSync)

-       return;
-    
+        return;
+

     if (force)
     if (force)

-       yieldCount = 0;
+    yieldCount = 0;

     if (yieldCount == 0)
     {
     if (yieldCount == 0)
     {

-       if (wxTheApp)
-           wxYield();
-       yieldCount = 10;
+        if (wxTheApp)
+            wxYield();
+        yieldCount = 10;

     }
     yieldCount --;
 #endif
     }
     yieldCount --;
 #endif


@@ -1655,7 +1655,7 @@ void AddKeyWordForTopic(wxChar *topic, wxChar *entry, wxChar *filename)
     texTopic->keywords = new wxStringList;
     TopicTable.Put(topic, texTopic);
   }
     texTopic->keywords = new wxStringList;
     TopicTable.Put(topic, texTopic);
   }

-  
+

   if (!texTopic->keywords->Member(entry))
     texTopic->keywords->Add(entry);
 }
   if (!texTopic->keywords->Member(entry))
     texTopic->keywords->Add(entry);
 }


@@ -1677,7 +1677,7 @@ void ClearKeyWordTable(void)
 /*
  * TexTopic structure
  */
 /*
  * TexTopic structure
  */

- 
+

 TexTopic::TexTopic(wxChar *f)
 {
   if (f)
 TexTopic::TexTopic(wxChar *f)
 {
   if (f)


@@ -1704,17 +1704,17 @@ wxChar *ConvertCase(wxChar *s)
   int i;
   if (upperCaseNames)
     for (i = 0; i < len; i ++)
   int i;
   if (upperCaseNames)
     for (i = 0; i < len; i ++)

-      buf[i] = wxToupper(s[i]);
+      buf[i] = (wxChar)wxToupper(s[i]);

   else
     for (i = 0; i < len; i ++)
   else
     for (i = 0; i < len; i ++)

-      buf[i] = wxTolower(s[i]);
+      buf[i] = (wxChar)wxTolower(s[i]);

   buf[i] = 0;
   buf[i] = 0;

-  return buf;  
+  return buf;

 }
 
 #if !WXWIN_COMPATIBILITY_2
 }
 
 #if !WXWIN_COMPATIBILITY_2

-// if substring is TRUE, search for str1 in str2
-bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString, 
+// if substring is true, search for str1 in str2
+bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,

                  bool exact)
 {
    if (subString)
                  bool exact)
 {
    if (subString)


@@ -1729,7 +1729,7 @@ bool StringMatch(const wxChar *str1, const wxChar *str2, bool subString,
       return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND;
    }
    else
       return Sstr2.Index(Sstr1) != (size_t)wxNOT_FOUND;
    }
    else

-      return exact ? wxString(str2).Cmp(str1) == 0 : 
+      return exact ? wxString(str2).Cmp(str1) == 0 :

                      wxString(str2).CmpNoCase(str1) == 0;
 }
 #endif
                      wxString(str2).CmpNoCase(str1) == 0;
 }
 #endif