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

brace matching removed from Tex2RTF (didn't work for \verb), doc

Browse Source 
fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-07-04 06:54:56 +00:00
parent a1d19f87a3
commit 5623e844b6
7 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/tex2rtf/docs/tex2rtf.hpj
View File

@@ -1,5 +1,5 @@
[OPTIONS]
BMROOT=d:\wx2\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is
BMROOT=. ; Assume that bitmaps are where the source is
TITLE=Tex2RTF Manual
CONTENTS=Contents
COMPRESS=HIGH

2
utils/tex2rtf/docs/tex2rtf.tex
View File

@@ -1,5 +1,5 @@
\documentstyle[a4,makeidx,verbatim,texhelp,fancyhea,mysober,mytitle]{report}%
\input{psbox.tex}
%\input{psbox.tex}
\newcommand{\commandref}[2]{\helpref{{\tt $\backslash$#1}}{#2}}%
\newcommand{\commandrefn}[2]{\helprefn{{\tt $\backslash$#1}}{#2}\index{#1}}%
\newcommand{\commandpageref}[2]{\latexignore{\helprefn{{\tt $\backslash$#1}}{#2}}\latexonly{{\tt $\backslash$#1} {\it page \pageref{#2}}}\index{#1}}%

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

@@ -363,6 +363,10 @@ bool FindEndEnvironment(char *buffer, int *pos, char *env)
bool readingVerbatim = FALSE;
bool readInVerbatim = FALSE; // Within a verbatim, but not nec. verbatiminput
// Switched this off because e.g. \verb${$ causes it to fail. There is no
// detection of \verb yet.
#define CHECK_BRACES 0
unsigned long leftCurly = 0;
unsigned long rightCurly = 0;
static wxString currentFileName = "";
@@ -386,6 +390,8 @@ bool read_a_line(char *buf)
readInVerbatim = FALSE;
ch = getc(Inputs[CurrentInputIndex]);
#if CHECK_BRACES
if (ch == '{' && !readInVerbatim)
leftCurly++;
if (ch == '}' && !readInVerbatim)
@@ -394,7 +400,7 @@ bool read_a_line(char *buf)
if (rightCurly > leftCurly)
{
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 Curly brace ('}') was detected at line %l inside file %s",LineNumbers[CurrentInputIndex], (const char*) currentFileName.c_str());
OnError((char *)errBuf.c_str());
// Reduce the count of right curly braces, so the mismatched count
@@ -402,6 +408,7 @@ bool read_a_line(char *buf)
rightCurly--;
}
}
#endif
if (ch != EOF)
{
@@ -475,6 +482,7 @@ bool read_a_line(char *buf)
if (CurrentInputIndex > 0)
ch = ' '; // No real end of file
CurrentInputIndex --;
#if CHECK_BRACES
if (leftCurly != rightCurly)
{
wxString errBuf;
@@ -483,7 +491,7 @@ bool read_a_line(char *buf)
}
leftCurly = 0;
rightCurly = 0;
#endif
if (readingVerbatim)
{
readingVerbatim = FALSE;
@@ -642,12 +650,14 @@ bool read_a_line(char *buf)
strncmp(buf, "\\end{toocomplex}", 16) == 0)
readInVerbatim = FALSE;
#if CHECK_BRACES
if (ch == EOF && leftCurly != rightCurly)
{
wxString errBuf;
errBuf.Printf("Curly braces do not match inside file %s\n%lu opens, %lu closes", (const char*) currentFileName.c_str(),leftCurly,rightCurly);
OnError((char *)errBuf.c_str());
}
#endif
return (ch == EOF);
}