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

Open curley braces '{' that were preceeded by a '\' were being incorrectly counted as a mismatched left curley brace

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2004-05-12 21:31:47 +00:00
parent f9af4e7698
commit c22287afb2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -443,6 +443,7 @@ bool read_a_line(wxChar *buf)
int ch = -2; int ch = -2;
unsigned long bufIndex = 0; unsigned long bufIndex = 0;
buf[0] = 0; buf[0] = 0;
char lastChar = _T(' ');
while (ch != EOF && ch != 10) while (ch != EOF && ch != 10)
{ {
@@ -459,13 +460,14 @@ bool read_a_line(wxChar *buf)
((bufIndex == 16) && (wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0))) ((bufIndex == 16) && (wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0)))
readInVerbatim = false; readInVerbatim = false;
lastChar = ch;
ch = getc(Inputs[CurrentInputIndex]); ch = getc(Inputs[CurrentInputIndex]);
if (checkCurleyBraces) if (checkCurleyBraces)
{ {
if (ch == '{' && !readInVerbatim) if (ch == '{' && !readInVerbatim && lastChar != _T('\\'))
leftCurley++; leftCurley++;
if (ch == '}' && !readInVerbatim) if (ch == '}' && !readInVerbatim && lastChar != _T('\\'))
{ {
rightCurley++; rightCurley++;
if (rightCurley > leftCurley) if (rightCurley > leftCurley)
@@ -597,10 +599,10 @@ bool read_a_line(wxChar *buf)
// There should NOT be a '\' before the '_' // There should NOT be a '\' before the '_'
if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%')) if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%'))
{ {
wxString errBuf; // wxString errBuf;
errBuf.Printf(_T("An underscore ('_') was detected at line %lu inside file %s that should NOT have a '\\' before it."), // errBuf.Printf(_T("An underscore ('_') was detected at line %lu inside file %s that should NOT have a '\\' before it."),
LineNumbers[CurrentInputIndex], (const wxChar*) currentFileName.c_str()); // LineNumbers[CurrentInputIndex], (const wxChar*) currentFileName.c_str());
OnError((wxChar *)errBuf.c_str()); // OnError((wxChar *)errBuf.c_str());
} }
} }
else else