--- pyx/dvi/mapfile.py.orig	2008-11-22 23:04:47.000000000 -0600
+++ pyx/dvi/mapfile.py	2008-11-22 23:07:38.000000000 -0600
@@ -42,9 +42,15 @@
             else:
                 raise RuntimeError("Cannot tokenize string '%s'" % s)
 
+        next_token_is_encfile = False
         for token in tokens:
-            if token.startswith("<"):
-                if token.startswith("<<"):
+            if next_token_is_encfile:
+                self.encodingfilename = token
+                next_token_is_encfile = False
+            elif token.startswith("<"):
+                if token == "<":
+                    next_token_is_encfile = True
+                elif token.startswith("<<"):
                     # XXX: support non-partial download here
                     self.fontfilename = token[2:]
                 elif token.startswith("<["):