From e6ae16b0b9bff1c6f5dbb9bd2b3eb588c85d296b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Wobst?= <wobsta@users.sourceforge.net>
Date: Fri, 18 Dec 2009 10:25:33 +0000
Subject: [PATCH] fix rigid aux file checking

git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@3016 069f4177-920e-0410-937b-c2a4a81bcd90
---
 CHANGES     |  2 ++
 pyx/text.py | 22 +++++-----------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4f06d3f5..a8df643b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -125,6 +125,8 @@ TODO:
     - fix two bugs in the read pipe of the texrunner (thanks to
       Laurence Tratt and Eric Faurot)
     - fix "<" token handling in mapping file parser (thanks to Matthew West)
+    - fix start message parse error in MiKTeX (thanks to Wojciech Jaskowski)
+    - fix rigid aux file checking (thanks to Clayton E. Myers)
   - style module:
     - implement style.fillrule
   - bitmap module:
diff --git a/pyx/text.py b/pyx/text.py
index 7e375119..53175894 100644
--- a/pyx/text.py
+++ b/pyx/text.py
@@ -177,24 +177,12 @@ class _texmessageend(texmessage):
 
     __implements__ = _Itexmessage
 
+    auxPattern = re.compile(r"\(([^()]+\.aux|\"[^\"]+\.aux\")\)")
+
     def check(self, texrunner):
-        try:
-            s1, s2 = texrunner.texmessageparsed.split("(%s.aux)" % texrunner.texfilename, 1)
-            texrunner.texmessageparsed = s1 + s2
-        except (IndexError, ValueError):
-            try:
-                s1, s2 = texrunner.texmessageparsed.split("(%s%s%s.aux)" % (os.curdir,
-                                                                        os.sep,
-                                                                        texrunner.texfilename), 1)
-                texrunner.texmessageparsed = s1 + s2
-            except (IndexError, ValueError):
-                try:
-                    s1, s2 = texrunner.texmessageparsed.split("(\"%s%s%s.aux\")" % (os.curdir,
-                                                                            os.sep,
-                                                                            texrunner.texfilename), 1)
-                    texrunner.texmessageparsed = s1 + s2
-                except (IndexError, ValueError):
-                    print "debug:(\"%s%s%s.aux\")" % (os.curdir, os.sep, texrunner.texfilename)
+        m = self.auxPattern.search(texrunner.texmessageparsed)
+        if m:
+            texrunner.texmessageparsed = texrunner.texmessageparsed[:m.start()] + texrunner.texmessageparsed[m.end():]
 
         # check for "(see the transcript file for additional information)"
         try:
-- 
2.11.4.GIT