matplotlib-checkins Mailing List for matplotlib

Revision: 7273
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7273&view=rev
Author: evilguru
Date: 2009年07月19日 21:33:18 +0000 (2009年7月19日)
Log Message:
-----------
Port over the Cairo backend to mathtex. Just PS and OS X left.
Modified Paths:
--------------
 branches/mathtex/lib/matplotlib/backends/backend_cairo.py
Modified: branches/mathtex/lib/matplotlib/backends/backend_cairo.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_cairo.py	2009年07月19日 13:35:15 UTC (rev 7272)
+++ branches/mathtex/lib/matplotlib/backends/backend_cairo.py	2009年07月19日 21:33:18 UTC (rev 7273)
@@ -42,12 +42,14 @@
 FigureManagerBase, FigureCanvasBase
 from matplotlib.cbook import is_string_like
 from matplotlib.figure import Figure
-from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, Affine2D
 from matplotlib.font_manager import ttfFontProperty
 from matplotlib import rcParams
 
+from mathtex.mathtex_main import Mathtex
+from mathtex.backends.backend_cairo import MathtexBackendCairo
+
 _debug = False
 #_debug = True
 
@@ -94,7 +96,6 @@
 self.gc = GraphicsContextCairo (renderer=self)
 self.text_ctx = cairo.Context (
 cairo.ImageSurface (cairo.FORMAT_ARGB32,1,1))
- self.mathtext_parser = MathTextParser('Cairo')
 
 def set_ctx_from_surface (self, surface):
 self.gc.ctx = cairo.Context (surface)
@@ -203,35 +204,18 @@
 if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
 
 ctx = gc.ctx
- width, height, descent, glyphs, rects = self.mathtext_parser.parse(
- s, self.dpi, prop)
 
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), self.dpi)
+ b = MathtexBackendCairo()
+ m.render_to_backend(b)
+
 ctx.save()
- ctx.translate(x, y)
+ ctx.translate(x, y - m.height - m.depth)
 if angle:
 ctx.rotate (-angle * npy.pi / 180)
 
- for font, fontsize, s, ox, oy in glyphs:
- ctx.new_path()
- ctx.move_to(ox, oy)
+ b.render_to_context(ctx)
 
- fontProp = ttfFontProperty(font)
- ctx.save()
- ctx.select_font_face (fontProp.name,
- self.fontangles [fontProp.style],
- self.fontweights[fontProp.weight])
-
- size = fontsize * self.dpi / 72.0
- ctx.set_font_size(size)
- ctx.show_text(s.encode("utf-8"))
- ctx.restore()
-
- for ox, oy, w, h in rects:
- ctx.new_path()
- ctx.rectangle (ox, oy, w, h)
- ctx.set_source_rgb (0, 0, 0)
- ctx.fill_preserve()
-
 ctx.restore()
 
 
@@ -250,9 +234,8 @@
 def get_text_width_height_descent(self, s, prop, ismath):
 if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
 if ismath:
- width, height, descent, fonts, used_characters = self.mathtext_parser.parse(
- s, self.dpi, prop)
- return width, height, descent
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), self.dpi)
+ return m.width, m.height, m.depth
 
 ctx = self.text_ctx
 ctx.save()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7272
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7272&view=rev
Author: jdh2358
Date: 2009年07月19日 13:35:15 +0000 (2009年7月19日)
Log Message:
-----------
fixed Axes.step docstring per sf bug 2823304
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009年07月19日 10:15:57 UTC (rev 7271)
+++ trunk/matplotlib/CHANGELOG	2009年07月19日 13:35:15 UTC (rev 7272)
@@ -1,3 +1,8 @@
+2009年07月19日 Fixed the docstring of Axes.step to reflect the correct
+ meaning of the kwargs "pre" and "post" - See SF bug
+ https://sourceforge.net/tracker/index.php?func=detail&aid=2823304&group_id=80706&atid=560720
+ - JDH
+
 2009年07月18日 Fix support for hatches without color fills to pdf and svg
 backends. Add an example of that to hatch_demo.py. - JKS
 
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009年07月19日 10:15:57 UTC (rev 7271)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009年07月19日 13:35:15 UTC (rev 7272)
@@ -4109,9 +4109,9 @@
 Keyword arguments:
 
 *where*: [ 'pre' | 'post' | 'mid' ]
