Quick workaround for dviread bug #3175113

jkseppan · jkseppan · commit 3922443018b0 · 2011-02-07T16:42:17.000Z
svn path=/branches/v1_0_maint/; revision=8955
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2011-02-07 Quick workaround for dviread bug #3175113 - JKS
+
 2011-01-04 Tag 1.0.1 for release at r8896
 
 2010-11-22 Fixed error with Hammer projection. - BVR
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -714,22 +714,30 @@ def _register(self, words):
         subsetting, but I have no example of << in my TeX installation.
         """
         texname, psname = words[:2]
-        effects, encoding, filename = '', None, None
+        effects, encodings, filename = '', [], None
         for word in words[2:]:
             if not word.startswith('<'):
                 effects = word
             else:
                 word = word.lstrip('<')
                 if word.startswith('['):
-                    assert encoding is None
-                    encoding = word[1:]
+                    encodings.append(word[1:])
                 elif word.endswith('.enc'):
-                    assert encoding is None
-                    encoding = word
+                    encodings.append(word)
                 else:
                     assert filename is None
                     filename = word
 
+        if len(encodings) > 1:
+            # TODO this is a stopgap workaround, need to handle this correctly
+            matplotlib.verbose.report('Multiple encodings for %s = %s, skipping'
+                                      % (texname, psname), 'debug')
+            return
+        elif len(encodings) == 1:
+            encoding, = encodings
+        else:
+            encoding = None
+
         eff = effects.split()
         effects = {}
         try:

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2011-02-07 Quick workaround for dviread bug #3175113 - JKS`
	`2`	`+`
`1`	`3`	`2011-01-04 Tag 1.0.1 for release at r8896`
`2`	`4`
`3`	`5`	`2010-11-22 Fixed error with Hammer projection. - BVR`