From c22287afb2711c424df0ba00bf6fbe2af736b433 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Wed, 12 May 2004 21:31:47 +0000 Subject: [PATCH] Open curley braces '{' that were preceeded by a '\' were being incorrectly counted as a mismatched left curley brace git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/tex2rtf/src/tex2any.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp index 8bb9b7342f..aa2f7ea449 100644 --- a/utils/tex2rtf/src/tex2any.cpp +++ b/utils/tex2rtf/src/tex2any.cpp @@ -443,6 +443,7 @@ bool read_a_line(wxChar *buf) int ch = -2; unsigned long bufIndex = 0; buf[0] = 0; + char lastChar = _T(' '); while (ch != EOF && ch != 10) { @@ -459,13 +460,14 @@ bool read_a_line(wxChar *buf) ((bufIndex == 16) && (wxStrncmp(buf, _T("\\end{toocomplex}"), 16) == 0))) readInVerbatim = false; + lastChar = ch; ch = getc(Inputs[CurrentInputIndex]); if (checkCurleyBraces) { - if (ch == '{' && !readInVerbatim) + if (ch == '{' && !readInVerbatim && lastChar != _T('\\')) leftCurley++; - if (ch == '}' && !readInVerbatim) + if (ch == '}' && !readInVerbatim && lastChar != _T('\\')) { rightCurley++; if (rightCurley > leftCurley) @@ -597,10 +599,10 @@ bool read_a_line(wxChar *buf) // There should NOT be a '\' before the '_' if ((bufIndex > 0 && (buf[bufIndex-1] == '\\')) && (buf[0] != '%')) { - wxString errBuf; - 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()); - OnError((wxChar *)errBuf.c_str()); +// wxString errBuf; +// 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()); +// OnError((wxChar *)errBuf.c_str()); } } else -- 2.47.2