Removed check for '\par' at beginning of line that I mistakenly added before

Standardized the way I spelled 'curley' everywhere

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/tex2rtf/src/rtfutils.cpp b/utils/tex2rtf/src/rtfutils.cpp
index 60e31552e8fea333662c151cacc3cd8aed13c149..c3a3968f1b9eeb897b550122e9595f2856ab59b6 100644 (file)
--- a/utils/tex2rtf/src/rtfutils.cpp
+++ b/utils/tex2rtf/src/rtfutils.cpp
@@ -667,7 +667,7 @@ void ProcessText2RTF(TexChunk *chunk)
       i += 1;
       changed = TRUE;
     }
       i += 1;
       changed = TRUE;
     }

-    else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curly bracket
+    else if (inVerbatim && (ch == '{' || ch == '}')) // Escape the curley bracket

     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;
     {
       BigBuffer[ptr] = '\\'; ptr ++;
       BigBuffer[ptr] = ch; ptr ++;

diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp
index 5821833d51454c9ae4465537b21099f621f1ea2e..d689c9e17e877acd430403050b1cc8bd0749ed25 100644 (file)
--- a/utils/tex2rtf/src/tex2any.cpp
+++ b/utils/tex2rtf/src/tex2any.cpp
@@ -84,7 +84,7 @@ wxString syntaxTokens[] =
   "\\begin{comment}",
   "\\end{comment}",
   "\\verbatiminput",
   "\\begin{comment}",
   "\\end{comment}",
   "\\verbatiminput",

-  "\\par",
+//  "\\par",

   "\\input",
   "\\helpinput",
   "\\include",
   "\\input",
   "\\helpinput",
   "\\include",


@@ -419,8 +419,8 @@ bool readInVerbatim = FALSE;  // Within a verbatim, but not nec. verbatiminput
 // detection of \verb yet.
 // #define CHECK_BRACES 1
 
 // detection of \verb yet.
 // #define CHECK_BRACES 1
 

-unsigned long leftCurly = 0;
-unsigned long rightCurly = 0;
+unsigned long leftCurley = 0;
+unsigned long rightCurley = 0;

 static wxString currentFileName = "";
 
 bool read_a_line(char *buf)
 static wxString currentFileName = "";
 
 bool read_a_line(char *buf)


@@ -455,19 +455,19 @@ bool read_a_line(char *buf)
     if (checkCurleyBraces)
     {
         if (ch == '{' && !readInVerbatim)
     if (checkCurleyBraces)
     {
         if (ch == '{' && !readInVerbatim)

-           leftCurly++;
+           leftCurley++;

         if (ch == '}' && !readInVerbatim)
         {
         if (ch == '}' && !readInVerbatim)
         {

-           rightCurly++;
-           if (rightCurly > leftCurly)
+           rightCurley++;
+           if (rightCurley > leftCurley)

            {
                wxString errBuf;
            {
                wxString errBuf;

-               errBuf.Printf("An extra right curly 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());
 
                OnError((char *)errBuf.c_str());
 

-               // Reduce the count of right curly braces, so the mismatched count
+               // Reduce the count of right Curley braces, so the mismatched count

                // isn't reported on every line that has a '}' after the first mismatch
                // isn't reported on every line that has a '}' after the first mismatch

-               rightCurly--;
+               rightCurley--;

            }
         }
     }
            }
         }
     }


@@ -623,14 +623,14 @@ bool read_a_line(char *buf)
 
       if (checkCurleyBraces)
       {
 
       if (checkCurleyBraces)
       {

-          if (leftCurly != rightCurly)
+          if (leftCurley != rightCurley)

           {
             wxString errBuf;
           {
             wxString errBuf;

-            errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly);
+            errBuf.Printf("Curley braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurley,rightCurley);

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

-          leftCurly = 0;
-          rightCurly = 0;
+          leftCurley = 0;
+          rightCurley = 0;

       }
 
       if (readingVerbatim)
       }
 
       if (readingVerbatim)


@@ -830,10 +830,10 @@ bool read_a_line(char *buf)
 
   if (checkCurleyBraces)
   {
 
   if (checkCurleyBraces)
   {

-      if (ch == EOF && leftCurly != rightCurly)
+      if (ch == EOF && leftCurley != rightCurley)

       {
         wxString errBuf;
       {
         wxString errBuf;

-        errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly);
+        errBuf.Printf("Curley braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurley,rightCurley);

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