Merged revisions 4496-4498 via svnmerge from

mdboom · mdboom · commit 21cf88d79fe1 · 2007-11-28T21:01:01.000Z
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib ........ r4497 | mdboom | 2007-11-28 15:43:01 -0500 (Wed, 28 Nov 2007) | 2 lines Minor fix -- updating old \rm{} syntax to \mathrm{} syntax. ........ r4498 | mdboom | 2007-11-28 15:58:06 -0500 (Wed, 28 Nov 2007) | 2 lines Fix for STIX fonts with PDF backend. ........ svn path=/branches/transforms/; revision=4499
diff --git a/examples/mathtext_demo.py b/examples/mathtext_demo.py
@@ -22,7 +22,7 @@
 
 ax.legend(("Foo", "Testing $x^2$"))
 
-ax.set_title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
+ax.set_title(r'$\Delta_i^j \hspace{0.4} \mathrm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
 #fig.savefig('mathtext_demo')
 
 show()
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -719,7 +719,7 @@ def get_char_width(charcode):
                     charprocDict['Type'] = Name('XObject')
                     charprocDict['Subtype'] = Name('Form')
                     charprocDict['BBox'] = bbox
-                charprocObject = self.reserveObject('charProc for %s' % name)
+                charprocObject = self.reserveObject('charProc')
                 self.beginStream(charprocObject.id, None, charprocDict)
                 self.currentstream.write(stream)
                 self.endStream()
@@ -1308,6 +1308,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
                     fonttype = global_fonttype
 
                 if fonttype == 3 and num > 255:
+                    self.file.fontName(fontname)
                     self.file.output(Op.gsave,
                                      0.001 * fontsize, 0,
                                      0, 0.001 * fontsize,
