Set CHRBITS to the "correct" amount.

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

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index e4e08c30bbefe225afceff8783fbed389dbd835a..676d2f561395bf5f6a58ed0ef6f424a3bc902b33 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -21,7 +21,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx/wx.h"
 #endif
 
 #include "tex2any.h"
@@ -37,6 +36,11 @@
 #include "bmputils.h"
 #include "table.h"
 
+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+#endif
+
 wxList itemizeStack;
 static int indentLevel = 0;
 static int forbidParindent = 0; // if > 0, no parindent (e.g. in center environment)
@@ -243,7 +247,6 @@ void WriteWinHelpContentsFileLine(char *topicName, char *xitle, int level)
                  char ch1=xitle[s+1]&0xff;
                  char ch2=xitle[s+2]&0xff;
                  char ch3=xitle[s+3]&0xff;
-                 char ch4=xitle[s+4]&0xff;
                  s+=4; // next character                 
                  char a=0;
                  if ((ch1==0x27)&&(ch2==0x66)&&(ch3==0x36)) { title[d++]='ö';  a=1; }
@@ -344,10 +347,10 @@ void GenerateKeywordsForTopic(char *topic)
   wxStringList *list = texTopic->keywords;
   if (list)
   {
-    wxNode *node = list->First();
+    wxStringListNode *node = list->GetFirst();
     while (node)
     {
-      char *s = (char *)node->Data();
+      char *s = (char *)node->GetData();
 
       // Must separate out main entry form subentry (only 1 subentry allowed)
       char buf1[100]; char buf2[100];
@@ -373,7 +376,7 @@ void GenerateKeywordsForTopic(char *topic)
         TexOutput(buf2);
       }
       TexOutput("}\n");
-      node = node->Next();
+      node = node->GetNext();
     }
   }
 }
@@ -409,12 +412,12 @@ void GenerateIndexEntry(char *entry)
 void WriteColourTable(FILE *fd)
 {
   fprintf(fd, "{\\colortbl");
-  wxNode *node = ColourTable.First();
+  wxNode *node = ColourTable.GetFirst();
   while (node)
   {
-    ColourTableEntry *entry = (ColourTableEntry *)node->Data();
+    ColourTableEntry *entry = (ColourTableEntry *)node->GetData();
     fprintf(fd, "\\red%d\\green%d\\blue%d;\n", entry->red, entry->green, entry->blue);
-    node = node->Next();
+    node = node->GetNext();
   }
   fprintf(fd, "}");
 }
@@ -714,12 +717,12 @@ void Text2RTF(TexChunk *chunk)
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB))
         inVerbatim = TRUE;
 
-      wxNode *node = chunk->children.First();
+      wxNode *node = chunk->children.GetFirst();
       while (node)
       {
-        TexChunk *child_chunk = (TexChunk *)node->Data();
+        TexChunk *child_chunk = (TexChunk *)node->GetData();
         Text2RTF(child_chunk);
-        node = node->Next();
+        node = node->GetNext();
       }
 
       if (def && (def->macroId == ltVERBATIM || def->macroId == ltVERB))
