Revision: 3611 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3611&view=rev Author: mdboom Date: 2007年07月25日 07:43:13 -0700 (2007年7月25日) Log Message: ----------- Got all backends working again. Fixed LaTeX-style fonts, sub/supers, kerning, spacing around operators, and many other changes. Modified Paths: -------------- branches/mathtext_mgd/lib/matplotlib/_mathtext_data.py branches/mathtext_mgd/lib/matplotlib/afm.py branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py branches/mathtext_mgd/lib/matplotlib/mathtext.py Modified: branches/mathtext_mgd/lib/matplotlib/_mathtext_data.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/_mathtext_data.py 2007年07月24日 19:23:37 UTC (rev 3610) +++ branches/mathtext_mgd/lib/matplotlib/_mathtext_data.py 2007年07月25日 14:43:13 UTC (rev 3611) @@ -112,7 +112,7 @@ r'\phi' : ('cmmi10', 42), r'\chi' : ('cmmi10', 17), r'\psi' : ('cmmi10', 31), - + r'(' : ('cmr10', 119), r'\leftparen' : ('cmr10', 119), r'\rightparen' : ('cmr10', 68), @@ -135,7 +135,10 @@ r'[' : ('cmr10', 62), r'\rightbracket' : ('cmr10', 72), r']' : ('cmr10', 72), - + r'\%' : ('cmr10', 48), + r'\$' : ('cmr10', 99), + r'@' : ('cmr10', 111), + # these are mathml names, I think. I'm just using them for the # tex methods noted r'\circumflexaccent' : ('cmr10', 124), # for \hat @@ -749,7 +752,17 @@ r'\langle' : ('psyr', 225), r'\Sigma' : ('psyr', 229), r'\sum' : ('psyr', 229), - + # these are mathml names, I think. I'm just using them for the + # tex methods noted + r'\circumflexaccent' : ('pncri8a', 124), # for \hat + r'\combiningbreve' : ('pncri8a', 81), # for \breve + r'\combininggraveaccent' : ('pncri8a', 114), # for \grave + r'\combiningacuteaccent' : ('pncri8a', 63), # for \accute + r'\combiningdiaeresis' : ('pncri8a', 91), # for \ddot + r'\combiningtilde' : ('pncri8a', 75), # for \tilde + r'\combiningrightarrowabove' : ('pncri8a', 110), # for \vec + r'\combiningdotabove' : ('pncri8a', 26), # for \dot + r'\imath' : ('pncri8a', 105) } # Automatically generated. Modified: branches/mathtext_mgd/lib/matplotlib/afm.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/afm.py 2007年07月24日 19:23:37 UTC (rev 3610) +++ branches/mathtext_mgd/lib/matplotlib/afm.py 2007年07月25日 14:43:13 UTC (rev 3611) @@ -394,7 +394,14 @@ "Return the fontangle as float" return self._header['ItalicAngle'] + def get_xheight(self): + "Return the xheight as float" + return self._header['XHeight'] + def get_underline_thickness(self): + "Return the underline thickness as float" + return self._header['UnderlineThickness'] + if __name__=='__main__': #pathname = '/usr/local/lib/R/afm/' Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py 2007年07月24日 19:23:37 UTC (rev 3610) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py 2007年07月25日 14:43:13 UTC (rev 3611) @@ -1100,26 +1100,28 @@ self.file.output(Op.begin_text) prev_font = None, None oldx, oldy = 0, 0 - for ox, oy, fontname, fontsize, glyph in pswriter: - a = angle / 180.0 * pi - newx = x + cos(a)*ox - sin(a)*oy - newy = y + sin(a)*ox + cos(a)*oy - self._setup_textpos(newx, newy, angle, oldx, oldy) - oldx, oldy = newx, newy - if (fontname, fontsize) != prev_font: - self.file.output(self.file.fontName(fontname), fontsize, - Op.selectfont) - prev_font = fontname, fontsize + for record in pswriter: + if record[0] == 'glyph': + rec_type, ox, oy, fontname, fontsize, glyph = record + a = angle / 180.0 * pi + newx = x + cos(a)*ox - sin(a)*oy + newy = y + sin(a)*ox + cos(a)*oy + self._setup_textpos(newx, newy, angle, oldx, oldy) + oldx, oldy = newx, newy + if (fontname, fontsize) != prev_font: + self.file.output(self.file.fontName(fontname), fontsize, + Op.selectfont) + prev_font = fontname, fontsize - #if fontname.endswith('cmsy10.ttf') or \ - #fontname.endswith('cmmi10.ttf') or \ - #fontname.endswith('cmex10.ttf'): - # string = '0円' + chr(glyph) - - string = chr(glyph) - self.file.output(string, Op.show) + string = chr(glyph) + self.file.output(string, Op.show) self.file.output(Op.end_text) + for record in pswriter: + if record[0] == 'rect': + rec_type, ox, oy, width, height = record + self.file.output(Op.gsave, x + ox, y + oy, width, height, Op.rectangle, Op.fill, Op.grestore) + def _draw_tex(self, gc, x, y, s, prop, angle): # Rename to draw_tex to enable, but note the following: # TODO: Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py 2007年07月24日 19:23:37 UTC (rev 3610) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py 2007年07月25日 14:43:13 UTC (rev 3611) @@ -338,7 +338,7 @@ width, height, svg_elements, used_characters = \ math_parse_s_ft2font_svg(s, 72, prop) svg_glyphs = svg_elements.svg_glyphs - svg_lines = svg_elements.svg_lines + svg_rects = svg_elements.svg_rects color = rgb2hex(gc.get_rgb()) self.open_group("mathtext") @@ -354,7 +354,7 @@ for font, fontsize, thetext, new_x, new_y_mtc, metrics in svg_glyphs: charid = self._add_char_def(font, thetext) - + svg.append('<use xlink:href="#%s" transform="translate(%s, %s) scale(%s)"/>\n' % (charid, new_x, -new_y_mtc, fontsize / self.FONT_SCALE)) svg.append('</g>\n') @@ -368,7 +368,7 @@ curr_x,curr_y = 0.0,0.0 - for fontname, fontsize, thetext, new_x, new_y_mtc, metrics in svg_glyphs: + for font, fontsize, thetext, new_x, new_y_mtc, metrics in svg_glyphs: if rcParams["mathtext.mathtext2"]: new_y = new_y_mtc - height else: @@ -394,13 +394,20 @@ svg.append('</text>\n') + if len(svg_rects): + svg.append('<g style="fill: black; stroke: none" transform="') + if angle != 0: + svg.append('translate(%f,%f) rotate(%1.1f)' + % (x,y,-angle) ) + else: + svg.append('translate(%f,%f)' % (x, y)) + svg.append('">\n') + + for x, y, width, height in svg_rects: + svg.append('<rect x="%s" y="%s" width="%s" height="%s" fill="black" stroke="none" />' % (x, -y + height, width, height)) + svg.append("</g>") + self._svgwriter.write (''.join(svg)) - rgbFace = gc.get_rgb() - for xmin, ymin, xmax, ymax in svg_lines: - newx, newy = x + xmin, y + height - ymax#-(ymax-ymin)/2#-height - self.draw_rectangle(gc, rgbFace, newx, newy, xmax-xmin, ymax-ymin) - #~ self.draw_line(gc, x + xmin, y + ymin,# - height, - #~ x + xmax, y + ymax)# - height) self.close_group("mathtext") def finish(self): Modified: branches/mathtext_mgd/lib/matplotlib/mathtext.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月24日 19:23:37 UTC (rev 3610) +++ branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月25日 14:43:13 UTC (rev 3611) @@ -147,7 +147,7 @@ from matplotlib.afm import AFM from matplotlib.cbook import enumerate, iterable, Bunch, get_realpath_and_stat, \ is_string_like -from matplotlib.ft2font import FT2Font +from matplotlib.ft2font import FT2Font, KERNING_UNFITTED from matplotlib.font_manager import fontManager, FontProperties from matplotlib._mathtext_data import latex_to_bakoma, cmkern, \ latex_to_standard, tex2uni, type12uni, tex2type1, uni2type1 @@ -681,10 +681,10 @@ xmax = xmax, ymin = ymin+offset, ymax = ymax+offset, + # iceberg is the equivalent of TeX's "height" iceberg = glyph.horiBearingY/64.0 + offset ) - print glyph.vertBearingY/64.0, glyph.vertAdvance/65536.0 self.glyphd[key] = basename, font, metrics, symbol_name, num, glyph, offset return self.glyphd[key] @@ -708,47 +708,31 @@ font = self.fonts.values()[0] font.font.draw_rect_filled(x1, y1, max(x2 - 1, x1), max(y2 - 1, y1)) - def _old_get_kern(self, font, symleft, symright, fontsize, dpi): - """ - Get the kerning distance for font between symleft and symright. - - font is one of tt, it, rm, cal or None - - sym is a single symbol(alphanum, punct) or a special symbol - like \sigma. - - """ - basename = self.fontmap[font] - cmfont = self.fonts[basename] - cmfont.set_size(fontsize, dpi) - kernd = cmkern[basename] - key = symleft, symright - kern = kernd.get(key,0) - #print basename, symleft, symright, key, kern - return kern - def get_used_characters(self): return self.used_characters - def get_xheight(self, font): + def get_xheight(self, font, fontsize): basename, cached_font = self._get_font(font) + cached_font.font.set_size(fontsize) pclt = cached_font.font.get_sfnt_table('pclt') - return pclt['xHeight'] / 64.0 + xHeight = pclt['xHeight'] / 64.0 + return xHeight - def get_underline_thickness(self, font): + def get_underline_thickness(self, font, fontsize): basename, cached_font = self._get_font(font) + cached_font.font.set_size(fontsize) return max(1.0, cached_font.font.underline_thickness / 64.0) def get_kern(self, fontleft, symleft, fontsizeleft, fontright, symright, fontsizeright, dpi): if fontsizeleft == fontsizeright: - basename, font1, metrics, symbol_name, num, glyph1, offset = \ + basename, font1, metrics, symbol_name, num1, glyph1, offset = \ self._get_info(fontleft, symleft, fontsizeleft, dpi) - basename, font2, metrics, symbol_name, num, glyph2, offset = \ + basename, font2, metrics, symbol_name, num2, glyph2, offset = \ self._get_info(fontright, symright, fontsizeright, dpi) if font1 == font2: basename, font = self._get_font(font1) - return font.font.get_kerning(glyph1, glyph2) / 64.0 + return font.font.get_kerning(num1, num2, KERNING_UNFITTED) / 64.0 return 0.0 class BakomaPSFonts(BakomaFonts): @@ -771,9 +755,10 @@ def render(self, ox, oy, font, sym, fontsize, dpi): basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) + oy = self.height - oy if basename.lower() == 'cmex10': oy += offset - 512/2048.*10. - + ps = """/%(basename)s findfont %(fontsize)s scalefont setfont @@ -782,6 +767,10 @@ """ % locals() self.pswriter.write(ps) + def render_rect_filled(self, x1, y1, x2, y2): + ps = "%f %f %f %f rectfill" % (x1, self.height - y2, x2 - x1, y2 - y1) + self.pswriter.write(ps) + class BakomaPDFFonts(BakomaPSFonts): """Hack of BakomaPSFonts for PDF support.""" @@ -789,26 +778,35 @@ basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) filename = font.fname + oy = self.height - oy if basename.lower() == 'cmex10': oy += offset - 512/2048.*10. - self.pswriter.append((ox, oy, filename, fontsize, num)) + self.pswriter.append(('glyph', ox, oy, filename, fontsize, num)) + def render_rect_filled(self, x1, y1, x2, y2): + self.pswriter.append(('rect', x1, self.height - y2, x2 - x1, y2 - y1)) + class BakomaSVGFonts(BakomaFonts): """Hack of BakomaFonts for SVG support.""" def __init__(self): BakomaFonts.__init__(self) self.svg_glyphs = [] + self.svg_rects = [] def render(self, ox, oy, font, sym, fontsize, dpi): basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) + oy = self.height - oy oy += offset - 512/2048.*10. thetext = unichr(num) thetext.encode('utf-8') self.svg_glyphs.append((font, fontsize, thetext, ox, oy, metrics)) + def render_rect_filled(self, x1, y1, x2, y2): + self.svg_rects.append((x1, self.height - y2, x2 - x1, y2 - y1)) + class StandardPSFonts(Fonts): """ Use the standard postscript fonts for rendering to backend_ps @@ -894,11 +892,13 @@ metrics = Bunch( advance = (xmax-xmin), width = font.get_width_char(glyph) * scale, - height = font.get_width_char(glyph) * scale, + height = font.get_height_char(glyph) * scale, xmin = xmin, xmax = xmax, ymin = ymin+offset, - ymax = ymax+offset + ymax = ymax+offset, + # iceberg is the equivalent of TeX's "height" + iceberg = ymax + offset ) self.glyphd[key] = basename, font, metrics, symbol_name, num, glyph, offset @@ -913,6 +913,7 @@ def render(self, ox, oy, font, sym, fontsize, dpi): basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) + oy = self.height - oy ps = """/%(basename)s findfont %(fontsize)s scalefont setfont @@ -927,16 +928,30 @@ self._get_info(font, sym, fontsize, dpi) return metrics - def get_kern(self, font, symleft, symright, fontsize, dpi): - basename, font1, metrics, symbol_name, num, glyph1, offset = \ - self._get_info(font, symleft, fontsize, dpi) - basename, font2, metrics, symbol_name, num, glyph2, offset = \ - self._get_info(font, symright, fontsize, dpi) - if font1.get_fontname() == font2.get_fontname(): - basename, font = self._get_font(font) - return font.get_kern_dist(glyph1, glyph2) * 0.001 * fontsize - return 0 + def get_kern(self, fontleft, symleft, fontsizeleft, + fontright, symright, fontsizeright, dpi): + if fontsizeleft == fontsizeright: + basename, font1, metrics, symbol_name, num, glyph1, offset = \ + self._get_info(fontleft, symleft, fontsizeleft, dpi) + basename, font2, metrics, symbol_name, num, glyph2, offset = \ + self._get_info(fontright, symright, fontsizeright, dpi) + if font1.get_fontname() == font2.get_fontname(): + basename, font = self._get_font(font1) + return font.get_kern_dist(glyph1, glyph2) * 0.001 * fontsizeleft + return 0.0 + def render_rect_filled(self, x1, y1, x2, y2): + ps = "%f %f %f %f rectfill" % (x1, self.height - y2, x2 - x1, y2 - y1) + self.pswriter.write(ps) + + def get_xheight(self, font, fontsize): + basename, cached_font = self._get_font(font) + return cached_font.get_xheight() * 0.001 * fontsize + + def get_underline_thickness(self, font, fontsize): + basename, cached_font = self._get_font(font) + return cached_font.get_underline_thickness() * 0.001 * fontsize + ############################################################################## # TeX-LIKE BOX MODEL @@ -960,15 +975,13 @@ # # Note that (as TeX) y increases downward, unlike many other parts of # matplotlib. - -# MGDTODO: scale_factor is a non-TeX hack class MathTextWarning(Warning): pass class Node(object): """A node in a linked list. - §133 + @133 """ def __init__(self): self.link = None @@ -1046,7 +1059,7 @@ def __init__(self, c, state): Node.__init__(self) self.c = c - self.font_manager = state.font_manager + self.font_output = state.font_output self.font = state.font self.fontsize = state.fontsize self.dpi = state.dpi @@ -1058,9 +1071,8 @@ return repr(self.c) def _update_metrics(self): - metrics = self._metrics = self.font_manager.get_metrics( + metrics = self._metrics = self.font_output.get_metrics( self.font, self.c, self.fontsize, self.dpi) - print self.c, metrics.height, metrics.ymax, metrics.ymin, metrics.iceberg self.width = metrics.width self.height = metrics.iceberg self.depth = -(metrics.iceberg - metrics.height) @@ -1069,16 +1081,15 @@ """Return the amount of kerning between this and the given character. Called when characters are strung together into Hlists to create Kern nodes.""" - # MGDTODO: Actually use kerning pairs advance = self._metrics.advance - self.width kern = 0. - #if isinstance(next, Char): - # kern = self.font_manager.get_kern(self.font, self.c, self.fontsize, next.font, next.c, next.fontsize, self.dpi) + if isinstance(next, Char): + kern = self.font_output.get_kern(self.font, self.c, self.fontsize, next.font, next.c, next.fontsize, self.dpi) return advance + kern def render(self, x, y): """Render the character to the canvas""" - self.font_manager.render( + self.font_output.render( x, y, self.font, self.c, self.fontsize, self.dpi) @@ -1089,9 +1100,10 @@ self._update_metrics() class Accent(Char): - """The font metrics need to be dealt with differently for accents.""" + """The font metrics need to be dealt with differently for accents, since they + are already offset correctly from the baseline in TrueType fonts.""" def _update_metrics(self): - metrics = self._metrics = self.font_manager.get_metrics( + metrics = self._metrics = self.font_output.get_metrics( self.font, self.c, self.fontsize, self.dpi) self.width = metrics.width self.height = metrics.ymax - metrics.ymin @@ -1099,7 +1111,7 @@ def render(self, x, y): """Render the character to the canvas""" - self.font_manager.render( + self.font_output.render( x, y + (self._metrics.ymax - self.height), self.font, self.c, self.fontsize, self.dpi) @@ -1225,7 +1237,7 @@ if p is None: break - if isinstance(p, (Box, Unset)): + if isinstance(p, Box): x += p.width if p.height is not None and p.depth is not None: s = getattr(p, 'shift_amount', 0.) @@ -1295,7 +1307,7 @@ while p is not None: if isinstance(p, Char): raise RuntimeError("Internal error in mathtext") - elif isinstance(p, (Box, Unset)): + elif isinstance(p, Box): x += d + p.height d = p.depth if p.width is not None: @@ -1341,27 +1353,29 @@ depth, and height fields just as in an Hlist. However, if any of these dimensions is None, the actual value will be determined by running the rule up to the boundary of the innermost enclosing box. This is called - a "running dimension." The width is never running in an Hlist; the + a "running dimension." The width is never running in an Hlist; the height and depth are never running in a Vlist. @138""" def __init__(self, width, height, depth, state): Box.__init__(self, width, height, depth) - self.font_manager = state.font_manager + self.font_output = state.font_output def render(self, x, y, w, h): - self.font_manager.render_rect_filled(x, y, x + w, y + h) + self.font_output.render_rect_filled(x, y, x + w, y + h) class Hrule(Rule): """Convenience class to create a horizontal rule.""" def __init__(self, state): - thickness = state.font_manager.get_underline_thickness(state.font) + thickness = state.font_output.get_underline_thickness( + state.font, state.fontsize) height = depth = thickness * 0.5 Rule.__init__(self, None, height, depth, state) class Vrule(Rule): """Convenience class to create a vertical rule.""" def __init__(self, state): - thickness = state.font_manager.get_underline_thickness(state.font) + thickness = state.font_output.get_underline_thickness( + state.font, state.fontsize) Rule.__init__(self, thickness, None, None, state) class Glue(Node): @@ -1457,7 +1471,7 @@ Hlist.__init__(self, [SsGlue()] + elements + [SsGlue()]) class VCentered(Hlist): - """A convenience class to create an Hlist whose contents are centered + """A convenience class to create an Vlist whose contents are centered within its enclosing box.""" def __init__(self, elements): Vlist.__init__(self, [Fill()] + elements + [Fill()]) @@ -1479,9 +1493,6 @@ if self.size < NUM_SIZE_LEVELS: self.width *= SHRINK_FACTOR -class Unset(Node): - pass - class SubSuperCluster(Hlist): """This class is a sort of hack to get around that fact that this code doesn't parse to an mlist and then an hlist, but goes directly @@ -1494,88 +1505,10 @@ self.super = None Hlist.__init__(self, []) - def is_overunder(self): - if isinstance(self.nucleus, Char): - return overunder_symbols.has_key(self.nucleus.c) - return False - def reconfigure(self, state): - """Lays out the nucleus, subscript and superscript, with - either the subscript or superscript being optional. - @756""" - rule_thickness = state.font_manager.get_underline_thickness(state.font) - xHeight = state.font_manager.get_xheight(state.font) - - if self.nucleus is None: - raise ParseError("Internal mathtext error. No nucleus in sub/superscript cluster.") - - if self.super is None and self.sub is None: - self.list_head = self.nucleus - return - - if self.is_overunder(): - vlist = [] - shift = 0. - width = max(self.super.width, self.nucleus.width, self.sub.width) - if self.super is not None: - hlist = HCentered([self.super]) - hlist.hpack(width, 'exactly') - vlist.extend([hlist, FixedGlue(rule_thickness * 2.0)]) - hlist = HCentered([self.nucleus]) - hlist.hpack(width, 'exactly') - vlist.append(hlist) - if self.sub is not None: - hlist = HCentered([self.sub]) - hlist.hpack(width, 'exactly') - vlist.extend([FixedGlue(rule_thickness), hlist]) - shift = hlist.height + hlist.depth + rule_thickness * 2.0 - x = Vlist(vlist) - x.shift_amount = shift - self.list_head = x - self.hpack() - return - - p = Hlist([self.nucleus]) - p.hpack() - shift_up = p.height - SUBDROP - shift_down = p.depth + SUBDROP - if self.super is None: - # @757 - x = Hlist([self.sub]) - x.width += SCRIPT_SPACE - shift_down = max(shift_down, SUB1) - clr = x.height - (abs(xHeight * 4.0) / 5.0) - shift_down = max(shift_down, clr) - x.shift_amount = shift_down - else: - x = Hlist([self.super]) - x.width += SCRIPT_SPACE - clr = SUP1 - shift_up = max(shift_up, SUP1) - clr = x.depth + (abs(xHeight) / 4.0) - shift_up = max(shift_up, clr) - if self.sub is None: - x.shift_amount = -shift_up - else: # Both sub and superscript - y = Hlist([self.sub]) - y.width += SCRIPT_SPACE - shift_down = max(shift_down, SUB1) - clr = 4.0 * rule_thickness - ((shift_up - x.depth) - (y.height - shift_down)) - if clr > 0.: - shift_up += clr - shift_down += clr - x.shift_amount = DELTA - x = Vlist([x, - Kern((shift_up - x.depth) - (y.height - shift_down)), - y]) - x.shift_amount = shift_down - - self.list_head = p - p.link = x - self.hpack() - class Ship(object): - """Since boxes can be inside of boxes inside of boxes, the main + """Once the boxes have been set up, this sends them to output. + Since boxes can be inside of boxes inside of boxes, the main work of Ship is done by two mutually recursive routines, hlist_out and vlist_out , which traverse the Hlists and Vlists inside of horizontal and vertical boxes. The global variables used in TeX to @@ -1728,112 +1661,70 @@ ship = Ship() -# TODO: Ligature nodes? (143) - -# TODO: Unset box? - ############################################################################## -# NOADS +# PARSER -class Noad: - def __init__(self): - self.link = None - self.nucleus = nucleus - self.subscr = subscr - self.superscr = superscr +class Parser: + _binary_operators = Set(r''' + + - * + \pm \sqcap \rhd + \mp \sqcup \unlhd + \times \vee \unrhd + \div \wedge \oplus + \ast \setminus \ominus + \star \wr \otimes + \circ \diamond \oslash + \bullet \bigtriangleup \odot + \cdot \bigtriangledown \bigcirc + \cap \triangleleft \dagger + \cup \triangleright \ddagger + \uplus \lhd \amalg'''.split()) -class OrdNoad(Noad): - pass + _relation_symbols = Set(r''' + = < > : + \leq \geq \equiv \models + \prec \succ \sim \perp + \preceq \succeq \simeq \mid + \ll \gg \asymp \parallel + \subset \supset \approx \bowtie + \subseteq \supseteq \cong \Join + \sqsubset \sqsupset \neq \smile + \sqsubseteq \sqsupseteq \doteq \frown + \in \ni \propto + \vdash \dashv'''.split()) -class OpNoad(Noad): - pass + _arrow_symbols = Set(r''' + \leftarrow \longleftarrow \uparrow + \Leftarrow \Longleftarrow \Uparrow + \rightarrow \longrightarrow \downarrow + \Rightarrow \Longrightarrow \Downarrow + \leftrightarrow \longleftrightarrow \updownarrow + \Leftrightarrow \Longleftrightarrow \Updownarrow + \mapsto \longmapsto \nearrow + \hookleftarrow \hookrightarrow \searrow + \leftharpoonup \rightharpoonup \swarrow + \leftharpoondown \rightharpoondown \nwarrow + \rightleftharpoons \leadsto'''.split()) -class BinNoad(Noad): - pass + _spaced_symbols = _binary_operators | _relation_symbols | _arrow_symbols -class RelNoad(Noad): - pass - -class OpenNoad(Noad): - pass - -class CloseNoad(Noad): - pass - -class PunctNoad(Noad): - pass - -class InnerNoad(Noad): - pass - -class RadicalNoad(Noad): + _delimiter_symbols = Set(r', ; . !'.split()) + def __init__(self): - Noad.__init__(self) - self.left_delim = None - -class FractionNoad(Noad): - def __init__(self): - Noad.__init__(self) - self.num = None - self.denom = None - self.thickness = None - self.left_delim = None - self.right_delim = None - -class UnderNoad(Noad): - pass - -class OverNoad(Noad): - pass - -class AccentNoad(Noad): - def __init__(self): - Noad__init__(self) - self.accent = None - -class VCenterNoad(Noad): - pass - -class LeftNoad(Noad): - pass - -class RightNoad(Noad): - pass - -class StyleNoad(Noad): - def __init__(self, subtype): - self.subtype = subtype - -############################################################################## -# PARSER - -class Parser: - class State: - def __init__(self, font_manager, font, fontsize, dpi): - self.font_manager = font_manager - self.font = font - self.fontsize = fontsize - self.dpi = dpi - - def copy(self): - return Parser.State( - self.font_manager, - self.font, - self.fontsize, - self.dpi) - - def __init__(self): # All forward declarations are here font = Forward().setParseAction(self.font).setName("font") - latexfont = Forward().setParseAction(self.latexfont).setName("latexfont") + latexfont = Forward() subsuper = Forward().setParseAction(self.subsuperscript).setName("subsuper") - overunder = Forward().setParseAction(self.overunder).setName("overunder") placeable = Forward().setName("placeable") simple = Forward().setName("simple") self._expression = Forward().setParseAction(self.finish).setName("finish") - lbrace = Literal('{').suppress().setParseAction(self.start_group).setName("start_group") - rbrace = Literal('}').suppress().setParseAction(self.end_group).setName("end_group") + lbrace = Literal('{').suppress() + rbrace = Literal('}').suppress() + start_group = (Optional(latexfont) + lbrace) + start_group.setParseAction(self.start_group) + end_group = rbrace + end_group.setParseAction(self.end_group) lbrack = Literal('[') rbrack = Literal(']') lparen = Literal('(') @@ -1911,45 +1802,31 @@ r"[:,.;!]", r"[!@%&]", r"[[\]()]", - r"\\\$" + r"\\\$", + r"\\\%" ]) + ")" ).setParseAction(self.symbol).leaveWhitespace() - _symbol =(texsym - | char - | binop - | relation - | punctuation - | misc - | grouping - ).setParseAction(self.symbol).leaveWhitespace() - accent = Group( Combine(bslash + accent) - + Optional(lbrace) - + symbol - + Optional(rbrace) + + placeable ).setParseAction(self.accent).setName("accent") function =(Suppress(bslash) + function).setParseAction(self.function).setName("function") group = Group( - lbrace - + OneOrMore( - simple - ) - + rbrace + start_group + + OneOrMore(simple) + + end_group ).setParseAction(self.group).setName("group") font <<(Suppress(bslash) + fontname) - latexfont << Group( - Suppress(bslash) - + latex2efont - + group) + latexfont <<(Suppress(bslash) + + latex2efont) frac = Group( Suppress( @@ -1969,43 +1846,22 @@ simple <<(space | font - | latexfont - | overunder) + | subsuper) subsuperop =(Literal("_") | Literal("^") ) subsuper << Group( - ( - placeable - + ZeroOrMore( + ( placeable + + OneOrMore( subsuperop - + subsuper + + placeable ) ) - | (subsuperop + placeable) + | placeable ) - overunderop =( - ( Suppress(bslash) - + Literal(r"over") - ) - | ( Suppress(bslash) - + Literal(r"under") - ) - ) - - overunder << Group( - ( - subsuper - + ZeroOrMore( - overunderop - + overunder - ) - ) - ) - math = OneOrMore( simple ).setParseAction(self.math).setName("math") @@ -2030,7 +1886,25 @@ self._state_stack = [self.State(fonts_object, default_font, fontsize, dpi)] self._expression.parseString(s) return self._expr - + + # The state of the parser is maintained in a stack. Upon + # entering and leaving a group { } or math/non-math, the stack + # is pushed and popped accordingly. The current state always + # exists in the top element of the stack. + class State: + def __init__(self, font_output, font, fontsize, dpi): + self.font_output = font_output + self.font = font + self.fontsize = fontsize + self.dpi = dpi + + def copy(self): + return Parser.State( + self.font_output, + self.font, + self.fontsize, + self.dpi) + def get_state(self): return self._state_stack[-1] @@ -2051,31 +1925,39 @@ def non_math(self, s, loc, toks): #~ print "non_math", toks - # This is a hack, but it allows the system to use the - # proper amount of advance when going from non-math to math symbols = [Char(c, self.get_state()) for c in toks[0]] hlist = Hlist(symbols) self.push_state() # We're going into math now, so set font to 'it' self.get_state().font = 'it' return [hlist] - - def space(self, s, loc, toks): - assert(len(toks)==1) + + def _make_space(self, percentage): state = self.get_state() - metrics = state.font_manager.get_metrics( + metrics = state.font_output.get_metrics( state.font, 'm', state.fontsize, state.dpi) em = metrics.width - + return Hbox(em * percentage) + + def space(self, s, loc, toks): + assert(len(toks)==1) if toks[0]==r'\ ': num = 0.30 # 30% of fontsize elif toks[0]==r'\/': num = 0.1 # 10% of fontsize - else: # vspace + else: # hspace num = float(toks[0][1]) # get the num out of \hspace{num} - box = Hbox(num * em) + box = self._make_space(num) return [box] def symbol(self, s, loc, toks): + c = toks[0] + if c in self._spaced_symbols: + return [Hlist([self._make_space(0.3), + Char(c, self.get_state()), + self._make_space(0.3)])] + elif c in self._delimiter_symbols: + return [Hlist([Char(c, self.get_state()), + self._make_space(0.3)])] return [Char(toks[0], self.get_state())] _accent_map = { @@ -2099,7 +1981,8 @@ def accent(self, s, loc, toks): assert(len(toks)==1) state = self.get_state() - thickness = state.font_manager.get_underline_thickness(state.font) + thickness = state.font_output.get_underline_thickness( + state.font, state.fontsize) accent, sym = toks[0] accent = Accent(self._accent_map[accent], self.get_state()) centered = HCentered([accent]) @@ -2122,6 +2005,10 @@ def start_group(self, s, loc, toks): self.push_state() + # Deal with LaTeX-style font tokens + if len(toks): + self.get_state().font = toks[0][4:] + return [] def group(self, s, loc, toks): grp = Hlist(toks[0]) @@ -2129,6 +2016,7 @@ def end_group(self, s, loc, toks): self.pop_state() + return [] def font(self, s, loc, toks): assert(len(toks)==1) @@ -2136,64 +2024,124 @@ self.get_state().font = name return [] - def latexfont(self, s, loc, toks): - # MGDTODO: Not really working - assert(len(toks)==1) - name, grp = toks[0] - if len(grp.elements): - - font = FontElement(name[4:]) - font.neighbors['right'] = grp.elements[0] - grp.elements.insert(0, font) - return [grp] - return [] + def is_overunder(self, nucleus): + if isinstance(nucleus, Char): + return overunder_symbols.has_key(nucleus.c) + return False def subsuperscript(self, s, loc, toks): assert(len(toks)==1) - #~ print 'subsuperscript', toks + # print 'subsuperscript', toks + nucleus = None + sub = None + super = None + if len(toks[0]) == 1: return toks[0].asList() - if len(toks[0]) == 3: - prev, op, next = toks[0] elif len(toks[0]) == 2: - prev = Hbox(0.) op, next = toks[0] - else: - raise ParseFatalException("Unable to parse subscript/superscript construct.") - - # Handle the case of double scripts - if isinstance(next, SubSuperCluster): - x = next + nucleus = Hbox(0.0) if op == '_': - if next.sub is not None: + sub = next + else: + super = next + elif len(toks[0]) == 3: + nucleus, op, next = toks[0] + if op == '_': + sub = next + else: + super = next + elif len(toks[0]) == 5: + nucleus, op1, next1, op2, next2 = toks[0] + if op1 == op2: + if op1 == '_': raise ParseFatalException("Double subscript") - x.sub = x.nucleus - x.sub.shrink() - x.sub.pack() - x.nucleus = prev - elif op == '^': - if next.super is not None: + else: raise ParseFatalException("Double superscript") - x.super = x.nucleus - x.super.shrink() - x.super.pack() - x.nucleus = prev - else: - x = SubSuperCluster() - x.nucleus = prev - if op == '_': - x.sub = next - x.sub.shrink() - x.sub.pack() + if op1 == '_': + sub = next1 + super = next2 else: - x.super = next - x.super.shrink() - x.super.pack() - x.reconfigure(self.get_state()) + super = next1 + sub = next2 + else: + raise ParseFatalException("Subscript/superscript string is too long.") - return [x] + state = self.get_state() + rule_thickness = state.font_output.get_underline_thickness( + state.font, state.fontsize) + xHeight = state.font_output.get_xheight(state.font, state.fontsize) + + if self.is_overunder(nucleus): + vlist = [] + shift = 0. + width = nucleus.width + if super is not None: + super.shrink() + super.pack() + width = max(width, super.width) + if sub is not None: + sub.shrink() + sub.pack() + width = max(width, sub.width) + + if super is not None: + hlist = HCentered([super]) + hlist.hpack(width, 'exactly') + vlist.extend([hlist, FixedGlue(rule_thickness * 2.0)]) + hlist = HCentered([nucleus]) + hlist.hpack(width, 'exactly') + vlist.append(hlist) + if sub is not None: + hlist = HCentered([sub]) + hlist.hpack(width, 'exactly') + vlist.extend([FixedGlue(rule_thickness), hlist]) + shift = hlist.height + hlist.depth + rule_thickness * 2.0 + vlist = Vlist(vlist) + vlist.shift_amount = shift + result = Hlist([vlist]) + return [result] + shift_up = nucleus.height - SUBDROP + shift_down = nucleus.depth + SUBDROP + if super is None: + # @757 + sub.shrink() + x = Hlist([sub]) + #x.width += SCRIPT_SPACE + shift_down = max(shift_down, SUB1) + clr = x.height - (abs(xHeight * 4.0) / 5.0) + shift_down = max(shift_down, clr) + x.shift_amount = shift_down + else: + super.shrink() + x = Hlist([super]) + #x.width += SCRIPT_SPACE + clr = SUP1 + shift_up = max(shift_up, SUP1) + clr = x.depth + (abs(xHeight) / 4.0) + shift_up = max(shift_up, clr) + if sub is None: + x.shift_amount = -shift_up + else: # Both sub and superscript + sub.shrink() + y = Hlist([sub]) + #y.width += SCRIPT_SPACE + shift_down = max(shift_down, SUB1) + clr = 4.0 * rule_thickness - ((shift_up - x.depth) - (y.height - shift_down)) + if clr > 0.: + shift_up += clr + shift_down += clr + x.shift_amount = DELTA + x = Vlist([x, + Kern((shift_up - x.depth) - (y.height - shift_down)), + y]) + x.shift_amount = shift_down + + result = Hlist([nucleus, x]) + return [result] + def frac(self, s, loc, toks): assert(len(toks)==1) assert(len(toks[0])==2) @@ -2206,7 +2154,8 @@ cnum.hpack(width, 'exactly') cden.hpack(width, 'exactly') state = self.get_state() - thickness = state.font_manager.get_underline_thickness(state.font) + thickness = state.font_output.get_underline_thickness( + state.font, state.fontsize) space = thickness * 3.0 vlist = Vlist([cnum, FixedGlue(thickness * 2.0), @@ -2215,13 +2164,14 @@ cden ]) - metrics = state.font_manager.get_metrics( + metrics = state.font_output.get_metrics( state.font, '=', state.fontsize, state.dpi) shift = cden.height - (metrics.ymax + metrics.ymin) / 2 + thickness * 2.5 vlist.shift_amount = shift - return [vlist] - overunder = subsuperscript + hlist = Hlist([vlist, FixedGlue(thickness * 2.)]) + return [hlist] + #### @@ -2256,17 +2206,17 @@ use_afm = False if self.output == 'SVG': - font_manager = BakomaSVGFonts() + font_output = BakomaSVGFonts() elif self.output == 'Agg': - font_manager = BakomaFonts() + font_output = BakomaFonts() elif self.output == 'PS': if rcParams['ps.useafm']: - font_manager = StandardPSFonts() + font_output = StandardPSFonts() use_afm = True else: - font_manager = BakomaPSFonts() + font_output = BakomaPSFonts() elif self.output == 'PDF': - font_manager = BakomaPDFFonts() + font_output = BakomaPDFFonts() fontsize = prop.get_size_in_points() @@ -2280,25 +2230,32 @@ if self.parser is None: self.__class__.parser = Parser() - box = self.parser.parse(s, font_manager, default_font, fontsize, dpi) + box = self.parser.parse(s, font_output, default_font, fontsize, dpi) w, h = box.width, box.height + box.depth w += 4 h += 4 - font_manager.set_canvas_size(w,h) + if self.output in ('SVG', 'Agg'): + font_output.set_canvas_size(w,h) + elif self.output == 'PS': + pswriter = StringIO() + font_output.set_canvas_size(w, h, pswriter) + elif self.output == 'PDF': + pswriter = list() + font_output.set_canvas_size(w, h, pswriter) ship(2, 2, box) if self.output == 'SVG': # The empty list at the end is for lines - svg_elements = Bunch(svg_glyphs=self.font_manager.svg_glyphs, - svg_lines=[]) + svg_elements = Bunch(svg_glyphs=font_output.svg_glyphs, + svg_rects=font_output.svg_rects) self.cache[cacheKey] = \ - w, h, svg_elements, font_manager.get_used_characters() + w, h, svg_elements, font_output.get_used_characters() elif self.output == 'Agg': self.cache[cacheKey] = \ - w, h, font_manager.get_fonts(), font_manager.get_used_characters() + w, h, font_output.get_fonts(), font_output.get_used_characters() elif self.output in ('PS', 'PDF'): self.cache[cacheKey] = \ - w, h, pswriter, font_manager.get_used_characters() + w, h, pswriter, font_output.get_used_characters() return self.cache[cacheKey] if rcParams["mathtext.mathtext2"]: @@ -2309,52 +2266,3 @@ math_parse_s_ft2font_svg = math_parse_s_ft2font_common('SVG') math_parse_s_ps = math_parse_s_ft2font_common('PS') math_parse_s_pdf = math_parse_s_ft2font_common('PDF') - -if 0: #__name__=='___main__': - - stests = [ - r'$dz/dt \/ = \/ \gamma x^2 \/ + \/ \rm{sin}(2\pi y+\phi)$', - r'$dz/dt \/ = \/ \gamma xy^2 \/ + \/ \rm{s}(2\pi y+\phi)$', - r'$x^1 2$', - r'$\alpha_{i+1}^j \/ = \/ \rm{sin}(2\pi f_j t_i) e^{-5 t_i/\tau}$', - r'$\cal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\rm{sin}(2 \pi f x_i)$', - r'$\bigodot \bigoplus \cal{R} a_i\rm{sin}(2 \pi f x_i)$', - r'$x_i$', - r'5ドル\/\angstrom\hspace{ 2.0 }\pi$', - r'$x+1$', - r'$i$', - r'$i^j$', - ] - #~ w, h, fonts = math_parse_s_ft2font(s, 20, 72) - for s in stests: - try: - print s - print (expression + StringEnd()).parseString( s[1:-1] ) - except ParseException, pe: - print "*** ERROR ***", pe.msg - print s - print 'X' + (' '*pe.loc)+'^' - # how far did we get? - print expression.parseString( s[1:-1] ) - print - - #w, h, fonts = math_parse_s_ps(s, 20, 72) - -# MGDTODO: Below here is out-of-date -if __name__=='__main__': - Element.fonts = DummyFonts() - for i in range(5,20): - s = '10ドル^{%02d}$'%i - print 'parsing', s - w, h, fonts = math_parse_s_ft2font(s, dpi=27, fontsize=12, angle=0) - if 0: - Element.fonts = DummyFonts() - handler.clear() - expression.parseString( s ) - - handler.expr.set_size_info(12, 72) - - # set the origin once to allow w, h compution - handler.expr.set_origin(0, 0) - for e in handler.symbols: - assert(hasattr(e, 'metrics')) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3537 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3537&view=rev Author: mdboom Date: 2007年07月16日 05:02:47 -0700 (2007年7月16日) Log Message: ----------- Updated pyparsing to latest stable version (1.4.6) and updating mathtext to support it. Modified Paths: -------------- branches/mathtext_mgd/lib/matplotlib/mathtext.py branches/mathtext_mgd/lib/matplotlib/pyparsing.py Modified: branches/mathtext_mgd/lib/matplotlib/mathtext.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月16日 08:01:21 UTC (rev 3536) +++ branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月16日 12:02:47 UTC (rev 3537) @@ -135,7 +135,8 @@ from matplotlib import verbose from matplotlib.pyparsing import Literal, Word, OneOrMore, ZeroOrMore, \ Combine, Group, Optional, Forward, NotAny, alphas, nums, alphanums, \ - StringStart, StringEnd, ParseException, FollowedBy, Regex + StringStart, StringEnd, ParseException, FollowedBy, Regex, \ + operatorPrecedence, opAssoc, ParseResults from matplotlib.afm import AFM from matplotlib.cbook import enumerate, iterable, Bunch @@ -1259,7 +1260,7 @@ def expression(self, s, loc, toks): self.expr = ExpressionElement(toks) - return loc, [self.expr] + return [self.expr] def space(self, s, loc, toks): assert(len(toks)==1) @@ -1271,7 +1272,7 @@ element = SpaceElement(num) self.symbols.append(element) - return loc, [element] + return [element] def symbol(self, s, loc, toks): @@ -1300,7 +1301,7 @@ sym = SymbolElement(toks[0]) self.symbols.append(sym) - return loc, [sym] + return [sym] def composite(self, s, loc, toks): @@ -1315,7 +1316,7 @@ self.symbols.append(sym0) self.symbols.append(sym1) - return loc, [sym0] + return [sym0] def accent(self, s, loc, toks): @@ -1343,13 +1344,13 @@ sym.neighbors['above'] = above sym.set_pady(1) self.symbols.append(above) - return loc, [sym] + return [sym] def group(self, s, loc, toks): assert(len(toks)==1) #print 'grp', toks grp = GroupElement(toks[0]) - return loc, [grp] + return [grp] def font(self, s, loc, toks): @@ -1357,7 +1358,7 @@ name, grp = toks[0] #print 'fontgrp', toks grp.set_font(name[1:]) # suppress the slash - return loc, [grp] + return [grp] def subscript(self, s, loc, toks): assert(len(toks)==1) @@ -1391,7 +1392,7 @@ else: prev.neighbors['superscript'] = next - return loc, [prev] + return [prev] def subsuperscript(self, s, loc, toks): assert(len(toks)==1) @@ -1405,7 +1406,7 @@ prev.neighbors['subscript'] = down prev.neighbors['superscript'] = up - return loc, [prev] + return [prev] Modified: branches/mathtext_mgd/lib/matplotlib/pyparsing.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/pyparsing.py 2007年07月16日 08:01:21 UTC (rev 3536) +++ branches/mathtext_mgd/lib/matplotlib/pyparsing.py 2007年07月16日 12:02:47 UTC (rev 3537) @@ -1,6 +1,6 @@ # module pyparsing.py # -# Copyright (c) 2003,2004,2005 Paul T. McGuire +# Copyright (c) 2003-2007 Paul T. McGuire # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,27 +21,24 @@ # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -# Todo: -# - add pprint() - pretty-print output of defined BNF -# #from __future__ import generators __doc__ = \ """ pyparsing module - Classes and methods to define and execute parsing grammars -The pyparsing module is an alternative approach to creating and executing simple grammars, +The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions. With pyparsing, you -don't need to learn a new syntax for defining grammars or matching expressions - the parsing module +don't need to learn a new syntax for defining grammars or matching expressions - the parsing module provides a library of classes that you use to construct the grammar directly in Python. Here is a program to parse "Hello, World!" (or any greeting of the form "<salutation>, <addressee>!"):: from pyparsing import Word, alphas - + # define grammar of a greeting - greet = Word( alphas ) + "," + Word( alphas ) + "!" - + greet = Word( alphas ) + "," + Word( alphas ) + "!" + hello = "Hello, World!" print hello, "->", greet.parseString( hello ) @@ -49,10 +46,10 @@ Hello, World! -> ['Hello', ',', 'World', '!'] -The Python representation of the grammar is quite readable, owing to the self-explanatory +The Python representation of the grammar is quite readable, owing to the self-explanatory class names, and the use of '+', '|' and '^' operators. -The parsed results returned from parseString() can be accessed as a nested list, a dictionary, or an +The parsed results returned from parseString() can be accessed as a nested list, a dictionary, or an object with named attributes. The pyparsing module handles some of the problems that are typically vexing when writing text parsers: @@ -60,15 +57,18 @@ - quoted strings - embedded comments """ -__version__ = "1.3.4alpha1" -__versionTime__ = "14 December 2005 05:48" +__version__ = "1.4.6" +__versionTime__ = "11 April 2007 16:41" __author__ = "Paul McGuire <pt...@us...>" import string +from weakref import ref as wkref import copy,sys import warnings import re -#sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) ) +import sre_constants +import xml.sax.saxutils +#~ sys.stderr.write( "testing pyparsing module, version %s, %s\n" % (__version__,__versionTime__ ) ) def _ustr(obj): """Drop-in replacement for str(obj) that tries to be Unicode friendly. It first tries @@ -79,7 +79,7 @@ # If this works, then _ustr(obj) has the same behaviour as str(obj), so # it won't break any existing code. return str(obj) - + except UnicodeEncodeError, e: # The Python docs (http://docs.python.org/ref/customization.html#l2h-182) # state that "The return value must be a string object". However, does a @@ -96,21 +96,29 @@ def _str2dict(strg): return dict( [(c,0) for c in strg] ) + #~ return set( [c for c in strg] ) +class _Constants(object): + pass + alphas = string.lowercase + string.uppercase nums = string.digits hexnums = nums + "ABCDEFabcdef" -alphanums = alphas + nums +alphanums = alphas + nums class ParseBaseException(Exception): """base exception class for all parsing runtime exceptions""" __slots__ = ( "loc","msg","pstr","parserElement" ) # Performance tuning: we construct a *lot* of these, so keep this - # constructor as small and fast as possible - def __init__( self, pstr, loc, msg, elem=None ): + # constructor as small and fast as possible + def __init__( self, pstr, loc=0, msg=None, elem=None ): self.loc = loc - self.msg = msg - self.pstr = pstr + if msg is None: + self.msg = pstr + self.pstr = "" + else: + self.msg = msg + self.pstr = pstr self.parserElement = elem def __getattr__( self, aname ): @@ -129,55 +137,78 @@ raise AttributeError, aname def __str__( self ): - return "%s (at char %d), (line:%d, col:%d)" % ( self.msg, self.loc, self.lineno, self.column ) + return "%s (at char %d), (line:%d, col:%d)" % \ + ( self.msg, self.loc, self.lineno, self.column ) def __repr__( self ): return _ustr(self) def markInputline( self, markerString = ">!<" ): - """Extracts the exception line from the input string, and marks + """Extracts the exception line from the input string, and marks the location of the exception with a special symbol. """ line_str = self.line line_column = self.column - 1 if markerString: - line_str = "".join( [line_str[:line_column], markerString, line_str[line_column:]]) + line_str = "".join( [line_str[:line_column], + markerString, line_str[line_column:]]) return line_str.strip() class ParseException(ParseBaseException): - """exception thrown when parse expressions don't match class""" - """supported attributes by name are: + """exception thrown when parse expressions don't match class; + supported attributes by name are: - lineno - returns the line number of the exception text - col - returns the column number of the exception text - line - returns the line containing the exception text """ pass - + class ParseFatalException(ParseBaseException): """user-throwable exception thrown when inconsistent parse content is found; stops all parsing immediately""" pass +#~ class ReparseException(ParseBaseException): + #~ """Experimental class - parse actions can raise this exception to cause + #~ pyparsing to reparse the input string: + #~ - with a modified input string, and/or + #~ - with a modified start location + #~ Set the values of the ReparseException in the constructor, and raise the + #~ exception in a parse action to cause pyparsing to use the new string/location. + #~ Setting the values as None causes no change to be made. + #~ """ + #~ def __init_( self, newstring, restartLoc ): + #~ self.newParseText = newstring + #~ self.reparseLoc = restartLoc + class RecursiveGrammarException(Exception): """exception thrown by validate() if the grammar could be improperly recursive""" def __init__( self, parseElementList ): self.parseElementTrace = parseElementList - + def __str__( self ): return "RecursiveGrammarException: %s" % self.parseElementTrace +class _ParseResultsWithOffset(object): + def __init__(self,p1,p2): + self.tup = (p1,p2) + def __getitem__(self,i): + return self.tup[i] + def __repr__(self): + return repr(self.tup) + class ParseResults(object): """Structured parse results, to provide multiple means of access to the parsed data: - as a list (len(results)) - by list index (results[0], results[1], etc.) - by attribute (results.<resultsName>) """ - __slots__ = ( "__toklist", "__tokdict", "__doinit", "__name", "__parent", "__modal" ) + __slots__ = ( "__toklist", "__tokdict", "__doinit", "__name", "__parent", "__accumNames", "__weakref__" ) def __new__(cls, toklist, name=None, asList=True, modal=True ): if isinstance(toklist, cls): return toklist retobj = object.__new__(cls) retobj.__doinit = True return retobj - + # Performance tuning: we construct a *lot* of these, so keep this # constructor as small and fast as possible def __init__( self, toklist, name=None, asList=True, modal=True ): @@ -185,77 +216,87 @@ self.__doinit = False self.__name = None self.__parent = None - self.__modal = modal + self.__accumNames = {} if isinstance(toklist, list): self.__toklist = toklist[:] else: self.__toklist = [toklist] self.__tokdict = dict() + # this line is related to debugging the asXML bug + #~ asList = False + if name: - if not self.__name: - self.__modal = self.__modal and modal + if not modal: + self.__accumNames[name] = 0 if isinstance(name,int): name = _ustr(name) # will always return a str, but use _ustr for consistency self.__name = name - if toklist: - if isinstance(toklist,basestring): + if not toklist in (None,'',[]): + if isinstance(toklist,basestring): toklist = [ toklist ] if asList: if isinstance(toklist,ParseResults): - self[name] = (toklist.copy(),-1) + self[name] = _ParseResultsWithOffset(toklist.copy(),-1) else: - self[name] = (ParseResults(toklist[0]),-1) + self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]),-1) self[name].__name = name else: try: self[name] = toklist[0] - except TypeError: + except (KeyError,TypeError): self[name] = toklist def __getitem__( self, i ): if isinstance( i, (int,slice) ): return self.__toklist[i] else: - if self.__modal: + if i not in self.__accumNames: return self.__tokdict[i][-1][0] else: return ParseResults([ v[0] for v in self.__tokdict[i] ]) def __setitem__( self, k, v ): - if isinstance(v,tuple): + if isinstance(v,_ParseResultsWithOffset): self.__tokdict[k] = self.__tokdict.get(k,list()) + [v] sub = v[0] + elif isinstance(k,int): + self.__toklist[k] = v + sub = v else: self.__tokdict[k] = self.__tokdict.get(k,list()) + [(v,0)] sub = v if isinstance(sub,ParseResults): - sub.__parent = self - + sub.__parent = wkref(self) + def __delitem__( self, i ): - del self.__toklist[i] + if isinstance(i,(int,slice)): + del self.__toklist[i] + else: + del self._tokdict[i] def __contains__( self, k ): return self.__tokdict.has_key(k) - + def __len__( self ): return len( self.__toklist ) + def __nonzero__( self ): return len( self.__toklist ) > 0 def __iter__( self ): return iter( self.__toklist ) - def keys( self ): + def keys( self ): """Returns all named result keys.""" return self.__tokdict.keys() - - def items( self ): + + def items( self ): """Returns all named result keys and values as a list of tuples.""" - return [(k,v[-1][0]) for k,v in self.__tokdict.items()] - - def values( self ): + return [(k,self[k]) for k in self.__tokdict.keys()] + + def values( self ): """Returns all named result values.""" return [ v[-1][0] for v in self.__tokdict.values() ] def __getattr__( self, name ): if name not in self.__slots__: if self.__tokdict.has_key( name ): - if self.__modal: + if name not in self.__accumNames: return self.__tokdict[name][-1][0] else: return ParseResults([ v[0] for v in self.__tokdict[name] ]) @@ -263,19 +304,27 @@ return "" return None + def __add__( self, other ): + ret = self.copy() + ret += other + return ret + def __iadd__( self, other ): if other.__tokdict: offset = len(self.__toklist) addoffset = ( lambda a: (a<0 and offset) or (a+offset) ) - otherdictitems = [(k,(v[0],addoffset(v[1])) ) for (k,vlist) in other.__tokdict.items() for v in vlist] + otheritems = other.__tokdict.items() + otherdictitems = [(k, _ParseResultsWithOffset(v[0],addoffset(v[1])) ) + for (k,vlist) in otheritems for v in vlist] for k,v in otherdictitems: self[k] = v if isinstance(v[0],ParseResults): - v[0].__parent = self + v[0].__parent = wkref(self) self.__toklist += other.__toklist + self.__accumNames.update( other.__accumNames ) del other return self - + def __repr__( self ): return "(%s, %s)" % ( repr( self.__toklist ), repr( self.__tokdict ) ) @@ -321,45 +370,52 @@ ret = ParseResults( self.__toklist ) ret.__tokdict = self.__tokdict.copy() ret.__parent = self.__parent - ret.__modal = self.__modal + ret.__accumNames.update( self.__accumNames ) ret.__name = self.__name return ret - + def asXML( self, doctag=None, namedItemsOnly=False, indent="", formatted=True ): """Returns the parse results as XML. Tags are created for tokens and lists that have defined results names.""" nl = "\n" out = [] - namedItems = dict( [ (v[1],k) for (k,vlist) in self.__tokdict.items() for v in vlist ] ) + namedItems = dict( [ (v[1],k) for (k,vlist) in self.__tokdict.items() + for v in vlist ] ) nextLevelIndent = indent + " " - + # collapse out indents if formatting is not desired if not formatted: indent = "" nextLevelIndent = "" nl = "" - + selfTag = None if doctag is not None: selfTag = doctag else: if self.__name: selfTag = self.__name - + if not selfTag: if namedItemsOnly: return "" else: selfTag = "ITEM" - + out += [ nl, indent, "<", selfTag, ">" ] - + worklist = self.__toklist for i,res in enumerate(worklist): if isinstance(res,ParseResults): if i in namedItems: - out += [ res.asXML(namedItems[i], namedItemsOnly and doctag is None, nextLevelIndent,formatted)] + out += [ res.asXML(namedItems[i], + namedItemsOnly and doctag is None, + nextLevelIndent, + formatted)] else: - out += [ res.asXML(None, namedItemsOnly and doctag is None, nextLevelIndent,formatted)] + out += [ res.asXML(None, + namedItemsOnly and doctag is None, + nextLevelIndent, + formatted)] else: # individual token, see if there is a name for it resTag = None @@ -370,51 +426,110 @@ continue else: resTag = "ITEM" - out += [ nl, nextLevelIndent, "<", resTag, ">", _ustr(res), "</", resTag, ">" ] - + xmlBodyText = xml.sax.saxutils.escape(_ustr(res)) + out += [ nl, nextLevelIndent, "<", resTag, ">", + xmlBodyText, + "</", resTag, ">" ] + out += [ nl, indent, "</", selfTag, ">" ] return "".join(out) - def __lookup(self,sub): for k,vlist in self.__tokdict.items(): for v,loc in vlist: if sub is v: return k return None - + def getName(self): """Returns the results name for this token expression.""" if self.__name: return self.__name elif self.__parent: - par = self.__parent + par = self.__parent() if par: return par.__lookup(self) else: return None - elif (len(self) == 1 and + elif (len(self) == 1 and len(self.__tokdict) == 1 and self.__tokdict.values()[0][0][1] in (0,-1)): return self.__tokdict.keys()[0] else: return None + + def dump(self,indent='',depth=0): + """Diagnostic method for listing out the contents of a ParseResults. + Accepts an optional indent argument so that this string can be embedded + in a nested display of other data.""" + out = [] + out.append( indent+_ustr(self.asList()) ) + keys = self.items() + keys.sort() + for k,v in keys: + if out: + out.append('\n') + out.append( "%s%s- %s: " % (indent,(' '*depth), k) ) + if isinstance(v,ParseResults): + if v.keys(): + #~ out.append('\n') + out.append( v.dump(indent,depth+1) ) + #~ out.append('\n') + else: + out.append(_ustr(v)) + else: + out.append(_ustr(v)) + #~ out.append('\n') + return "".join(out) + # add support for pickle protocol + def __getstate__(self): + return ( self.__toklist, + ( self.__tokdict.copy(), + self.__parent is not None and self.__parent() or None, + self.__accumNames, + self.__name ) ) + + def __setstate__(self,state): + self.__toklist = state[0] + self.__tokdict, \ + par, \ + inAccumNames, \ + self.__name = state[1] + self.__accumNames = {} + self.__accumNames.update(inAccumNames) + if par is not None: + self.__parent = wkref(par) + else: + self.__parent = None + + def col (loc,strg): - """Returns current column within a string, counting newlines as line separators + """Returns current column within a string, counting newlines as line separators. The first column is number 1. + + Note: the default parsing behavior is to expand tabs in the input string + before starting the parsing process. See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information + on parsing strings containing <TAB>s, and suggested methods to maintain a + consistent view of the parsed string, the parse location, and line and column + positions within the parsed string. """ - return loc - strg.rfind("\n", 0, loc) + return (loc<len(strg) and strg[loc] == '\n') and 1 or loc - strg.rfind("\n", 0, loc) def lineno(loc,strg): - """Returns current line number within a string, counting newlines as line separators + """Returns current line number within a string, counting newlines as line separators. The first line is number 1. + + Note: the default parsing behavior is to expand tabs in the input string + before starting the parsing process. See L{I{ParserElement.parseString}<ParserElement.parseString>} for more information + on parsing strings containing <TAB>s, and suggested methods to maintain a + consistent view of the parsed string, the parse location, and line and column + positions within the parsed string. """ return strg.count("\n",0,loc) + 1 def line( loc, strg ): - """Returns the line of text containing loc within a string, counting newlines as line separators - The first line is number 1. + """Returns the line of text containing loc within a string, counting newlines as line separators. """ lastCR = strg.rfind("\n", 0, loc) nextCR = strg.find("\n", loc) @@ -424,13 +539,13 @@ return strg[lastCR+1:] def _defaultStartDebugAction( instring, loc, expr ): - print "Match",expr,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ) + print "Match",_ustr(expr),"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ) def _defaultSuccessDebugAction( instring, startloc, endloc, expr, toks ): - print "Matched",expr,"->",toks.asList() - + print "Matched",_ustr(expr),"->",toks.asList() + def _defaultExceptionDebugAction( instring, loc, expr, exc ): - print "Exception raised:", exc + print "Exception raised:", _ustr(exc) def nullDebugAction(*args): """'Do-nothing' debug action, to suppress debugging output during parsing.""" @@ -439,37 +554,44 @@ class ParserElement(object): """Abstract base level parser element class.""" DEFAULT_WHITE_CHARS = " \n\t\r" - + def setDefaultWhitespaceChars( chars ): """Overrides the default whitespace chars """ ParserElement.DEFAULT_WHITE_CHARS = chars setDefaultWhitespaceChars = staticmethod(setDefaultWhitespaceChars) - + def __init__( self, savelist=False ): - self.parseAction = None + self.parseAction = list() + self.failAction = None #~ self.name = "<unknown>" # don't define self.name, let subclasses try/except upcall self.strRepr = None self.resultsName = None self.saveAsList = savelist self.skipWhitespace = True self.whiteChars = ParserElement.DEFAULT_WHITE_CHARS - self.mayReturnEmpty = False + self.copyDefaultWhiteChars = True + self.mayReturnEmpty = False # used when checking for left-recursion self.keepTabs = False - self.ignoreExprs = [] + self.ignoreExprs = list() self.debug = False self.streamlined = False - self.mayIndexError = True + self.mayIndexError = True # used to optimize exception handling for subclasses that don't advance parse index self.errmsg = "" - self.modalResults = True - self.debugActions = ( None, None, None ) + self.modalResults = True # used to mark results names as modal (report only last) or cumulative (list all) + self.debugActions = ( None, None, None ) #custom debug actions self.re = None + self.callPreparse = True # used to avoid redundant calls to preParse + self.callDuringTry = False def copy( self ): - """Make a copy of this ParseElement. Useful for defining different parse actions + """Make a copy of this ParserElement. Useful for defining different parse actions for the same parsing pattern, using copies of the original parse element.""" cpy = copy.copy( self ) - cpy.whiteChars = ParserElement.DEFAULT_WHITE_CHARS + cpy.parseAction = self.parseAction[:] + cpy.ignoreExprs = self.ignoreExprs[:] + if self.copyDefaultWhiteChars: + cpy.whiteChars = ParserElement.DEFAULT_WHITE_CHARS return cpy def setName( self, name ): @@ -479,9 +601,9 @@ return self def setResultsName( self, name, listAllMatches=False ): - """Define name for referencing matching tokens as a nested attribute + """Define name for referencing matching tokens as a nested attribute of the returned parse results. - NOTE: this returns a *copy* of the original ParseElement object; + NOTE: this returns a *copy* of the original ParserElement object; this is so that the client can define a basic element, such as an integer, and reference it in multiple places with different names. """ @@ -490,19 +612,111 @@ newself.modalResults = not listAllMatches return newself - def setParseAction( self, fn ): + def normalizeParseActionArgs( f ): + """Internal method used to decorate parse actions that take fewer than 3 arguments, + so that all parse actions can be called as f(s,l,t).""" + STAR_ARGS = 4 + + try: + restore = None + if isinstance(f,type): + restore = f + f = f.__init__ + if f.func_code.co_flags & STAR_ARGS: + return f + numargs = f.func_code.co_argcount + if hasattr(f,"im_self"): + numargs -= 1 + if restore: + f = restore + except AttributeError: + try: + # not a function, must be a callable object, get info from the + # im_func binding of its bound __call__ method + if f.__call__.im_func.func_code.co_flags & STAR_ARGS: + return f + numargs = f.__call__.im_func.func_code.co_argcount + if hasattr(f.__call__,"im_self"): + numargs -= 1 + except AttributeError: + # not a bound method, get info directly from __call__ method + if f.__call__.func_code.co_flags & STAR_ARGS: + return f + numargs = f.__call__.func_code.co_argcount + if hasattr(f.__call__,"im_self"): + numargs -= 1 + + #~ print "adding function %s with %d args" % (f.func_name,numargs) + if numargs == 3: + return f + else: + if numargs == 2: + def tmp(s,l,t): + return f(l,t) + elif numargs == 1: + def tmp(s,l,t): + return f(t) + else: #~ numargs == 0: + def tmp(s,l,t): + return f() + try: + tmp.__name__ = f.__name__ + except AttributeError: + # no need for special handling if attribute doesnt exist + pass + try: + tmp.__doc__ = f.__doc__ + except AttributeError: + # no need for special handling if attribute doesnt exist + pass + try: + tmp.__dict__.update(f.__dict__) + except AttributeError: + # no need for special handling if attribute doesnt exist + pass + return tmp + normalizeParseActionArgs = staticmethod(normalizeParseActionArgs) + + def setParseAction( self, *fns, **kwargs ): """Define action to perform when successfully matching parse element definition. - Parse action fn is a callable method with the arguments (s, loc, toks) where: - - s = the original string being parsed + Parse action fn is a callable method with 0-3 arguments, called as fn(s,loc,toks), + fn(loc,toks), fn(toks), or just fn(), where: + - s = the original string being parsed (see note below) - loc = the location of the matching substring - toks = a list of the matched tokens, packaged as a ParseResults object - If the function fn modifies the tokens, it can return them as the return + If the functions in fns modify the tokens, they can return them as the return value from fn, and the modified list of tokens will replace the original. Otherwise, fn does not need to return any value. - """ - self.parseAction = fn + + Note: the default parsing behavior is to expand tabs in the input string + before starting the parsing process. See L{I{parseString}<parseString>} for more information + on parsing strings containing <TAB>s, and suggested methods to maintain a + consistent view of the parsed string, the parse location, and line and column + positions within the parsed string. + """ + self.parseAction = map(self.normalizeParseActionArgs, list(fns)) + self.callDuringTry = ("callDuringTry" in kwargs and kwargs["callDuringTry"]) return self + def addParseAction( self, *fns, **kwargs ): + """Add parse action to expression's list of parse actions. See L{I{setParseAction}<setParseAction>}.""" + self.parseAction += map(self.normalizeParseActionArgs, list(fns)) + self.callDuringTry = self.callDuringTry or ("callDuringTry" in kwargs and kwargs["callDuringTry"]) + return self + + def setFailAction( self, fn ): + """Define action to perform if parsing fails at this expression. + Fail acton fn is a callable function that takes the arguments + fn(s,loc,expr,err) where: + - s = string being parsed + - loc = location where expression match was attempted and failed + - expr = the parse expression that failed + - err = the exception thrown + The function returns no value. It may throw ParseFatalException + if it is desired to stop parsing immediately.""" + self.failAction = fn + return self + def skipIgnorables( self, instring, loc ): exprsFound = True while exprsFound: @@ -510,7 +724,7 @@ for e in self.ignoreExprs: try: while 1: - loc,dummy = e.parse( instring, loc ) + loc,dummy = e._parse( instring, loc ) exprsFound = True except ParseException: pass @@ -519,13 +733,13 @@ def preParse( self, instring, loc ): if self.ignoreExprs: loc = self.skipIgnorables( instring, loc ) - + if self.skipWhitespace: wt = self.whiteChars instrlen = len(instring) while loc < instrlen and instring[loc] in wt: loc += 1 - + return loc def parseImpl( self, instring, loc, doActions=True ): @@ -535,66 +749,70 @@ return tokenlist #~ @profile - def parse( self, instring, loc, doActions=True, callPreParse=True ): + def _parseNoCache( self, instring, loc, doActions=True, callPreParse=True ): debugging = ( self.debug ) #and doActions ) - if debugging: + if debugging or self.failAction: #~ print "Match",self,"at loc",loc,"(%d,%d)" % ( lineno(loc,instring), col(loc,instring) ) if (self.debugActions[0] ): self.debugActions[0]( instring, loc, self ) - if callPreParse: - loc = self.preParse( instring, loc ) + if callPreParse and self.callPreparse: + preloc = self.preParse( instring, loc ) + else: + preloc = loc tokensStart = loc try: try: - loc,tokens = self.parseImpl( instring, loc, doActions ) + loc,tokens = self.parseImpl( instring, preloc, doActions ) except IndexError: - raise ParseException, ( instring, len(instring), self.errmsg, self ) + raise ParseException( instring, len(instring), self.errmsg, self ) except ParseException, err: #~ print "Exception raised:", err - if (self.debugActions[2] ): + if self.debugActions[2]: self.debugActions[2]( instring, tokensStart, self, err ) + if self.failAction: + self.failAction( instring, tokensStart, self, err ) raise else: if callPreParse: - loc = self.preParse( instring, loc ) + preloc = self.preParse( instring, loc ) + else: + preloc = loc tokensStart = loc if self.mayIndexError or loc >= len(instring): try: - loc,tokens = self.parseImpl( instring, loc, doActions ) + loc,tokens = self.parseImpl( instring, preloc, doActions ) except IndexError: - raise ParseException, ( instring, len(instring), self.errmsg, self ) + raise ParseException( instring, len(instring), self.errmsg, self ) else: - loc,tokens = self.parseImpl( instring, loc, doActions ) - + loc,tokens = self.parseImpl( instring, preloc, doActions ) + tokens = self.postParse( instring, loc, tokens ) retTokens = ParseResults( tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults ) - if self.parseAction and doActions: + if self.parseAction and (doActions or self.callDuringTry): if debugging: try: - tokens = self.parseAction( instring, tokensStart, retTokens ) - if tokens is not None: - if isinstance(tokens,tuple): - tokens = tokens[1] - retTokens = ParseResults( tokens, - self.resultsName, - asList=self.saveAsList and isinstance(tokens,(ParseResults,list)), - modal=self.modalResults ) + for fn in self.parseAction: + tokens = fn( instring, tokensStart, retTokens ) + if tokens is not None: + retTokens = ParseResults( tokens, + self.resultsName, + asList=self.saveAsList and isinstance(tokens,(ParseResults,list)), + modal=self.modalResults ) except ParseException, err: #~ print "Exception raised in user parse action:", err if (self.debugActions[2] ): self.debugActions[2]( instring, tokensStart, self, err ) raise else: - tokens = self.parseAction( instring, tokensStart, retTokens ) - if tokens is not None: - if isinstance(tokens,tuple): - tokens = tokens[1] - retTokens = ParseResults( tokens, - self.resultsName, - asList=self.saveAsList and isinstance(tokens,(ParseResults,list)), - modal=self.modalResults ) + for fn in self.parseAction: + tokens = fn( instring, tokensStart, retTokens ) + if tokens is not None: + retTokens = ParseResults( tokens, + self.resultsName, + asList=self.saveAsList and isinstance(tokens,(ParseResults,list)), + modal=self.modalResults ) if debugging: #~ print "Matched",self,"->",retTokens.asList() @@ -604,53 +822,128 @@ return loc, retTokens def tryParse( self, instring, loc ): - return self.parse( instring, loc, doActions=False )[0] + return self._parse( instring, loc, doActions=False )[0] + + # this method gets repeatedly called during backtracking with the same arguments - + # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression + def _parseCache( self, instring, loc, doActions=True, callPreParse=True ): + #if doActions and self.parseAction: + # return self._parseNoCache( instring, loc, doActions, callPreParse ) + lookup = (self,instring,loc,callPreParse,doActions) + if lookup in ParserElement._exprArgCache: + value = ParserElement._exprArgCache[ lookup ] + if isinstance(value,Exception): + if isinstance(value,ParseBaseException): + value.loc = loc + raise value + return value + else: + try: + ParserElement._exprArgCache[ lookup ] = \ + value = self._parseNoCache( instring, loc, doActions, callPreParse ) + return value + except ParseBaseException, pe: + ParserElement._exprArgCache[ lookup ] = pe + raise + _parse = _parseNoCache + + # argument cache for optimizing repeated calls when backtracking through recursive expressions + _exprArgCache = {} + def resetCache(): + ParserElement._exprArgCache.clear() + resetCache = staticmethod(resetCache) + + _packratEnabled = False + def enablePackrat(): + """Enables "packrat" parsing, which adds memoizing to the parsing logic. + Repeated parse attempts at the same string location (which happens + often in many complex grammars) can immediately return a cached value, + instead of re-executing parsing/validating code. Memoizing is done of + both valid results and parsing exceptions. + + This speedup may break existing programs that use parse actions that + have side-effects. For this reason, packrat parsing is disabled when + you first import pyparsing. To activate the packrat feature, your + program must call the class method ParserElement.enablePackrat(). If + your program uses psyco to "compile as you go", you must call + enablePackrat before calling psyco.full(). If you do not do this, + Python will crash. For best results, call enablePackrat() immediately + after importing pyparsing. + """ + if not ParserElement._packratEnabled: + ParserElement._packratEnabled = True + ParserElement._parse = ParserElement._parseCache + enablePackrat = staticmethod(enablePackrat) + def parseString( self, instring ): """Execute the parse expression with the given string. - This is the main interface to the client code, once the complete + This is the main interface to the client code, once the complete expression has been built. + + Note: parseString implicitly calls expandtabs() on the input string, + in order to report proper column numbers in parse actions. + If the input string contains tabs and + the grammar uses parse actions that use the loc argument to index into the + string being parsed, you can ensure you have a consistent view of the input + string by: + - calling parseWithTabs on your grammar before calling parseString + (see L{I{parseWithTabs}<parseWithTabs>}) + - define your parse action using the full (s,loc,toks) signature, and + reference the input string using the parse action's s argument + - explictly expand the tabs in your input string before calling + parseString """ + ParserElement.resetCache() if not self.streamlined: self.streamline() - self.saveAsList = True + #~ self.saveAsList = True for e in self.ignoreExprs: e.streamline() if self.keepTabs: - loc, tokens = self.parse( instring, 0 ) + loc, tokens = self._parse( instring, 0 ) else: - loc, tokens = self.parse( instring.expandtabs(), 0 ) + loc, tokens = self._parse( instring.expandtabs(), 0 ) return tokens - def scanString( self, instring ): - """Scan the input string for expression matches. Each match will return the matching tokens, start location, and end location.""" + def scanString( self, instring, maxMatches=sys.maxint ): + """Scan the input string for expression matches. Each match will return the + matching tokens, start location, and end location. May be called with optional + maxMatches argument, to clip scanning after 'n' matches are found. + + Note that the start and end locations are reported relative to the string + being parsed. See L{I{parseString}<parseString>} for more information on parsing + strings with embedded tabs.""" if not self.streamlined: self.streamline() for e in self.ignoreExprs: e.streamline() - + if not self.keepTabs: - instring = instring.expandtabs() + instring = _ustr(instring).expandtabs() instrlen = len(instring) loc = 0 preparseFn = self.preParse - parseFn = self.parse - while loc < instrlen: + parseFn = self._parse + ParserElement.resetCache() + matches = 0 + while loc <= instrlen and matches < maxMatches: try: - loc = preparseFn( instring, loc ) - nextLoc,tokens = parseFn( instring, loc, callPreParse=False ) + preloc = preparseFn( instring, loc ) + nextLoc,tokens = parseFn( instring, preloc, callPreParse=False ) except ParseException: - loc += 1 + loc = preloc+1 else: - yield tokens, loc, nextLoc + matches += 1 + yield tokens, preloc, nextLoc loc = nextLoc - + def transformString( self, instring ): """Extension to scanString, to modify matching text with modified tokens that may - be returned from a parse action. To use transformString, define a grammar and - attach a parse action to it that modifies the returned token list. - Invoking transformString() on a target string will then scan for matches, - and replace the matched text patterns according to the logic in the parse + be returned from a parse action. To use transformString, define a grammar and + attach a parse action to it that modifies the returned token list. + Invoking transformString() on a target string will then scan for matches, + and replace the matched text patterns according to the logic in the parse action. transformString() returns the resulting transformed string.""" out = [] lastE = 0 @@ -668,54 +961,85 @@ out.append(t) lastE = e out.append(instring[lastE:]) - return "".join(out) + return "".join(map(_ustr,out)) + def searchString( self, instring, maxMatches=sys.maxint ): + """Another extension to scanString, simplifying the access to the tokens found + to match the given parse expression. May be called with optional + maxMatches argument, to clip searching after 'n' matches are found. + """ + return ParseResults([ t for t,s,e in self.scanString( instring, maxMatches ) ]) + def __add__(self, other ): """Implementation of + operator - returns And""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return And( [ self, other ] ) def __radd__(self, other ): """Implementation of += operator""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return other + self def __or__(self, other ): """Implementation of | operator - returns MatchFirst""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return MatchFirst( [ self, other ] ) def __ror__(self, other ): """Implementation of |= operator""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return other | self def __xor__(self, other ): """Implementation of ^ operator - returns Or""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return Or( [ self, other ] ) def __rxor__(self, other ): """Implementation of ^= operator""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return other ^ self def __and__(self, other ): """Implementation of & operator - returns Each""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return Each( [ self, other ] ) def __rand__(self, other ): """Implementation of right-& operator""" if isinstance( other, basestring ): other = Literal( other ) + if not isinstance( other, ParserElement ): + warnings.warn("Cannot add element of type %s to ParserElement" % type(other), + SyntaxWarning, stacklevel=2) return other & self def __invert__( self ): @@ -723,13 +1047,13 @@ return NotAny( self ) def suppress( self ): - """Suppresses the output of this ParseElement; useful to keep punctuation from + """Suppresses the output of this ParserElement; useful to keep punctuation from cluttering up returned output. """ return Suppress( self ) def leaveWhitespace( self ): - """Disables the skipping of whitespace before matching the characters in the + """Disables the skipping of whitespace before matching the characters in the ParserElement's defined pattern. This is normally only used internally by the pyparsing module, but may be needed in some whitespace-sensitive grammars. """ @@ -741,16 +1065,18 @@ """ self.skipWhitespace = True self.whiteChars = chars - + self.copyDefaultWhiteChars = False + return self + def parseWithTabs( self ): """Overrides default behavior to expand <TAB>s to spaces before parsing the input string. - Must be called before parseString when the input grammar contains elements that + Must be called before parseString when the input grammar contains elements that match <TAB> characters.""" self.keepTabs = True return self - + def ignore( self, other ): - """Define expression to be ignored (e.g., comments) while doing pattern + """Define expression to be ignored (e.g., comments) while doing pattern matching; may be called repeatedly, to define multiple comment or other ignorable patterns. """ @@ -763,8 +1089,8 @@ def setDebugActions( self, startAction, successAction, exceptionAction ): """Enable display of debugging messages while doing pattern matching.""" - self.debugActions = (startAction or _defaultStartDebugAction, - successAction or _defaultSuccessDebugAction, + self.debugActions = (startAction or _defaultStartDebugAction, + successAction or _defaultSuccessDebugAction, exceptionAction or _defaultExceptionDebugAction) self.debug = True return self @@ -782,15 +1108,15 @@ def __repr__( self ): return _ustr(self) - + def streamline( self ): self.streamlined = True self.strRepr = None return self - + def checkRecursion( self, parseElementList ): pass - + def validate( self, validateTrace=[] ): """Check defined expressions for valid structure, check for infinite recursive definitions.""" self.checkRecursion( [] ) @@ -840,7 +1166,7 @@ self.mayIndexError = False self.errmsg = "Unmatchable token" self.myException.msg = self.errmsg - + def parseImpl( self, instring, loc, doActions=True ): exc = self.myException exc.loc = loc @@ -857,9 +1183,10 @@ try: self.firstMatchChar = matchString[0] except IndexError: - warnings.warn("null string passed to Literal; use Empty() instead", + warnings.warn("null string passed to Literal; use Empty() instead", SyntaxWarning, stacklevel=2) - self.name = '"%s"' % self.match + self.__class__ = Empty + self.name = '"%s"' % _ustr(self.match) self.errmsg = "Expected " + self.name self.mayReturnEmpty = False self.myException.msg = self.errmsg @@ -873,14 +1200,14 @@ if (instring[loc] == self.firstMatchChar and (self.matchLen==1 or instring.startswith(self.match,loc)) ): return loc+self.matchLen, self.match - #~ raise ParseException, ( instring, loc, self.errmsg ) + #~ raise ParseException( instring, loc, self.errmsg ) exc = self.myException exc.loc = loc exc.pstr = instring raise exc class Keyword(Token): - """Token to exactly match a specified string as a keyword, that is, it must be + """Token to exactly match a specified string as a keyword, that is, it must be immediately followed by a non-keyword character. Compare with Literal:: Literal("if") will match the leading 'if' in 'ifAndOnlyIf'. Keyword("if") will not; it will only match the leading 'if in 'if x=1', or 'if(y==2)' @@ -890,7 +1217,7 @@ matching, default is False. """ DEFAULT_KEYWORD_CHARS = alphanums+"_$" - + def __init__( self, matchString, identChars=DEFAULT_KEYWORD_CHARS, caseless=False ): super(Keyword,self).__init__() self.match = matchString @@ -898,7 +1225,7 @@ try: self.firstMatchChar = matchString[0] except IndexError: - warnings.warn("null string passed to Keyword; use Empty() instead", + warnings.warn("null string passed to Keyword; use Empty() instead", SyntaxWarning, stacklevel=2) self.name = '"%s"' % self.match self.errmsg = "Expected " + self.name @@ -914,29 +1241,31 @@ def parseImpl( self, instring, loc, doActions=True ): if self.caseless: if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and - (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) ): + (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) and + (loc == 0 or instring[loc-1].upper() not in self.identChars) ): return loc+self.matchLen, self.match else: if (instring[loc] == self.firstMatchChar and (self.matchLen==1 or instring.startswith(self.match,loc)) and - (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen] not in self.identChars) ): + (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen] not in self.identChars) and + (loc == 0 or instring[loc-1] not in self.identChars) ): return loc+self.matchLen, self.match - #~ raise ParseException, ( instring, loc, self.errmsg ) + #~ raise ParseException( instring, loc, self.errmsg ) exc = self.myException exc.loc = loc exc.pstr = instring raise exc - + def copy(self): c = super(Keyword,self).copy() c.identChars = Keyword.DEFAULT_KEYWORD_CHARS return c - + def setDefaultKeywordChars( chars ): """Overrides the default Keyword chars """ Keyword.DEFAULT_KEYWORD_CHARS = chars - setDefaultKeywordChars = staticmethod(setDefaultKeywordChars) + setDefaultKeywordChars = staticmethod(setDefaultKeywordChars) class CaselessLiteral(Literal): @@ -955,7 +1284,7 @@ def parseImpl( self, instring, loc, doActions=True ): if instring[ loc:loc+self.matchLen ].upper() == self.match: return loc+self.matchLen, self.returnString - #~ raise ParseException, ( instring, loc, self.errmsg ) + #~ raise ParseException( instring, loc, self.errmsg ) exc = self.myException exc.loc = loc exc.pstr = instring @@ -963,13 +1292,13 @@ class CaselessKeyword(Keyword): def __init__( self, matchString, identChars=Keyword.DEFAULT_KEYWORD_CHARS ): - super(CaselessKeyword,self).__init__( matchString, identCars, caseless=True ) + super(CaselessKeyword,self).__init__( matchString, identChars, caseless=True ) def parseImpl( self, instring, loc, doActions=True ): if ( (instring[ loc:loc+self.matchLen ].upper() == self.caselessmatch) and (loc >= len(instring)-self.matchLen or instring[loc+self.matchLen].upper() not in self.identChars) ): return loc+self.matchLen, self.match - #~ raise ParseException, ( instring, loc, self.errmsg ) + #~ raise ParseException( instring, loc, self.errmsg ) exc = self.myException exc.loc = loc exc.pstr = instring @@ -982,7 +1311,7 @@ defaults to the initial character set), and an optional minimum, maximum, and/or exact length. """ - def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0 ): + def __init__( self, initChars, bodyChars=None, min=1, max=0, exact=0, asKeyword=False ): super(Word,self).__init__() self.initCharsOrig = initChars self.initChars = _str2dict(initChars) @@ -992,7 +1321,7 @@ else: self.bodyCharsOrig = initChars self.bodyChars = _str2dict(initChars) - + self.maxSpecified = max > 0 self.minLen = min @@ -1010,20 +1339,26 @@ self.errmsg = "Expected " + self.name self.myException.msg = self.errmsg self.mayIndexError = False - + self.asKeyword = asKeyword + if ' ' not in self.initCharsOrig+self.bodyCharsOrig and (min==1 and max==0 and exact==0): if self.bodyCharsOrig == self.initCharsOrig: self.reString = "[%s]+" % _escapeRegexRangeChars(self.initCharsOrig) elif len(self.bodyCharsOrig) == 1: self.reString = "%s[%s]*" % \ - (_escapeRegexChars(self.initCharsOrig), + (re.escape(self.initCharsOrig), _escapeRegexRangeChars(self.bodyCharsOrig),) else: self.reString = "[%s][%s]*" % \ (_escapeRegexRangeChars(self.initCharsOrig), _escapeRegexRangeChars(self.bodyCharsOrig),) - self.re = re.compile( self.reString ) - + if self.asKeyword: + self.reString = r"\b"+self.reString+r"\b" + try: + self.re = re.compile( self.reString ) + except: + self.re = None + def parseImpl( self, instring, loc, d... [truncated message content]
Revision: 3549 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3549&view=rev Author: mdboom Date: 2007年07月17日 05:40:56 -0700 (2007年7月17日) Log Message: ----------- Add support for bf (bold) and sf (sans serif) math fonts. Modified Paths: -------------- branches/mathtext_mgd/lib/matplotlib/mathtext.py Added Paths: ----------- branches/mathtext_mgd/lib/matplotlib/mpl-data/fonts/ttf/cmb10.ttf branches/mathtext_mgd/lib/matplotlib/mpl-data/fonts/ttf/cmss10.ttf Modified: branches/mathtext_mgd/lib/matplotlib/mathtext.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月17日 12:21:59 UTC (rev 3548) +++ branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月17日 12:40:56 UTC (rev 3549) @@ -475,6 +475,8 @@ 'rm' : 'cmr10.ttf', 'tt' : 'cmtt10.ttf', 'it' : 'cmmi10.ttf', + 'bf' : 'cmb10.ttf', + 'sf' : 'cmss10.ttf', None : 'cmmi10.ttf', } @@ -547,7 +549,7 @@ Use the Bakoma true type fonts for rendering """ fnames = ('cmmi10', 'cmsy10', 'cmex10', - 'cmtt10', 'cmr10') + 'cmtt10', 'cmr10', 'cmb10', 'cmss10') # allocate a new set of fonts basepath = os.path.join( get_data_path(), 'fonts', 'ttf' ) @@ -555,6 +557,8 @@ 'rm' : 'cmr10', 'tt' : 'cmtt10', 'it' : 'cmmi10', + 'bf' : 'cmb10', + 'sf' : 'cmss10', None : 'cmmi10', } @@ -694,7 +698,7 @@ Use the Bakoma postscript fonts for rendering to backend_ps """ facenames = ('cmmi10', 'cmsy10', 'cmex10', - 'cmtt10', 'cmr10') + 'cmtt10', 'cmr10', 'cmb10', 'cmss10') # allocate a new set of fonts basepath = os.path.join( get_data_path(), 'fonts', 'ttf' ) @@ -702,6 +706,8 @@ 'rm' : 'cmr10', 'tt' : 'cmtt10', 'it' : 'cmmi10', + 'bf' : 'cmb10', + 'sf' : 'cmss10', None : 'cmmi10', } @@ -1566,9 +1572,8 @@ | times | div) -fontname = oneOf("rm cal it tt") - # mathbf and mathsf not supported yet -latex2efont = oneOf("mathrm mathcal mathit mathtt") +fontname = oneOf("rm cal it tt sf bf") +latex2efont = oneOf("mathrm mathcal mathit mathtt mathsf mathbf") texsym = Combine(bslash + Word(alphanums) + NotAny("{")) @@ -1668,6 +1673,8 @@ | subsuper ).setParseAction(handler.expression).setName("expression") + + #### Added: branches/mathtext_mgd/lib/matplotlib/mpl-data/fonts/ttf/cmb10.ttf =================================================================== (Binary files differ) Property changes on: branches/mathtext_mgd/lib/matplotlib/mpl-data/fonts/ttf/cmb10.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/mathtext_mgd/lib/matplotlib/mpl-data/fonts/ttf/cmss10.ttf =================================================================== (Binary files differ) Property changes on: branches/mathtext_mgd/lib/matplotlib/mpl-data/fonts/ttf/cmss10.ttf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3557 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3557&view=rev Author: mdboom Date: 2007年07月18日 06:16:35 -0700 (2007年7月18日) Log Message: ----------- Got mixed text/math working for Agg, Ps (non-afm) and Pdf (non-afm). All other backends can be considered horribly broken on this branch. Modified Paths: -------------- branches/mathtext_mgd/lib/matplotlib/backends/backend_agg.py branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py branches/mathtext_mgd/lib/matplotlib/mathtext.py branches/mathtext_mgd/lib/matplotlib/text.py Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_agg.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_agg.py 2007年07月18日 07:38:05 UTC (rev 3556) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_agg.py 2007年07月18日 13:16:35 UTC (rev 3557) @@ -180,10 +180,9 @@ """ if __debug__: verbose.report('RendererAgg.draw_mathtext', 'debug-annoying') - size = prop.get_size_in_points() - width, height, fonts = math_parse_s_ft2font( - s, self.dpi.get(), size, angle) - + width, height, fonts, used_characters = math_parse_s_ft2font( + s, self.dpi.get(), prop, angle) + if angle == 90: width, height = height, width for font in fonts: @@ -232,7 +231,6 @@ # texmanager more efficient. It is not meant to be used # outside the backend """ - if ismath=='TeX': # todo: handle props size = prop.get_size_in_points() @@ -242,8 +240,8 @@ return n,m if ismath: - width, height, fonts = math_parse_s_ft2font( - s, self.dpi.get(), prop.get_size_in_points()) + width, height, fonts, used_characters = math_parse_s_ft2font( + s, self.dpi.get(), prop) return width, height font = self._get_agg_font(prop) font.set_text(s, 0.0) # the width and height of unrotated string Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py 2007年07月18日 07:38:05 UTC (rev 3556) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py 2007年07月18日 13:16:35 UTC (rev 3557) @@ -456,8 +456,10 @@ fontdictObject = self._write_afm_font(filename) else: realpath, stat_key = get_realpath_and_stat(filename) - fontdictObject = self.embedTTF( - *self.used_characters[stat_key]) + chars = self.used_characters.get(stat_key) + if chars is not None: + fontdictObject = self.embedTTF( + *self.used_characters[stat_key]) fonts[Fx] = fontdictObject #print >>sys.stderr, filename self.writeObject(self.fontObject, fonts) @@ -932,7 +934,14 @@ used_characters = self.used_characters.setdefault( stat_key, (realpath, sets.Set())) used_characters[1].update(s) + print [(os.path.basename(x), y) for x, y in self.used_characters.values()] + def merge_used_characters(self, other): + for stat_key, (realpath, set) in other.items(): + used_characters = self.used_characters.setdefault( + stat_key, (realpath, sets.Set())) + used_characters[1].update(set) + def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2, rotation): """ @@ -1085,8 +1094,9 @@ def draw_mathtext(self, gc, x, y, s, prop, angle): # TODO: fix positioning and encoding - fontsize = prop.get_size_in_points() - width, height, pswriter = math_parse_s_pdf(s, 72, fontsize, 0, self.track_characters) + width, height, pswriter, used_characters = \ + math_parse_s_pdf(s, 72, prop, 0) + self.merge_used_characters(used_characters) self.check_gc(gc, gc._rgb) self.file.output(Op.begin_text) @@ -1094,7 +1104,7 @@ oldx, oldy = 0, 0 for ox, oy, fontname, fontsize, glyph in pswriter: #print ox, oy, glyph - fontname = fontname.lower() + #fontname = fontname.lower() a = angle / 180.0 * pi newx = x + cos(a)*ox - sin(a)*oy newy = y + sin(a)*ox + cos(a)*oy @@ -1199,9 +1209,7 @@ s = s.encode('cp1252', 'replace') if ismath: - fontsize = prop.get_size_in_points() - w, h, pswriter = math_parse_s_pdf( - s, 72, fontsize, 0, self.track_characters) + w, h, pswriter, used_characters = math_parse_s_pdf(s, 72, prop, 0) elif rcParams['pdf.use14corefonts']: font = self._get_font_afm(prop) Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py 2007年07月18日 07:38:05 UTC (rev 3556) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py 2007年07月18日 13:16:35 UTC (rev 3557) @@ -154,6 +154,12 @@ stat_key, (realpath, sets.Set())) used_characters[1].update(s) + def merge_used_characters(self, other): + for stat_key, (realpath, set) in other.items(): + used_characters = self.used_characters.setdefault( + stat_key, (realpath, sets.Set())) + used_characters[1].update(set) + def set_color(self, r, g, b, store=1): if (r,g,b) != self.color: if r==g and r==b: @@ -272,8 +278,8 @@ return w, h if ismath: - width, height, pswriter = math_parse_s_ps( - s, 72, prop.get_size_in_points(), 0, self.track_characters) + width, height, pswriter, used_characters = math_parse_s_ps( + s, 72, prop, 0) return width, height if rcParams['ps.useafm']: @@ -808,8 +814,9 @@ if debugPS: self._pswriter.write("% mathtext\n") - fontsize = prop.get_size_in_points() - width, height, pswriter = math_parse_s_ps(s, 72, fontsize, angle, self.track_characters) + width, height, pswriter, used_characters = \ + math_parse_s_ps(s, 72, prop, angle) + self.merge_used_characters(used_characters) self.set_color(*gc.get_rgb()) thetext = pswriter.getvalue() ps = """gsave Modified: branches/mathtext_mgd/lib/matplotlib/mathtext.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月18日 07:38:05 UTC (rev 3556) +++ branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月18日 13:16:35 UTC (rev 3557) @@ -119,9 +119,13 @@ KNOWN ISSUES: - - nesting fonts changes in sub/superscript groups not parsing - I would also like to add a few more layout commands, like \frac. +STATUS: + The *Unicode* classes were incomplete when I found them, and have + not been refactored to support intermingling of regular text and + math text yet. They are most likely broken. -- Michael Droettboom, July 2007 + Author : John Hunter <jdh...@ac...> Copyright : John Hunter (2004,2005) License : matplotlib license (PSF compatible) @@ -130,6 +134,7 @@ from __future__ import division import os, sys from cStringIO import StringIO +from sets import Set from matplotlib import verbose from matplotlib.pyparsing import Literal, Word, OneOrMore, ZeroOrMore, \ @@ -138,7 +143,7 @@ operatorPrecedence, opAssoc, ParseResults, Or, Suppress, oneOf from matplotlib.afm import AFM -from matplotlib.cbook import enumerate, iterable, Bunch +from matplotlib.cbook import enumerate, iterable, Bunch, get_realpath_and_stat from matplotlib.ft2font import FT2Font from matplotlib.font_manager import fontManager, FontProperties from matplotlib._mathtext_data import latex_to_bakoma, cmkern, \ @@ -544,80 +549,111 @@ # Old classes -class BakomaTrueTypeFonts(Fonts): +class BakomaFonts(Fonts): """ Use the Bakoma true type fonts for rendering """ - fnames = ('cmmi10', 'cmsy10', 'cmex10', - 'cmtt10', 'cmr10', 'cmb10', 'cmss10') # allocate a new set of fonts basepath = os.path.join( get_data_path(), 'fonts', 'ttf' ) - fontmap = { 'cal' : 'cmsy10', - 'rm' : 'cmr10', - 'tt' : 'cmtt10', - 'it' : 'cmmi10', - 'bf' : 'cmb10', - 'sf' : 'cmss10', - None : 'cmmi10', + fontmap = { 'cal' : 'Cmsy10', + 'rm' : 'Cmr10', + 'tt' : 'Cmtt10', + 'it' : 'Cmmi10', + 'bf' : 'Cmb10', + 'sf' : 'Cmss10', + None : 'Cmmi10', + 'ex' : 'Cmex10' } - def __init__(self, useSVG=False): - self.glyphd = {} - self.fonts = dict( - [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf')) - for name in self.fnames]) + class FontCache: + def __init__(self, font): + self.font = font + self.charmap = font.get_charmap() + self.glyphmap = dict( + [(glyphind, ccode) for ccode, glyphind in self.charmap.items()]) + + def __init__(self): + self.glyphd = {} + self.fonts = {} + self.used_characters = {} + + # MGDTODO: Separate this out into an SVG class +# if useSVG: +# self.svg_glyphs = [] # a list of "glyphs" we need to render this thing in SVG +# else: pass +# self.usingSVG = useSVG - self.charmaps = dict( - [ (name, self.fonts[name].get_charmap()) for name in self.fnames]) - # glyphmaps is a dict names to a dict of glyphindex -> charcode - self.glyphmaps = {} - for name in self.fnames: - cmap = self.charmaps[name] - self.glyphmaps[name] = dict([(glyphind, ccode) for ccode, glyphind in cmap.items()]) + def _get_font(self, font): + """Looks up a FontCache with its charmap and inverse charmap. + font may be a TeX font name (cal, rm, it etc.), a Computer Modern + font name (cmtt10, cmr10, etc.) or an FT2Font object.""" + if isinstance(font, str): + if font not in self.fontmap.values(): + basename = self.fontmap[font] + else: + basename = font + else: + basename = font.postscript_name - 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 + font_cache = self.fonts.get(basename) + if font_cache is None: + if isinstance(font, str): + font = FT2Font(os.path.join(self.basepath, basename.lower() + '.ttf')) + basename = font.postscript_name + font_cache = self.FontCache(font) + self.fonts[basename] = font_cache + return basename, font_cache + def get_fonts(self): + return [x.font for x in self.fonts.values()] + def get_metrics(self, font, sym, fontsize, dpi): - cmfont, metrics, glyph, offset = \ + basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) return metrics + def _get_offset(self, basename, font_cache, glyph, fontsize, dpi): + if basename.lower() == 'cmex10': + return glyph.height/64.0/2 + 256.0/64.0*dpi/72.0 + return 0. + def _get_info (self, font, sym, fontsize, dpi): 'load the cmfont, metrics and glyph with caching' - key = font, sym, fontsize, dpi + if hasattr(font, 'postscript_name'): + fontname = font.postscript_name + else: + fontname = font + + key = fontname, sym, fontsize, dpi tup = self.glyphd.get(key) if tup is not None: return tup - - basename = self.fontmap[font] - - if latex_to_bakoma.has_key(sym): + + if font in self.fontmap and latex_to_bakoma.has_key(sym): basename, num = latex_to_bakoma[sym] - num = self.glyphmaps[basename][num] + basename, font_cache = self._get_font(basename.capitalize()) + symbol_name = font_cache.font.get_glyph_name(num) + num = font_cache.glyphmap[num] elif len(sym) == 1: + basename, font_cache = self._get_font(font) num = ord(sym) + symbol_name = font_cache.font.get_glyph_name(font_cache.charmap[num]) else: num = 0 raise ValueError('unrecognized symbol "%s"' % sym) - #print sym, basename, num - cmfont = self.fonts[basename] - cmfont.set_size(fontsize, dpi) - head = cmfont.get_sfnt_table('head') - glyph = cmfont.load_char(num) + font = font_cache.font + font.set_size(fontsize, dpi) + glyph = font.load_char(num) + realpath, stat_key = get_realpath_and_stat(font.fname) + used_characters = self.used_characters.setdefault( + stat_key, (realpath, Set())) + used_characters[1].update(unichr(num)) + xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox] - if basename == 'cmex10': - offset = glyph.height/64.0/2 + 256.0/64.0*dpi/72.0 - #offset = -(head['yMin']+512)/head['unitsPerEm']*10. - else: - offset = 0. + offset = self._get_offset(basename, font_cache, glyph, fontsize, dpi) metrics = Bunch( advance = glyph.linearHoriAdvance/65536.0, height = glyph.height/64.0, @@ -627,38 +663,37 @@ ymin = ymin+offset, ymax = ymax+offset, ) - - self.glyphd[key] = cmfont, metrics, glyph, offset + + self.glyphd[key] = basename, font, metrics, symbol_name, num, glyph, offset return self.glyphd[key] def set_canvas_size(self, w, h): 'Dimension the drawing canvas; may be a noop' self.width = int(w) self.height = int(h) - for font in self.fonts.values(): - font.set_bitmap_size(int(w), int(h)) + for font_cache in self.fonts.values(): + font_cache.font.set_bitmap_size(int(w), int(h)) def render(self, ox, oy, font, sym, fontsize, dpi): - cmfont, metrics, glyph, offset = \ + basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) - 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.glyphmaps[basename][num] - elif len(sym) == 1: - num = ord(sym) - else: - num = 0 - print >>sys.stderr, 'unrecognized symbol "%s"' % sym - thetext = unichr(num) - thetext.encode('utf-8') - self.svg_glyphs.append((basename, fontsize, thetext, ox, oy, metrics)) + font.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.glyphmaps[basename][num] +# elif len(sym) == 1: +# num = ord(sym) +# else: +# num = 0 +# print >>sys.stderr, 'unrecognized symbol "%s"' % sym +# thetext = unichr(num) +# thetext.encode('utf-8') +# self.svg_glyphs.append((basename, fontsize, thetext, ox, oy, metrics)) def _old_get_kern(self, font, symleft, symright, fontsize, dpi): @@ -680,153 +715,46 @@ #print basename, symleft, symright, key, kern return kern - def _get_num(self, font, sym): - 'get charcode for sym' - basename = self.fontmap[font] - if latex_to_bakoma.has_key(sym): - basename, num = latex_to_bakoma[sym] - num = self.glyphmaps[basename][num] - elif len(sym) == 1: - num = ord(sym) - else: - num = 0 - return num - -class BakomaPSFonts(Fonts): +class BakomaPSFonts(BakomaFonts): """ Use the Bakoma postscript fonts for rendering to backend_ps """ - facenames = ('cmmi10', 'cmsy10', 'cmex10', - 'cmtt10', 'cmr10', 'cmb10', 'cmss10') - # allocate a new set of fonts - basepath = os.path.join( get_data_path(), 'fonts', 'ttf' ) - fontmap = { 'cal' : 'cmsy10', - 'rm' : 'cmr10', - 'tt' : 'cmtt10', - 'it' : 'cmmi10', - 'bf' : 'cmb10', - 'sf' : 'cmss10', - None : 'cmmi10', - } - - def __init__(self, character_tracker=None): - self.glyphd = {} - self.fonts = dict( - [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf')) - for name in self.facenames]) - - self.glyphmaps = {} - for facename in self.facenames: - charmap = self.fonts[facename].get_charmap() - self.glyphmaps[facename] = dict([(glyphind, charcode) - for charcode, glyphind in charmap.items()]) - for font in self.fonts.values(): - font.clear() - self.character_tracker = character_tracker - - def _get_info (self, font, sym, fontsize, dpi): - 'load the cmfont, metrics and glyph with caching' - key = font, sym, fontsize, dpi - tup = self.glyphd.get(key) - - if tup is not None: - return tup - - basename = self.fontmap[font] - - if latex_to_bakoma.has_key(sym): - basename, num = latex_to_bakoma[sym] - sym = self.fonts[basename].get_glyph_name(num) - num = self.glyphmaps[basename][num] - elif len(sym) == 1: - num = ord(sym) - else: - num = 0 - #sym = '.notdef' - raise ValueError('unrecognized symbol "%s, %d"' % (sym, num)) - - cmfont = self.fonts[basename] - cmfont.set_size(fontsize, dpi) - head = cmfont.get_sfnt_table('head') - glyph = cmfont.load_char(num) - - if self.character_tracker: - self.character_tracker(cmfont, unichr(num)) - - xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox] - if basename == 'cmex10': - offset = -(head['yMin']+512)/head['unitsPerEm']*10. - else: - offset = 0. - metrics = Bunch( - advance = glyph.linearHoriAdvance/65536.0, - height = glyph.height/64.0, - width = glyph.width/64.0, - xmin = xmin, - xmax = xmax, - ymin = ymin+offset, - ymax = ymax+offset - ) - - self.glyphd[key] = basename, metrics, sym, offset - return basename, metrics, '/'+sym, offset - + def _get_offset(self, basename, font_cache, glyph, fontsize, dpi): + head = font_cache.font.get_sfnt_table("head") + if basename.lower() == 'cmex10': + return -(head['yMin']+512)/head['unitsPerEm']*10. + return 0. + def set_canvas_size(self, w, h, pswriter): 'Dimension the drawing canvas; may be a noop' self.width = w self.height = h self.pswriter = pswriter - def render(self, ox, oy, font, sym, fontsize, dpi): - fontname, metrics, glyphname, offset = \ + basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) - fontname = fontname.capitalize() - if fontname == 'Cmex10': + if basename.lower() == 'cmex10': oy += offset - 512/2048.*10. - ps = """/%(fontname)s findfont + ps = """/%(basename)s findfont %(fontsize)s scalefont setfont %(ox)f %(oy)f moveto -/%(glyphname)s glyphshow +/%(symbol_name)s glyphshow """ % locals() self.pswriter.write(ps) - - def get_metrics(self, font, sym, fontsize, dpi): - basename, metrics, sym, offset = \ - self._get_info(font, sym, fontsize, dpi) - return metrics - class BakomaPDFFonts(BakomaPSFonts): """Hack of BakomaPSFonts for PDF support.""" - def _get_filename_and_num (self, font, sym, fontsize, dpi): - 'should be part of _get_info' - basename = self.fontmap[font] - - if latex_to_bakoma.has_key(sym): - basename, num = latex_to_bakoma[sym] - sym = self.fonts[basename].get_glyph_name(num) - num = self.glyphmaps[basename][num] - elif len(sym) == 1: - num = ord(sym) - else: - num = 0 - raise ValueError('unrecognized symbol "%s"' % (sym,)) - - return os.path.join(self.basepath, basename) + '.ttf', num - def render(self, ox, oy, font, sym, fontsize, dpi): - fontname, metrics, glyphname, offset = \ + basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) - filename, num = self._get_filename_and_num(font, sym, fontsize, dpi) - if self.character_tracker: - self.character_tracker(filename, unichr(num)) - if fontname.lower() == 'cmex10': + filename = font.fname + if basename.lower() == 'cmex10': oy += offset - 512/2048.*10. self.pswriter.append((ox, oy, filename, fontsize, num)) @@ -1256,32 +1184,25 @@ def set_font(self, font): return - - # MGDTODO: The code below is probably now broken - #print 'set fonts' -# for i in range(len(self.elements)-1): -# if not isinstance(self.elements[i], SymbolElement): continue -# if not isinstance(self.elements[i+1], SymbolElement): continue -# symleft = self.elements[i].sym -# symright = self.elements[i+1].sym -# self.elements[i].kern = None -# #self.elements[i].kern = Element.fonts.get_kern(font, symleft, symright, self.fontsize, self.dpi) - def set_size_info(self, fontsize, dpi): - self.elements[0].set_size_info(self._scale*fontsize, dpi) + if len(self.elements): + self.elements[0].set_size_info(self._scale*fontsize, dpi) Element.set_size_info(self, fontsize, dpi) #print 'set size' def set_origin(self, ox, oy): - self.elements[0].set_origin(ox, oy) + if len(self.elements): + self.elements[0].set_origin(ox, oy) Element.set_origin(self, ox, oy) def advance(self): 'get the horiz advance' - return self.elements[-1].xmax() - self.elements[0].ox + if len(self.elements): + return self.elements[-1].xmax() - self.elements[0].ox + return 0 def height(self): @@ -1298,7 +1219,8 @@ def render(self): 'render to the fonts canvas' - self.elements[0].render() + if len(self.elements): + self.elements[0].render() Element.render(self) def xmin(self): @@ -1320,6 +1242,18 @@ def __repr__(self): return 'Group: [ %s ]' % ' '.join([str(e) for e in self.elements]) +class MathGroupElement(GroupElement): + def determine_font(self, font_stack): + font_stack.append('it') + for element in self.elements: + element.determine_font(font_stack) + font_stack.pop() + +class NonMathGroupElement(GroupElement): + def determine_font(self, font_stack): + for element in self.elements: + element.determine_font(font_stack) + class ExpressionElement(GroupElement): """ The entire mathtext expression @@ -1328,8 +1262,7 @@ def __repr__(self): return 'Expression: [ %s ]' % ' '.join([str(e) for e in self.elements]) - def determine_font(self): - font_stack = ['it'] + def determine_font(self, font_stack): GroupElement.determine_font(self, font_stack) class Handler: @@ -1337,12 +1270,24 @@ def clear(self): self.symbols = [] - self.subscript_stack = [] def expression(self, s, loc, toks): + #~ print "expr", toks self.expr = ExpressionElement(toks) return [self.expr] + def math(self, s, loc, toks): + #~ print "math", toks + math = MathGroupElement(toks) + return [math] + + def non_math(self, s, loc, toks): + #~ print "non_math", toks + symbols = [SymbolElement(c) for c in toks[0]] + self.symbols.extend(symbols) + non_math = NonMathGroupElement(symbols) + return [non_math] + def space(self, s, loc, toks): assert(len(toks)==1) @@ -1510,8 +1455,8 @@ latexfont = Forward().setParseAction(handler.latexfont).setName("latexfont") subsuper = Forward().setParseAction(handler.subsuperscript).setName("subsuper") placeable = Forward().setName("placeable") +expression = Forward().setParseAction(handler.expression).setName("expression") - lbrace = Literal('{').suppress() rbrace = Literal('}').suppress() lbrack = Literal('[') @@ -1599,6 +1544,7 @@ r"[:,.;!]", r"[!@%&]", r"[[\]()]", + r"\\\$" ]) + ")" ).setParseAction(handler.symbol).leaveWhitespace() @@ -1670,15 +1616,30 @@ | (( subscript | superscript) + placeable) ) -expression = OneOrMore( +math = OneOrMore( space | font | latexfont | subsuper - ).setParseAction(handler.expression).setName("expression") + ).setParseAction(handler.math).setName("math") - +math_delim =(~bslash + + Literal('$')) +non_math = Regex(r"(?:[^$]|(?:\\\$))*" + ).setParseAction(handler.non_math).setName("non_math").leaveWhitespace() + +expression <<( + non_math + + ZeroOrMore( + Suppress(math_delim) + + math + + Suppress(math_delim) + + non_math + ) + ) + + #### @@ -1700,18 +1661,18 @@ self.output = output self.cache = {} - def __call__(self, s, dpi, fontsize, angle=0, character_tracker=None): - cacheKey = (s, dpi, fontsize, angle) - s = s[1:-1] # strip the $ from front and back + def __call__(self, s, dpi, prop, angle=0): + cacheKey = (s, dpi, hash(prop), angle) if self.cache.has_key(cacheKey): - w, h, fontlike = self.cache[cacheKey] - return w, h, fontlike + w, h, fontlike, used_characters = self.cache[cacheKey] + return w, h, fontlike, used_characters + if self.output == 'SVG': - self.font_object = BakomaTrueTypeFonts(useSVG=True) + self.font_object = BakomaFonts(useSVG=True) #self.font_object = MyUnicodeFonts(output='SVG') Element.fonts = self.font_object elif self.output == 'Agg': - self.font_object = BakomaTrueTypeFonts() + self.font_object = BakomaFonts() #self.font_object = MyUnicodeFonts() Element.fonts = self.font_object elif self.output == 'PS': @@ -1719,17 +1680,22 @@ self.font_object = StandardPSFonts() Element.fonts = self.font_object else: - self.font_object = BakomaPSFonts(character_tracker) + self.font_object = BakomaPSFonts() #self.font_object = MyUnicodeFonts(output='PS') Element.fonts = self.font_object elif self.output == 'PDF': - self.font_object = BakomaPDFFonts(character_tracker) + self.font_object = BakomaPDFFonts() Element.fonts = self.font_object + + fontsize = prop.get_size_in_points() handler.clear() expression.parseString( s ) - - handler.expr.determine_font() + + fname = fontManager.findfont(prop) + default_font = FT2Font(str(fname)) + + handler.expr.determine_font([default_font]) handler.expr.set_size_info(fontsize, dpi) # set the origin once to allow w, h compution @@ -1738,7 +1704,7 @@ 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 @@ -1758,20 +1724,18 @@ handler.expr.render() handler.clear() - + if self.output == 'SVG': # The empty list at the end is for lines svg_elements = Bunch(svg_glyphs=self.font_object.svg_glyphs, svg_lines=[]) - self.cache[cacheKey] = w, h, svg_elements - return w, h, svg_elements + self.cache[cacheKey] = w, h, svg_elements, Element.fonts.used_characters elif self.output == 'Agg': - self.cache[cacheKey] = w, h, self.font_object.fonts.values() - return w, h, self.font_object.fonts.values() + self.cache[cacheKey] = w, h, self.font_object.get_fonts(), Element.fonts.used_characters elif self.output in ('PS', 'PDF'): - self.cache[cacheKey] = w, h, pswriter - return w, h, pswriter - + self.cache[cacheKey] = w, h, pswriter, Element.fonts.used_characters + return self.cache[cacheKey] + if rcParams["mathtext.mathtext2"]: from matplotlib.mathtext2 import math_parse_s_ft2font from matplotlib.mathtext2 import math_parse_s_ft2font_svg Modified: branches/mathtext_mgd/lib/matplotlib/text.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/text.py 2007年07月18日 07:38:05 UTC (rev 3556) +++ branches/mathtext_mgd/lib/matplotlib/text.py 2007年07月18日 13:16:35 UTC (rev 3557) @@ -238,7 +238,7 @@ lines = [self._text] else: lines = self._text.split('\n') - + whs = [] # Find full vertical extent of font, # including ascenders and descenders: @@ -753,8 +753,8 @@ if rcParams['text.usetex']: return 'TeX' if not matplotlib._havemath: return False if len(self._text)<2: return False - return ( self._text.startswith('$') and - self._text.endswith('$') ) + dollar_signs = self._text.count('$') - self._text.count('\\$') + return dollar_signs > 0 and dollar_signs % 2 == 0 def set_fontproperties(self, fp): """ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 3558 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3558&view=rev Author: mdboom Date: 2007年07月18日 08:27:58 -0700 (2007年7月18日) Log Message: ----------- Got SVG and PS (afm-only) support working. Still kind of tempermental. Modified Paths: -------------- branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py branches/mathtext_mgd/lib/matplotlib/mathtext.py Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py 2007年07月18日 13:16:35 UTC (rev 3557) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_pdf.py 2007年07月18日 15:27:58 UTC (rev 3558) @@ -15,7 +15,7 @@ from cStringIO import StringIO from datetime import datetime from math import ceil, cos, floor, pi, sin -import sets +from sets import Set from matplotlib import __version__, rcParams, agg, get_data_path from matplotlib._pylab_helpers import Gcf @@ -457,9 +457,8 @@ else: realpath, stat_key = get_realpath_and_stat(filename) chars = self.used_characters.get(stat_key) - if chars is not None: - fontdictObject = self.embedTTF( - *self.used_characters[stat_key]) + if chars is not None and len(chars[1]): + fontdictObject = self.embedTTF(realpath, chars[1]) fonts[Fx] = fontdictObject #print >>sys.stderr, filename self.writeObject(self.fontObject, fonts) @@ -932,14 +931,13 @@ fname = font.fname realpath, stat_key = get_realpath_and_stat(fname) used_characters = self.used_characters.setdefault( - stat_key, (realpath, sets.Set())) + stat_key, (realpath, Set())) used_characters[1].update(s) - print [(os.path.basename(x), y) for x, y in self.used_characters.values()] def merge_used_characters(self, other): for stat_key, (realpath, set) in other.items(): used_characters = self.used_characters.setdefault( - stat_key, (realpath, sets.Set())) + stat_key, (realpath, Set())) used_characters[1].update(set) def draw_arc(self, gcEdge, rgbFace, x, y, width, height, @@ -1103,8 +1101,6 @@ prev_font = None, None oldx, oldy = 0, 0 for ox, oy, fontname, fontsize, glyph in pswriter: - #print ox, oy, glyph - #fontname = fontname.lower() a = angle / 180.0 * pi newx = x + cos(a)*ox - sin(a)*oy newy = y + sin(a)*ox + cos(a)*oy Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py 2007年07月18日 13:16:35 UTC (rev 3557) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_ps.py 2007年07月18日 15:27:58 UTC (rev 3558) @@ -30,7 +30,7 @@ fromstring, nonzero, ones, put, take, where, isnan import binascii import re -import sets +from sets import Set if sys.platform.startswith('win'): cmd_split = '&' else: cmd_split = ';' @@ -151,13 +151,13 @@ each font.""" realpath, stat_key = get_realpath_and_stat(font.fname) used_characters = self.used_characters.setdefault( - stat_key, (realpath, sets.Set())) + stat_key, (realpath, Set())) used_characters[1].update(s) def merge_used_characters(self, other): for stat_key, (realpath, set) in other.items(): used_characters = self.used_characters.setdefault( - stat_key, (realpath, sets.Set())) + stat_key, (realpath, Set())) used_characters[1].update(set) def set_color(self, r, g, b, store=1): @@ -1037,13 +1037,14 @@ print >>fh, l.strip() if not rcParams['ps.useafm']: for font_filename, chars in renderer.used_characters.values(): - font = FT2Font(font_filename) - cmap = font.get_charmap() - glyph_ids = [] - for c in chars: - gind = cmap.get(ord(c)) or 0 - glyph_ids.append(gind) - convert_ttf_to_ps(font_filename, fh, rcParams['ps.fonttype'], glyph_ids) + if len(chars): + font = FT2Font(font_filename) + cmap = font.get_charmap() + glyph_ids = [] + for c in chars: + gind = cmap.get(ord(c)) or 0 + glyph_ids.append(gind) + convert_ttf_to_ps(font_filename, fh, rcParams['ps.fonttype'], glyph_ids) print >>fh, "end" print >>fh, "%%EndProlog" Modified: branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py 2007年07月18日 13:16:35 UTC (rev 3557) +++ branches/mathtext_mgd/lib/matplotlib/backends/backend_svg.py 2007年07月18日 15:27:58 UTC (rev 3558) @@ -291,9 +291,12 @@ self._svgwriter.write (svg) def _add_char_def(self, prop, char): - newprop = prop.copy() - newprop.set_size(self.FONT_SCALE) - font = self._get_font(newprop) + if isinstance(prop, FontProperties): + newprop = prop.copy() + font = self._get_font(newprop) + else: + font = prop + font.set_size(self.FONT_SCALE, 72) ps_name = font.get_sfnt()[(1,0,0,6)] char_id = urllib.quote('%s-%d' % (ps_name, ord(char))) if char_id in self._char_defs: @@ -332,8 +335,8 @@ """ Draw math text using matplotlib.mathtext """ - fontsize = prop.get_size_in_points() - width, height, svg_elements = math_parse_s_ft2font_svg(s, 72, fontsize) + width, height, svg_elements, used_characters = \ + math_parse_s_ft2font_svg(s, 72, prop) svg_glyphs = svg_elements.svg_glyphs svg_lines = svg_elements.svg_lines color = rgb2hex(gc.get_rgb()) @@ -349,9 +352,8 @@ svg.append('translate(%f,%f)' % (x, y)) svg.append('">\n') - for fontname, fontsize, thetext, new_x, new_y_mtc, metrics in svg_glyphs: - prop = FontProperties(family=fontname, size=fontsize) - charid = self._add_char_def(prop, thetext) + for font, fontsize, thetext, new_x, new_y_mtc, metrics in svg_glyphs: + charid = self._add_char_def(font, thetext) svg.append('<use xlink:href="#%s" transform="translate(%s, %s) scale(%s)"/>\n' % (charid, new_x, -new_y_mtc, fontsize / self.FONT_SCALE)) @@ -417,8 +419,8 @@ def get_text_width_height(self, s, prop, ismath): if ismath: - width, height, trash = math_parse_s_ft2font_svg( - s, 72, prop.get_size_in_points()) + width, height, trash, used_characters = \ + math_parse_s_ft2font_svg(s, 72, prop) return width, height font = self._get_font(prop) font.set_text(s, 0.0) Modified: branches/mathtext_mgd/lib/matplotlib/mathtext.py =================================================================== --- branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月18日 13:16:35 UTC (rev 3557) +++ branches/mathtext_mgd/lib/matplotlib/mathtext.py 2007年07月18日 15:27:58 UTC (rev 3558) @@ -229,7 +229,7 @@ The class must be able to take symbol keys and font file names and return the character metrics as well as do the drawing """ - + def get_kern(self, facename, symleft, symright, fontsize, dpi): """ Get the kerning distance for font between symleft and symright. @@ -269,7 +269,10 @@ def render(self, ox, oy, facename, sym, fontsize, dpi): pass - + def get_used_characters(self): + return {} + + class DummyFonts(Fonts): 'dummy class for debugging parser' def get_metrics(self, font, sym, fontsize, dpi): @@ -566,7 +569,7 @@ 'ex' : 'Cmex10' } - class FontCache: + class CachedFont: def __init__(self, font): self.font = font self.charmap = font.get_charmap() @@ -577,15 +580,9 @@ self.glyphd = {} self.fonts = {} self.used_characters = {} - - # MGDTODO: Separate this out into an SVG class -# if useSVG: -# self.svg_glyphs = [] # a list of "glyphs" we need to render this thing in SVG -# else: pass -# self.usingSVG = useSVG def _get_font(self, font): - """Looks up a FontCache with its charmap and inverse charmap. + """Looks up a CachedFont with its charmap and inverse charmap. font may be a TeX font name (cal, rm, it etc.), a Computer Modern font name (cmtt10, cmr10, etc.) or an FT2Font object.""" if isinstance(font, str): @@ -596,14 +593,14 @@ else: basename = font.postscript_name - font_cache = self.fonts.get(basename) - if font_cache is None: + cached_font = self.fonts.get(basename) + if cached_font is None: if isinstance(font, str): - font = FT2Font(os.path.join(self.basepath, basename.lower() + '.ttf')) + font = FT2Font(os.path.join(self.basepath, basename.lower() + ".ttf")) basename = font.postscript_name - font_cache = self.FontCache(font) - self.fonts[basename] = font_cache - return basename, font_cache + cached_font = self.CachedFont(font) + self.fonts[basename] = cached_font + return basename, cached_font def get_fonts(self): return [x.font for x in self.fonts.values()] @@ -613,7 +610,7 @@ self._get_info(font, sym, fontsize, dpi) return metrics - def _get_offset(self, basename, font_cache, glyph, fontsize, dpi): + def _get_offset(self, basename, cached_font, glyph, fontsize, dpi): if basename.lower() == 'cmex10': return glyph.height/64.0/2 + 256.0/64.0*dpi/72.0 return 0. @@ -632,18 +629,18 @@ if font in self.fontmap and latex_to_bakoma.has_key(sym): basename, num = latex_to_bakoma[sym] - basename, font_cache = self._get_font(basename.capitalize()) - symbol_name = font_cache.font.get_glyph_name(num) - num = font_cache.glyphmap[num] + basename, cached_font = self._get_font(basename.capitalize()) + symbol_name = cached_font.font.get_glyph_name(num) + num = cached_font.glyphmap[num] elif len(sym) == 1: - basename, font_cache = self._get_font(font) + basename, cached_font = self._get_font(font) num = ord(sym) - symbol_name = font_cache.font.get_glyph_name(font_cache.charmap[num]) + symbol_name = cached_font.font.get_glyph_name(cached_font.charmap[num]) else: num = 0 raise ValueError('unrecognized symbol "%s"' % sym) - font = font_cache.font + font = cached_font.font font.set_size(fontsize, dpi) glyph = font.load_char(num) @@ -653,7 +650,7 @@ used_characters[1].update(unichr(num)) xmin, ymin, xmax, ymax = [val/64.0 for val in glyph.bbox] - offset = self._get_offset(basename, font_cache, glyph, fontsize, dpi) + offset = self._get_offset(basename, cached_font, glyph, fontsize, dpi) metrics = Bunch( advance = glyph.linearHoriAdvance/65536.0, height = glyph.height/64.0, @@ -671,8 +668,8 @@ 'Dimension the drawing canvas; may be a noop' self.width = int(w) self.height = int(h) - for font_cache in self.fonts.values(): - font_cache.font.set_bitmap_size(int(w), int(h)) + for cached_font in self.fonts.values(): + cached_font.font.set_bitmap_size(int(w), int(h)) def render(self, ox, oy, font, sym, fontsize, dpi): basename, font, metrics, symbol_name, num, glyph, offset = \ @@ -680,22 +677,7 @@ font.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.glyphmaps[basename][num] -# elif len(sym) == 1: -# num = ord(sym) -# else: -# num = 0 -# print >>sys.stderr, 'unrecognized symbol "%s"' % sym -# thetext = unichr(num) -# thetext.encode('utf-8') -# self.svg_glyphs.append((basename, fontsize, thetext, ox, oy, metrics)) - def _old_get_kern(self, font, symleft, symright, fontsize, dpi): """ Get the kerning distance for font between symleft and symright. @@ -715,14 +697,16 @@ #print basename, symleft, symright, key, kern return kern - + def get_used_characters(self): + return self.used_characters + class BakomaPSFonts(BakomaFonts): """ Use the Bakoma postscript fonts for rendering to backend_ps """ - def _get_offset(self, basename, font_cache, glyph, fontsize, dpi): - head = font_cache.font.get_sfnt_table("head") + def _get_offset(self, basename, cached_font, glyph, fontsize, dpi): + head = cached_font.font.get_sfnt_table("head") if basename.lower() == 'cmex10': return -(head['yMin']+512)/head['unitsPerEm']*10. return 0. @@ -759,7 +743,21 @@ self.pswriter.append((ox, oy, filename, fontsize, num)) +class BakomaSVGFonts(BakomaFonts): + """Hack of BakomaFonts for SVG support.""" + def __init__(self): + BakomaFonts.__init__(self) + self.svg_glyphs = [] + + def render(self, ox, oy, font, sym, fontsize, dpi): + basename, font, metrics, symbol_name, num, glyph, offset = \ + self._get_info(font, sym, fontsize, dpi) + oy += offset - 512/2048.*10. + thetext = unichr(num) + thetext.encode('utf-8') + self.svg_glyphs.append((font, fontsize, thetext, ox, oy, metrics)) + class StandardPSFonts(Fonts): """ Use the standard postscript fonts for rendering to backend_ps @@ -768,21 +766,51 @@ # allocate a new set of fonts basepath = os.path.join( get_data_path(), 'fonts', 'afm' ) - fontmap = { 'cal' : 'pzcmi8a', - 'rm' : 'pncr8a', - 'tt' : 'pcrr8a', - 'it' : 'pncri8a', + fontmap = { 'cal' : 'pzcmi8a', # Zapf Chancery + 'rm' : 'pncr8a', # New Century Schoolbook + 'tt' : 'pcrr8a', # Courier + 'it' : 'pncri8a', # New Century Schoolbook Italic + 'sf' : 'phvr8a', # Helvetica + 'bf' : 'pncb8a', # New Century Schoolbook Bold + None : 'psyr' # Symbol } def __init__(self): self.glyphd = {} - self.fonts = dict( - [ (name, AFM(file(os.path.join(self.basepath, name) + '.afm'))) - for name in self.fnames]) + self.fonts = {} + def _get_font(self, font): + if isinstance(font, str): + if font not in self.fontmap.values(): + basename = self.fontmap[font] + else: + basename = font + else: + basename = font.get_fontname() + + cached_font = self.fonts.get(basename) + if cached_font is None: + if isinstance(font, str): + fname = os.path.join(self.basepath, basename + ".afm") + cached_font = AFM(file(fname, 'r')) + cached_font.fname = fname + basename = cached_font.get_fontname() + else: + cached_font = font + self.fonts[basename] = cached_font + return basename, cached_font + + def get_fonts(self): + return [x.font for x in self.fonts.values()] + def _get_info (self, font, sym, fontsize, dpi): 'load the cmfont, metrics and glyph with caching' - key = font, sym, fontsize, dpi + if hasattr(font, 'get_fontname'): + fontname = font.get_fontname() + else: + fontname = font + + key = fontname, sym, fontsize, dpi tup = self.glyphd.get(key) if tup is not None: @@ -790,41 +818,40 @@ if sym in "0123456789()" and font == 'it': font = 'rm' - basename = self.fontmap[font] if latex_to_standard.has_key(sym): - basename, num = latex_to_standard[sym] - char = chr(num) + font, num = latex_to_standard[sym] + glyph = chr(num) elif len(sym) == 1: - char = sym + glyph = sym + num = ord(glyph) else: raise ValueError('unrecognized symbol "%s"' % (sym)) - + basename, font = self._get_font(font) + try: - sym = self.fonts[basename].get_name_char(char) + symbol_name = font.get_name_char(glyph) except KeyError: raise ValueError('unrecognized symbol "%s"' % (sym)) offset = 0 - cmfont = self.fonts[basename] - fontname = cmfont.get_fontname() scale = 0.001 * fontsize xmin, ymin, xmax, ymax = [val * scale - for val in cmfont.get_bbox_char(char)] + for val in font.get_bbox_char(glyph)] metrics = Bunch( advance = (xmax-xmin), - width = cmfont.get_width_char(char) * scale, - height = cmfont.get_width_char(char) * scale, + width = font.get_width_char(glyph) * scale, + height = font.get_width_char(glyph) * scale, xmin = xmin, xmax = xmax, ymin = ymin+offset, ymax = ymax+offset ) - self.glyphd[key] = fontname, basename, metrics, sym, offset, char - return fontname, basename, metrics, '/'+sym, offset, char + self.glyphd[key] = basename, font, metrics, symbol_name, num, glyph, offset + return self.glyphd[key] def set_canvas_size(self, w, h, pswriter): 'Dimension the drawing canvas; may be a noop' @@ -832,32 +859,33 @@ self.height = h self.pswriter = pswriter - def render(self, ox, oy, font, sym, fontsize, dpi): - fontname, basename, metrics, glyphname, offset, char = \ + basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) - ps = """/%(fontname)s findfont + ps = """/%(basename)s findfont %(fontsize)s scalefont setfont %(ox)f %(oy)f moveto -/%(glyphname)s glyphshow +/%(symbol_name)s glyphshow """ % locals() self.pswriter.write(ps) def get_metrics(self, font, sym, fontsize, dpi): - fontname, basename, metrics, sym, offset, char = \ + basename, font, metrics, symbol_name, num, glyph, offset = \ self._get_info(font, sym, fontsize, dpi) return metrics def get_kern(self, font, symleft, symright, fontsize, dpi): - fontname, basename, metrics, sym, offset, char1 = \ + basename, font1, metrics, symbol_name, num, glyph1, offset = \ self._get_info(font, symleft, fontsize, dpi) - fontname, basename, metrics, sym, offset, char2 = \ + basename, font2, metrics, symbol_name, num, glyph2, offset = \ self._get_info(font, symright, fontsize, dpi) - cmfont = self.fonts[basename] - return cmfont.get_kern_dist(char1, char2) * 0.001 * fontsize - + if font1.get_fontname() == font2.get_fontname(): + basename, font = self._get_font(font) + return font.get_kern_dist(glyph1, glyph2) * 0.001 * fontsize + return 0 + class Element: fontsize = 12 dpi = 72 @@ -1667,34 +1695,37 @@ w, h, fontlike, used_characters = self.cache[cacheKey] return w, h, fontlike, used_characters + use_afm = False if self.output == 'SVG': - self.font_object = BakomaFonts(useSVG=True) + self.font_object = BakomaSVGFonts() #self.font_object = MyUnicodeFonts(output='SVG') - Element.fonts = self.font_object elif self.output == 'Agg': self.font_object = BakomaFonts() #self.font_object = MyUnicodeFonts() - Element.fonts = self.font_object elif self.output == 'PS': if rcParams['ps.useafm']: self.font_object = StandardPSFonts() - Element.fonts = self.font_object + use_afm = True else: self.font_object = BakomaPSFonts() #self.font_object = MyUnicodeFonts(output='PS') - Element.fonts = self.font_object elif self.output == 'PDF': self.font_object = BakomaPDFFonts() - Element.fonts = self.font_object - + Element.fonts = self.font_object + fontsize = prop.get_size_in_points() handler.clear() expression.parseString( s ) + + if use_afm: + fname = fontManager.findfont(prop, fontext='afm') + default_font = AFM(file(fname, 'r')) + default_font.fname = fname + else: + fname = fontManager.findfont(prop) + default_font = FT2Font(fname) - fname = fontManager.findfont(prop) - default_font = FT2Font(str(fname)) - handler.expr.determine_font([default_font]) handler.expr.set_size_info(fontsize, dpi) @@ -1729,11 +1760,14 @@ # The empty list at the end is for lines svg_elements = Bunch(svg_glyphs=self.font_object.svg_glyphs, svg_lines=[]) - self.cache[cacheKey] = w, h, svg_elements, Element.fonts.used_characters + self.cache[cacheKey] = \ + w, h, svg_elements, Element.fonts.get_used_characters() elif self.output == 'Agg': - self.cache[cacheKey] = w, h, self.font_object.get_fonts(), Element.fonts.used_characters + self.cache[cacheKey] = \ + w, h, self.font_object.get_fonts(), Element.fonts.get_used_characters() elif self.output in ('PS', 'PDF'): - self.cache[cacheKey] = w, h, pswriter, Element.fonts.used_characters + self.cache[cacheKey] = \ + w, h, pswriter, Element.fonts.get_used_characters() return self.cache[cacheKey] if rcParams["mathtext.mathtext2"]: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.