Small fixes to mathtext2.py in order to keep up with the changes to the mpl-data dir.

edin1 · edin1 · commit f3546ae8646a · 2007-03-04T09:46:55.000Z
svn path=/trunk/matplotlib/; revision=3042
diff --git a/examples/mathtext2_demo.py b/examples/mathtext2_demo.py
@@ -39,10 +39,10 @@
 
 # You can put other fonts to override the default ones
 rcParams['mathtext.rm'] = 'FreeSerif.ttf'
-#rcParams['mathtext.it'] = 'FreeSerifItalic.ttf'
-#rcParams['mathtext.tt'] = 'FreeMono.ttf'
-#rcParams['mathtext.mit'] = 'FreeSerifItalic.ttf'
-#rcParams['mathtext.cal'] = 'FreeSansOblique.ttf'
+rcParams['mathtext.it'] = 'FreeSerifItalic.ttf'
+rcParams['mathtext.tt'] = 'FreeMono.ttf'
+rcParams['mathtext.mit'] = 'FreeSerifItalic.ttf'
+rcParams['mathtext.cal'] = 'FreeSansOblique.ttf'
 
 # This is used by mathtext2 to find chars with ord > 255 (Unicode characters)
 rcParams['mathtext.nonascii'] = 'FreeSerif.ttf'
@@ -69,7 +69,6 @@
 #tex = ur"$a^{\sin x}\sin b\sin(x/x), {\rm sin}(x/x){\rm sin\ }(x/x)$"
 #tex = ur"$1\frac {\int_{-\infty}^\infty} 22$"
 #tex = ur"$\rm a\vtext{Traktor}b$"
-tex = ur"$a\vtext{a}$"
 #tex = ur"$\frac{\int_{-\infty}^\infty} 2$"
 #tex = ur"$1_\frac{\sum^2_{i_{23}=0}} 2678$"
 #tex = ur"$1_{\frac{\sum^2_{i_{23}=0}}{\sum_{i=\frac94}^\infty} 345}678$"
@@ -82,9 +81,9 @@
 #text(1, 1.5, tex, fontsize=20)
 #title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
 
-#savefig('mathtext_demo.png')
+savefig('mathtext_demo.png')
 savefig('mathtext_demo.svg')
-#savefig('mathtext_demo.ps')
+savefig('mathtext_demo.ps')
 
 
 show()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -750,7 +750,7 @@ def _get_info (self, font, sym, fontsize, dpi):
             num = ord(sym)
         else:
             num = 0
-            sym = '.notdef'
+            #sym = '.notdef'
             raise ValueError('unrecognized symbol "%s, %d"' % (sym, num))
         filename = os.path.join(self.basepath, basename) + '.ttf'
         if filename not in bakoma_fonts:
diff --git a/lib/matplotlib/mathtext2.py b/lib/matplotlib/mathtext2.py
@@ -56,9 +56,9 @@
         fontdirs = [os.path.join(_path,'fonts','afm'),
                     os.path.join(_path,'fonts','ttf')]
         for fontdir in fontdirs:
-            fname = os.path.join(fontdir,barefname)
+            fname = os.path.join(fontdir, barefname)
             if os.path.exists( fname ):
-                filenamesd[face] = os.path.join(_path, barefname)
+                filenamesd[face] = fname
                 break
     fonts[face] = FT2Font(filenamesd[face])
 
@@ -856,9 +856,9 @@ def handle_command(command, texgroup, env, allowsetters=False):
     elif command in reserved:
         uniindex = ord(command)
         appendix = handle_char(uniindex, env.copy())
-    elif command == "vtext":
-        _vlist = texgroup.pop(0)
-        appendix = handle_tokens(_vlist, env.copy(), box=Vbox)
+    #elif command == "vtext":
+    #    _vlist = texgroup.pop(0)
+    #    appendix = handle_tokens(_vlist, env.copy(), box=Vbox)
     elif command in tex2uni:
         uniindex = tex2uni[command]
         appendix = handle_char(uniindex, env.copy())
