updated users guide

svn path=/trunk/matplotlib/; revision=584

Author: jdh2358

CXX/Objects.hxx

@@ -2268,7 +2268,7 @@ namespace Py
 				}
 
 			const_iterator (const MapBase<T>* m, List k, List::iterator p )
-				: map(s), keys(k), pos(p)
+				: map(m), keys(k), pos(p)
 				{}
 
 			const_iterator(const const_iterator& other)

examples/mathtext_demo.py

@@ -19,7 +19,8 @@
 ylabel(r'$\Delta_{i+1}^j$', fontsize=20)
 tex = r'$\cal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\rm{sin}(2 \pi f x_i)$'
 text(1, 1.6, tex, fontsize=20)
-title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
+
+#title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
 savefig('mathtext_demo')
 
 show()

lib/matplotlib/backends/backend_svg.py

@@ -13,6 +13,12 @@
 from matplotlib._matlab_helpers import Gcf
 from matplotlib import rcParams
 
+try: from matplotlib.mathtext import math_parse_s_ft2font_svg
+except ImportError:
+    print >>sys.stderr, 'backend_svg could not import mathtext (build with ft2font)'
+    useMathText = False
+else: useMathText = True
+
 import sys,os,math
 
 def error_msg_svg(msg, *args):
@@ -103,7 +109,10 @@ def get_text_width_height(self, s, prop, ismath):
         get the width and height in display coords of the string s
         with FontPropertry prop
         """
-        if ismath: s = self.strip_math(s)
+        if ismath and useMathText:
+            width, height, glyphs = math_parse_s_ft2font_svg(
+                s, 72, prop.get_size_in_points())
+            return width, height
         font = self._get_font(prop)
         font.set_text(s, 0.0)
         w, h = font.get_width_height()
@@ -172,11 +181,38 @@ def draw_point(self, gc, x, y):
         """
         self.draw_arc(gc, gc.get_rgb(), x, y, 1, 0, 0, 0)  # result seems to have a hole in it...
 
