Turned mathtext in SVG into single <text> with multiple <tspan>s

NNemec · NNemec · commit 2f89e546176b · 2007-06-03T15:18:32.000Z
svn path=/trunk/matplotlib/; revision=3353
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-06-03 Turned mathtext in SVG into single <text> with multiple <tspan>
+           objects (easier to edit in inkscape). - NN
+
 ===============================================================
 2007-06-02 Released 0.90.1 at revision 3352
 
diff --git a/lib/matplotlib/backends/backend_svg.py b/lib/matplotlib/backends/backend_svg.py
@@ -263,21 +263,42 @@ def _draw_mathtext(self, gc, x, y, s, prop, angle):
         svg_lines = svg_elements.svg_lines
         color = rgb2hex(gc.get_rgb())
 
-        svg = ""
         self.open_group("mathtext")
-        for fontname, fontsize, thetext, ox, oy, metrics in svg_glyphs:
-            style = 'font-size: %f; font-family: %s; fill: %s;'%(fontsize,
-                                                            fontname, color)
-            if angle!=0:
-                transform = 'transform="translate(%f,%f) rotate(%1.1f) translate(%f,%f)"' % (x,y,-angle,-x,-y) # Inkscape doesn't support rotate(angle x y)
-            else: transform = ''
+
+        svg = '<text style="fill: %s" x="%f" y="%f"' % (color,x,y)
+
+        if angle != 0:
+            svg += ( ' transform="translate(%f,%f) rotate(%1.1f) translate(%f,%f)"'
+	             % (x,y,-angle,-x,-y) ) # Inkscape doesn't support rotate(angle x y)
+        svg += '>\n'
+
+        curr_x,curr_y = 0.0,0.0
+
+        for fontname, fontsize, thetext, new_x, new_y_mtc, metrics in svg_glyphs:
             if rcParams["mathtext.mathtext2"]:
-                newx, newy = x+ox, y+oy-height
+                new_y = new_y_mtc - height
             else:
-                newx, newy = x+ox, y-oy
-            svg += """\
-<text style="%(style)s" x="%(newx)f" y="%(newy)f" %(transform)s>%(thetext)s</text>
-""" % locals()
+                new_y = - new_y_mtc
+
+            svg += '<tspan'
+            svg += ' style="font-size: %f; font-family: %s"'%(fontsize, fontname)
+            xadvance = metrics.advance
+            svg += ' textLength="%f"' % xadvance
+
+            dx = new_x - curr_x
+            if dx != 0.0:
+                svg += ' dx="%f"' % dx
+
+            dy = new_y - curr_y
+            if dy != 0.0:
+                svg += ' dy="%f"' % dy
+
+            svg += '>%s</tspan>\n' % thetext
+
+            curr_x = new_x + xadvance
+            curr_y = new_y
+
+        svg += '</text>\n'
 
         self._svgwriter.write (svg)
         rgbFace = gc.get_rgb()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -1164,10 +1164,10 @@ def ymax(self):
 
     def render(self):
         'render to the fonts canvas'
-        Element.render(self)
         Element.fonts.render(
             self.ox, self.oy, 
             self.font, self.sym, self.fontsize, self.dpi)
+        Element.render(self)
 
     def __repr__(self):
         return self.sym
@@ -1229,8 +1229,8 @@ def width(self):
 
     def render(self):
         'render to the fonts canvas'
-        Element.render(self)
         self.elements[0].render()
+        Element.render(self)
 
     def xmin(self):
         'get the minimum ink in x'
diff --git a/lib/matplotlib/mathtext2.py b/lib/matplotlib/mathtext2.py
@@ -304,8 +304,8 @@ def hrender(self, x, y):
             thetext = unichr(self.uniindex)
             thetext.encode('utf-8')
             fontsize = self.env.fontsize * scriptfactors[self.env.scriptdepth]
-            svg_elements.svg_glyphs.append((familyname, fontsize,thetext, x,
-                y, None)) # None was originaly metrics (in old mathtext)
+            svg_elements.svg_glyphs.append((familyname, fontsize,thetext, x, y,
+                Bunch(advance=self.hadvance))) # last was originaly metrics (in old mathtext)
 
 
 class Kern(Renderer):
diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc
@@ -26,7 +26,7 @@
 #### CONFIGURATION BEGINS HERE
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
 #     Agg Cairo GD GDK Paint PS PDF SVG Template
-backend      : WXAgg
+backend      : TkAgg
 numerix      : numpy  # numpy, Numeric or numarray
 units        : True
 #interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
