Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit fe96a1dff6a1 · 2013-12-11T09:33:11.000-05:00
Conflicts:
	doc/conf.py
diff --git a/doc/conf.py b/doc/conf.py
@@ -31,10 +31,19 @@
               'matplotlib.sphinxext.plot_directive',
               'sphinx.ext.inheritance_diagram',
               'sphinxext.gen_gallery', 'sphinxext.gen_rst',
-              'matplotlib.sphinxext.ipython_console_highlighting',
               'sphinxext.github',
               'numpydoc']
 
+
+# Use IPython's console highlighting by default
+try:
+    from IPython.sphinxext import ipython_console_highlighting
+except ImportError:
+    extensions.append('matplotlib.sphinxext.ipython_console_highlighting')
+else:
+    print("Using IPython's ipython_console_highlighting directive")
+    extensions.append('IPython.sphinxext.ipython_console_highlighting')
+
 try:
     import numpydoc
 except ImportError:
diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py
@@ -1812,7 +1812,9 @@ def draw_tex(self, gc, x, y, s, prop, angle, ismath='TeX!', mtext=None):
                         dvifont=dvifont)
                 seq += [['font', pdfname, dvifont.size]]
                 oldfont = dvifont
-            seq += [['text', x1, y1, [chr(glyph)], x1+width]]
+            # We need to convert the glyph numbers to bytes, and the easiest
+            # way to do this on both Python 2 and 3 is .encode('latin-1')
+            seq += [['text', x1, y1, [chr(glyph).encode('latin-1')], x1+width]]
 
         # Find consecutive text strings with constant y coordinate and
         # combine into a sequence of strings and kerns, or just one
