Fix upside down text problem in SVG when math and regular text are mixed.

mdboom · mdboom · commit 2656639d6ae0 · 2011-07-18T10:08:22.000-04:00
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -447,7 +447,7 @@ def _write_svgfonts(self):
                 glyph = font.load_char(char, flags=LOAD_NO_HINTING)
                 verts, codes = font.get_path()
                 path = Path(verts, codes)
-                path_data = self._convert_path(path, None)
+                path_data = self._convert_path(path)
                 # name = font.get_glyph_name(char)
                 writer.element(
                     'glyph',
@@ -479,7 +479,7 @@ def option_image_nocomposite(self):
         """
         return rcParams['svg.image_noscale']
 
-    def _convert_path(self, path, transform, clip=None, simplify=None):
+    def _convert_path(self, path, transform=None, clip=None, simplify=None):
         if clip:
             clip = (0.0, 0.0, self.width, self.height)
         else:
@@ -798,24 +798,23 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath):
             y -= ((font.get_descent() / 64.0) *
                   (prop.get_size_in_points() / text2path.FONT_SCALE))
 
-            _flip = Affine2D().scale(1.0, -1.0)
-
             if glyph_map_new:
                 writer.start('defs')
                 for char_id, glyph_path in glyph_map_new.iteritems():
                     path = Path(*glyph_path)
-                    path_data = self._convert_path(path, _flip, simplify=False)
+                    path_data = self._convert_path(path, simplify=False)
                     writer.element('path', id=char_id, d=path_data)
                 writer.end('defs')
 
                 glyph_map.update(glyph_map_new)
 
             attrib = {}
             attrib['style'] = generate_css(style)
+            font_scale = fontsize / text2path.FONT_SCALE
             attrib['transform'] = generate_transform([
                 ('translate', (x, y)),
                 ('rotate', (-angle,)),
-                ('scale', (fontsize / text2path.FONT_SCALE,))])
+                ('scale', (font_scale, -font_scale))])
 
             writer.start('g', attrib=attrib)
             for glyph_id, xposition, yposition, scale in glyph_info:
@@ -851,19 +850,19 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath):
                         path_data = ""
                     else:
                         path = Path(*glyph_path)
-                        path_data = self._convert_path(path, None, simplify=False)
+                        path_data = self._convert_path(path, simplify=False)
                     writer.element('path', id=char_id, d=path_data)
                 writer.end('defs')
 
                 glyph_map.update(glyph_map_new)
 
             attrib = {}
+            font_scale = fontsize / text2path.FONT_SCALE
             attrib['style'] = generate_css(style)
             attrib['transform'] = generate_transform([
                 ('translate', (x, y)),
                 ('rotate', (-angle,)),
-                ('scale', (fontsize / text2path.FONT_SCALE,
-                           -fontsize / text2path.FONT_SCALE))])
+                ('scale', (font_scale, - font_scale))])
 
             writer.start('g', attrib=attrib)
             for char_id, xposition, yposition, scale in glyph_info:
@@ -879,7 +878,7 @@ def _draw_text_as_path(self, gc, x, y, s, prop, angle, ismath):
 
             for verts, codes in rects:
                 path = Path(verts, codes)
-                path_data = self._convert_path(path, None, simplify=False)
+                path_data = self._convert_path(path, simplify=False)
                 writer.element('path', d=path_data)
 
             writer.end('g')