- If 'pre', the interval from x[i] to x[i+1] has level y[i]
+ If 'pre', the interval from x[i] to x[i+1] has level y[i+1]
 
- If 'post', that interval has level y[i+1]
+ If 'post', that interval has level y[i]
 
 If 'mid', the jumps in *y* occur half-way between the
 *x*-values.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7271
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7271&view=rev
Author: evilguru
Date: 2009年07月19日 10:15:57 +0000 (2009年7月19日)
Log Message:
-----------
Port the SVG backend over to mathtex.
Modified Paths:
--------------
 branches/mathtex/lib/matplotlib/backends/backend_svg.py
Modified: branches/mathtex/lib/matplotlib/backends/backend_svg.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_svg.py	2009年07月18日 08:35:56 UTC (rev 7270)
+++ branches/mathtex/lib/matplotlib/backends/backend_svg.py	2009年07月19日 10:15:57 UTC (rev 7271)
@@ -16,11 +16,12 @@
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont, FontProperties
 from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, LOAD_NO_HINTING
-from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Affine2D
 from matplotlib import _png
 
+from mathtex.mathtex_main import Mathtex
+
 from xml.sax.saxutils import escape as escape_xml_text
 
 backend_version = __version__
@@ -54,7 +55,6 @@
 self._path_collection_id = 0
 self._imaged = {}
 self._hatchd = {}
- self.mathtext_parser = MathTextParser('SVG')
 svgwriter.write(svgProlog%(width,height,width,height))
 
 def _draw_svg_element(self, element, details, gc, rgbFace):
@@ -485,12 +485,17 @@
 
 def _draw_mathtext(self, gc, x, y, s, prop, angle):
 """
- Draw math text using matplotlib.mathtext
+ Draw math text using mathtex
 """
- width, height, descent, svg_elements, used_characters = \
- self.mathtext_parser.parse(s, 72, prop)
- svg_glyphs = svg_elements.svg_glyphs
- svg_rects = svg_elements.svg_rects
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), 72.0)
+
+ # Extract the glyphs and rects to render
+ svg_glyphs = [(info.font, info.fontsize, unichr(info.num),
+ ox, m.height - oy + info.offset, info.metrics)
+ for ox, oy, info in m.glyphs]
+ svg_rects = [(x1, m.height - y1 + 1, x2 - x1, y2 - y1)
+ for x1, y1, x2, y2 in m.rects]
+
 color = rgb2hex(gc.get_rgb()[:3])
 write = self._svgwriter.write
 
@@ -587,9 +592,9 @@
 
 def get_text_width_height_descent(self, s, prop, ismath):
 if ismath:
- width, height, descent, trash, used_characters = \
- self.mathtext_parser.parse(s, 72, prop)
- return width, height, descent
+ m = Mathtex(s, rcParams['mathtext.fontset'],
+ prop.get_size_in_points(), 72.0)
+ return m.width, m.height, m.depth
 font = self._get_font(prop)
 font.set_text(s, 0.0, flags=LOAD_NO_HINTING)
 w, h = font.get_width_height()
@@ -639,7 +644,7 @@
 # the problem. I hope someone who knows the svg backends
 # take a look at this problem. Meanwhile, the dpi
 # parameter is ignored and image_dpi is fixed at 72. - JJL
- 
+
 #image_dpi = kwargs.pop("dpi", 72)
 image_dpi = 72
 _bbox_inches_restore = kwargs.pop("bbox_inches_restore", None)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.