From 4f6bbaef3d46bb502b574998eccbfb97fea7bc90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Tue, 28 Oct 2003 16:06:38 +0000 Subject: [PATCH] corrected some weird spacing problems in message handlers git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@1121 069f4177-920e-0410-937b-c2a4a81bcd90 --- pyx/text.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pyx/text.py b/pyx/text.py index 9c5ab81c..93d6c1c5 100644 --- a/pyx/text.py +++ b/pyx/text.py @@ -1414,17 +1414,13 @@ class _texmessagetexend(texmessage): class _texmessageemptylines(texmessage): - """validates empty and "*-only" (TeX/LaTeX input marker in interactive mode) lines""" + """validates "*-only" (TeX/LaTeX input marker in interactive mode) and empty lines""" __implements__ = _Itexmessage - pattern = re.compile(r"^\*?\n", re.M) - def check(self, texrunner): - m = self.pattern.search(texrunner.texmessageparsed) - while m: - texrunner.texmessageparsed = texrunner.texmessageparsed[:m.start()] + texrunner.texmessageparsed[m.end():] - m = self.pattern.search(texrunner.texmessageparsed) + texrunner.texmessageparsed = texrunner.texmessageparsed.replace("*\n", "") + texrunner.texmessageparsed = texrunner.texmessageparsed.replace("\n", "") class _texmessageload(texmessage): @@ -1436,7 +1432,7 @@ class _texmessageload(texmessage): __implements__ = _Itexmessage - pattern = re.compile(r"\((?P[^()\s\n]+)[^()]*\)") + pattern = re.compile(r" *\((?P[^()\s\n]+)[^()]*\) *") def baselevels(self, s, maxlevel=1, brackets="()"): """strip parts of a string above a given bracket level @@ -1480,7 +1476,7 @@ class _texmessageloadfd(_texmessageload): - works like _texmessageload - filename must end with .fd and no further text is allowed""" - pattern = re.compile(r"\((?P[^)]+.fd)\)") + pattern = re.compile(r" *\((?P[^)]+.fd)\) *") class _texmessagegraphicsload(_texmessageload): @@ -1488,7 +1484,7 @@ class _texmessagegraphicsload(_texmessageload): - works like _texmessageload, but using "<" and ">" as delimiters - filename must end with .eps and no further text is allowed""" - pattern = re.compile(r"<(?P[^>]+.eps)>") + pattern = re.compile(r" *<(?P[^>]+.eps)> *") def baselevels(self, s, brackets="<>", **args): return _texmessageload.baselevels(self, s, brackets=brackets, **args) @@ -2230,7 +2226,10 @@ class texrunner: check.check(self) except TexResultWarning: traceback.print_exc() + print "expr>>>%s<<<" % self.expr + print "aaa>>>%s<<<" % self.texmessageparsed texmessage.emptylines.check(self) + print "bbb>>>%s<<<" % self.texmessageparsed if len(self.texmessageparsed): raise TexResultError("unhandled TeX response (might be an error)", self) else: -- 2.11.4.GIT