Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Standardized the way I spelled 'curley' everywhere


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-05-24 23:37:39 +00:00
parent c786f76365
commit 341479ffb9
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/tex2rtf/src/rtfutils.cpp
View File

@@ -667,7 +667,7 @@ void ProcessText2RTF(TexChunk *chunk)
i += 1; i += 1;
changed = TRUE; 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] = '\\'; ptr ++;
BigBuffer[ptr] = ch; ptr ++; BigBuffer[ptr] = ch; ptr ++;

30
utils/tex2rtf/src/tex2any.cpp
View File

@@ -84,7 +84,7 @@ wxString syntaxTokens[] =
"\\begin{comment}", "\\begin{comment}",
"\\end{comment}", "\\end{comment}",
"\\verbatiminput", "\\verbatiminput",
"\\par", // "\\par",
"\\input", "\\input",
"\\helpinput", "\\helpinput",
"\\include", "\\include",
@@ -419,8 +419,8 @@ bool readInVerbatim = FALSE; // Within a verbatim, but not nec. verbatiminput
// detection of \verb yet. // detection of \verb yet.
// #define CHECK_BRACES 1 // #define CHECK_BRACES 1
unsigned long leftCurly = 0; unsigned long leftCurley = 0;
unsigned long rightCurly = 0; unsigned long rightCurley = 0;
static wxString currentFileName = ""; static wxString currentFileName = "";
bool read_a_line(char *buf) bool read_a_line(char *buf)
@@ -455,19 +455,19 @@ bool read_a_line(char *buf)
if (checkCurleyBraces) if (checkCurleyBraces)
{ {
if (ch == '{' && !readInVerbatim) if (ch == '{' && !readInVerbatim)
leftCurly++; leftCurley++;
if (ch == '}' && !readInVerbatim) if (ch == '}' && !readInVerbatim)
{ {
rightCurly++; rightCurley++;
if (rightCurly > leftCurly) 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; leftCurley = 0;
rightCurly = 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());
} }
} }