+    def draw_mathtext(self, gc, x, y, s, prop, angle):
+        """
+        Draw math text using matplotlib.mathtext
+        """
+        fontsize = prop.get_size_in_points()
+        width, height, svg_glyphs = math_parse_s_ft2font_svg(s, 72, fontsize)
+        color = rgb2hex(gc.get_rgb())
+
+        svg = ""
+        self.open_group("mathtext")
+        for fontname, fontsize, num, ox, oy, metrics in svg_glyphs:
+            thetext=unichr(num)
+            thetext.encode('utf-8')
+            style = 'font-size: %f; font-family: %s; stroke-width: 0.5; stroke: %s; fill: %s;'%(fontsize, fontname, color, 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 = ''
+            newx, newy = x+ox, y-oy
+            svg += """\
+<text style="%(style)s" x="%(newx)f" y="%(newy)f" %(transform)s>%(thetext)s</text>
+""" % locals()
+
+        self._draw_rawsvg(svg.encode('utf-8'))
+        self.close_group("mathtext")
+
     def draw_text(self, gc, x, y, s, prop, angle, ismath):
         """
         draw text
         """
-        if ismath: s = self.strip_math(s)
+        if ismath and useMathText:
+             return self.draw_mathtext(gc, x, y, s, prop, angle)
+        
         font = self._get_font(prop)
 
         fontsize = prop.get_size_in_points()

lib/matplotlib/legend.py

@@ -179,7 +179,7 @@ def _get_handles(self, handles, texts):
                 legline.set_markersize(0.6*legline.get_markersize())
                 legline.set_data_clipping(False)
                 ret.append(legline)
-            elif isinstance(handle, Rectangle):
+            elif isinstance(handle, Patch):
 
                 p = Rectangle(xy=(min(self._xdata), y-3/4*HEIGHT),
                               width = self.HANDLELEN, height=HEIGHT/2,

lib/matplotlib/mathtext.py

@@ -232,14 +232,18 @@ class BakomaTrueTypeFonts(Fonts):
                 None  : 'cmmi10',
                 }
 
-    def __init__(self):
+    def __init__(self, useSVG=False):
         self.glyphd = {}
         self.fonts = dict(
             [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf'))
               for name in self.fnames])
 
         for font in self.fonts.values():
             font.clear()
+        if useSVG:
+            self.svg_glyphs=[]  # a list of "glyphs" we need to render this thing in SVG
+        else: pass
+        self.usingSVG = useSVG
 
     def get_metrics(self, font, sym, fontsize, dpi):
         cmfont, metrics, glyph, offset  = \
@@ -299,9 +303,22 @@ def render(self, ox, oy, font, sym, fontsize, dpi):
         cmfont, metrics, glyph, offset = \
                 self._get_info(font, sym, fontsize, dpi)
 
-        cmfont.draw_glyph_to_bitmap(
-            int(ox),  int(self.height - oy - metrics.ymax), glyph)
-
+        if not self.usingSVG:
+            cmfont.draw_glyph_to_bitmap(
+                int(ox),  int(self.height - oy - metrics.ymax), glyph)
+        else:
+            oy += offset - 512/2048.*10.
+            basename = self.fontmap[font]
+            if latex_to_bakoma.has_key(sym):
+                basename, num = latex_to_bakoma[sym]
+                num = self.fonts[basename].get_charmap()[num]
+            elif len(sym) == 1:
+                num = ord(sym)
+            else:
+                num = 0
+                print >>sys.stderr, 'unrecognized symbol "%s"' % sym
+            self.svg_glyphs.append((basename, fontsize, num, ox, oy, metrics))
+        
 
 class BakomaPSFonts(Fonts):
     """
@@ -960,6 +977,57 @@ def math_parse_s_ft2font(s, dpi, fontsize, angle=0):
 
 math_parse_s_ft2font.cache = {}
 
+def math_parse_s_ft2font_svg(s, dpi, fontsize, angle=0):
+    """
+    Parse the math expression s, return the (bbox, fonts) tuple needed
+    to render it.
+
+    fontsize must be in points
+
+    return is width, height, fonts
+    """
+
+    major, minor1, minor2, tmp, tmp = sys.version_info
+    if major==2 and minor1==2:
+        print >> sys.stderr, 'mathtext broken on python2.2.  We hope to get this fixed soon'
+        sys.exit()
+    cacheKey = (s, dpi, fontsize, angle)
+    s = s[1:-1]  # strip the $ from front and back
+    if math_parse_s_ft2font_svg.cache.has_key(cacheKey):
+        w, h, svg_glyphs = math_parse_s_ft2font_svg.cache[cacheKey]
+        return w, h, svg_glyphs
+
+    bakomaFonts = BakomaTrueTypeFonts(useSVG=True)
+    Element.fonts = bakomaFonts
+    handler.clear()
+    expression.parseString( s )
+
+    handler.expr.set_size_info(fontsize, dpi)
+
+    # set the origin once to allow w, h compution
+    handler.expr.set_origin(0, 0)
+    xmin = min([e.xmin() for e in handler.symbols])
+    xmax = max([e.xmax() for e in handler.symbols])
+    ymin = min([e.ymin() for e in handler.symbols])
+    ymax = max([e.ymax() for e in handler.symbols])
+
+    # now set the true origin - doesn't affect with and height
+    w, h =  xmax-xmin, ymax-ymin
+    # a small pad for the canvas size
+    w += 2
+    h += 2
+
+    handler.expr.set_origin(0, h-ymax)
+
+    Element.fonts.set_canvas_size(w,h)
+    handler.expr.render()
+    handler.clear()
+
+    math_parse_s_ft2font_svg.cache[cacheKey] = w, h, bakomaFonts.svg_glyphs
+    return w, h, bakomaFonts.svg_glyphs
+
+math_parse_s_ft2font_svg.cache = {}
+
 
 def math_parse_s_ps(s, dpi, fontsize):
     """

lib/matplotlib/ticker.py

@@ -6,16 +6,15 @@
 locating and formatting.  Although the locators know nothing about
 major or minor ticks, they are used by the Axis class to support major
 and minor tick locating and formatting.  Generic tick locators and
-formatters are provided, as well as domain specific custom locators an
-formatters.
+formatters are provided, as well as domain specific custom ones..
 
 
 Tick locating
 -------------
 
 The Locator class is the base class for all tick locators.  The
 locators handle autoscaling of the view limits based on the data
-limits, and choosing the tick locations.  The most generally useful
+limits, and the choosing of tick locations.  The most generally useful
 tick locator is MultipleLocator.  You initialize this with a base, eg
 10, and it picks axis limits and ticks that are multiples of your
 base.  The class AutoLocator contains a MultipleLocator instance, and