@@ -729,12 +732,12 @@ void Text2RTF(TexChunk *chunk)
     }
     case CHUNK_TYPE_ARG:
     {
-      wxNode *node = chunk->children.First();
+      wxNode *node = chunk->children.GetFirst();
       while (node)
       {
-        TexChunk *child_chunk = (TexChunk *)node->Data();
+        TexChunk *child_chunk = (TexChunk *)node->GetData();
         Text2RTF(child_chunk);
-        node = node->Next();
+        node = node->GetNext();
       }
 
       break;
@@ -781,10 +784,10 @@ void PushEnvironmentStyle(char *style)
 
 void PopEnvironmentStyle(void)
 {
-  wxNode *node = environmentStack.Last();
+  wxStringListNode *node = environmentStack.GetLast();
   if (node)
   {
-    char *val = (char *)node->Data();
+    char *val = (char *)node->GetData();
     delete[] val;
     delete node;
   }
@@ -793,12 +796,12 @@ void PopEnvironmentStyle(void)
 // Write out the styles, most recent first.
 void WriteEnvironmentStyles(void)
 {
-  wxNode *node = environmentStack.Last();
+  wxStringListNode *node = environmentStack.GetLast();
   while (node)
   {
-    char *val = (char *)node->Data();
+    char *val = (char *)node->GetData();
     TexOutput(val);
-    node = node->Next();
+    node = node->GetNext();
   }
   if (!inTabular && (ParIndent > 0) && (forbidParindent == 0))
   {
@@ -806,7 +809,7 @@ void WriteEnvironmentStyles(void)
     sprintf(buf, "\\fi%d", ParIndent*20); // Convert points to TWIPS
     TexOutput(buf);
   }
-  if (environmentStack.Number() > 0 || (ParIndent > 0))
+  if (environmentStack.GetCount() > 0 || (ParIndent > 0))
     TexOutput("\n");
 }
 
@@ -2025,9 +2028,9 @@ void RTFOnMacro(int macroId, int no_args, bool start)
         listType = LATEX_DESCRIPTION;
 
       int oldIndent = 0;
-      wxNode *node = itemizeStack.First();
+      wxNode *node = itemizeStack.GetFirst();
       if (node)
-        oldIndent = ((ItemizeStruc *)node->Data())->indentation;
+        oldIndent = ((ItemizeStruc *)node->GetData())->indentation;
 
       int indentSize1 = oldIndent + 20*labelIndentTab;
       int indentSize2 = oldIndent + 20*itemIndentTab;
@@ -2044,11 +2047,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       indentLevel --;
       PopEnvironmentStyle();
 
-      if (itemizeStack.First())
+      if (itemizeStack.GetFirst())
       {
-        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.First()->Data();
+        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.GetFirst()->GetData();
         delete struc;
-        delete itemizeStack.First();
+        delete itemizeStack.GetFirst();
       }
 /* Change 18/7/97 - don't know why we wish to do this
       if (itemizeStack.Number() == 0)
@@ -2067,9 +2070,9 @@ void RTFOnMacro(int macroId, int no_args, bool start)
     {
       indentLevel ++;
       int oldIndent = 0;
-      wxNode *node = itemizeStack.First();
+      wxNode *node = itemizeStack.GetFirst();
       if (node)
-        oldIndent = ((ItemizeStruc *)node->Data())->indentation;
+        oldIndent = ((ItemizeStruc *)node->GetData())->indentation;
 
       int indentSize = oldIndent + TwoColWidthA;
 
@@ -2084,11 +2087,11 @@ void RTFOnMacro(int macroId, int no_args, bool start)
     {
       indentLevel --;
       PopEnvironmentStyle();
-      if (itemizeStack.First())
+      if (itemizeStack.GetFirst())
       {
-        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.First()->Data();
+        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.GetFirst()->GetData();
         delete struc;
-        delete itemizeStack.First();
+        delete itemizeStack.GetFirst();
       }
 /*
       // JACS June 1997
@@ -2096,7 +2099,7 @@ void RTFOnMacro(int macroId, int no_args, bool start)
       WriteEnvironmentStyles();
 */
 /* why do we need this? */
-      if (itemizeStack.Number() == 0)
+      if (itemizeStack.GetCount() == 0)
       {
         issuedNewParagraph = 0;
         OnMacro(ltPAR, 0, TRUE);
@@ -2107,10 +2110,10 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   }
   case ltITEM:
   {
-    wxNode *node = itemizeStack.First();
+    wxNode *node = itemizeStack.GetFirst();
     if (node)
     {
-      ItemizeStruc *struc = (ItemizeStruc *)node->Data();
+      ItemizeStruc *struc = (ItemizeStruc *)node->GetData();
       if (!start)
       {
         struc->currentItem += 1;
@@ -2197,20 +2200,20 @@ void RTFOnMacro(int macroId, int no_args, bool start)
   case ltTWOCOLITEM:
   case ltTWOCOLITEMRULED:
   {
-    wxNode *node = itemizeStack.First();
+    wxNode *node = itemizeStack.GetFirst();
     if (node)
     {
-      ItemizeStruc *struc = (ItemizeStruc *)node->Data();
+      ItemizeStruc *struc = (ItemizeStruc *)node->GetData();
       if (start)
       {
         struc->currentItem += 1;
 
         int oldIndent = 0;
         wxNode *node2 = NULL;
-        if (itemizeStack.Number() > 1) // TODO: do I actually mean Nth(0) here??
-            node2 = itemizeStack.Nth(1);
+        if (itemizeStack.GetCount() > 1) // TODO: do I actually mean Nth(0) here??
+            node2 = itemizeStack.Item(1);
         if (node2)
-          oldIndent = ((ItemizeStruc *)node2->Data())->indentation;
+          oldIndent = ((ItemizeStruc *)node2->GetData())->indentation;
 
         TexOutput("\n");
         if (struc->currentItem > 1)
@@ -3366,7 +3369,6 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
                 {
                   if (useWord)
                   {
-                      char *s = GetArgData();
                       TexOutput("p. ");
                       TexOutput("{\\field{\\*\\fldinst  PAGEREF ");
                       TexOutput(refName);
@@ -3618,7 +3620,7 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
               }
               else
               {
-                sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", f);
+                sprintf(buf, "Could not read metafile %s. Perhaps it's not a placeable metafile?", (const char*)f);
                 OnError(buf);
               }
               fclose(fd);
@@ -4685,9 +4687,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
 //      indentLevel ++;
 //      TexOutput("\\fi0\n");
       int oldIndent = 0;
-      wxNode *node = itemizeStack.First();
+      wxNode *node = itemizeStack.GetFirst();
       if (node)
-        oldIndent = ((ItemizeStruc *)node->Data())->indentation;
+        oldIndent = ((ItemizeStruc *)node->GetData())->indentation;
 
       int indentValue = 20*ParseUnitArgument(GetArgData());
       int indentSize = indentValue + oldIndent;
@@ -4703,13 +4705,13 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     if (!start && (arg_no == 2))
     {
       PopEnvironmentStyle();
-      if (itemizeStack.First())
+      if (itemizeStack.GetFirst())
       {
-        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.First()->Data();
+        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.GetFirst()->GetData();
         delete struc;
-        delete itemizeStack.First();
+        delete itemizeStack.GetFirst();
       }
-      if (itemizeStack.Number() == 0)
+      if (itemizeStack.GetCount() == 0)
       {
         TexOutput("\\par\\pard\n");
         issuedNewParagraph = 1;
@@ -4726,9 +4728,9 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     if (start && (arg_no == 1))
     {
       int oldIndent = 0;
-      wxNode *node = itemizeStack.First();
+      wxNode *node = itemizeStack.GetFirst();
       if (node)
-        oldIndent = ((ItemizeStruc *)node->Data())->indentation;
+        oldIndent = ((ItemizeStruc *)node->GetData())->indentation;
 
       int boxWidth = 20*ParseUnitArgument(GetArgData());
 
@@ -4748,11 +4750,11 @@ bool RTFOnArgument(int macroId, int arg_no, bool start)
     if (!start && (arg_no == 2))
     {
       PopEnvironmentStyle();
-      if (itemizeStack.First())
+      if (itemizeStack.GetFirst())
       {
-        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.First()->Data();
+        ItemizeStruc *struc = (ItemizeStruc *)itemizeStack.GetFirst()->GetData();
         delete struc;
-        delete itemizeStack.First();
+        delete itemizeStack.GetFirst();
       }
       if (itemizeStack.Number() == 0)
       {