Quick workaround for dviread bug #3175113

svn path=/trunk/matplotlib/; revision=8956
708c4512952259f67ccdc916ea80fbc79b3e1643
commit 708c4512952259f67ccdc916ea80fbc79b3e1643
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2011-02-07 Quick workaround for dviread bug #3175113 - JKS
+
 2011-02-05 Add cbook memory monitoring for Windows, using
            tasklist. - EF
 

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: