Changed ft2font.get_charmap so that it now returns a character code->glyph index dict, instead of the reverse as it used to return; updated all the files where get_charmap is used

edin1 · edin1 · commit cf29210bc084 · 2007-02-17T21:43:39.000Z
svn path=/trunk/matplotlib/; revision=3026
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,6 @@
+    ft2font.get_charmap() now returns a dict that maps character codes
+    to glyph indices (until now it was reversed)
+    
     Moved data files into lib/matplotlib so that setuptools' develop
     mode works. Re-organized the mpl-data layout so that this source
     structure is maintained in the installation. (I.e. the 'fonts' and
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2007-02-17 Changed ft2font.get_charmap, and updated all the files where
+           get_charmap is mentioned - ES
+
 2007-02-13 Added barcode demo- JDH
 
 2007-02-13 Added binary colormap to cm - JDH
diff --git a/examples/font_indexing.py b/examples/font_indexing.py
@@ -14,8 +14,8 @@
 font.set_charmap(0)
 
 codes = font.get_charmap().items()
-dsu = [(ccode, glyphind) for glyphind, ccode in codes]
-dsu.sort()
+#dsu = [(ccode, glyphind) for ccode, glyphind in codes]
+#dsu.sort()
 #for ccode, glyphind in dsu: 
 #    try: name = font.get_glyph_name(glyphind)
 #    except RuntimeError: pass
@@ -26,7 +26,7 @@
 # make a charname to charcode and glyphind dictionary
 coded = {}
 glyphd = {}
-for glyphind, ccode in codes:
+for ccode, glyphind in codes:
     name = font.get_glyph_name(glyphind)
     coded[name] = ccode
     glyphd[name] = glyphind
diff --git a/examples/font_table_ttf.py b/examples/font_table_ttf.py
@@ -28,7 +28,7 @@
 colors = [ [0.95 for c in range(16)] for r in range(16)]
 
 figure(figsize=(8,4),dpi=120)
-for glyphind, ccode in codes:
+for ccode, glyphind in codes:
     if ccode>=256: continue
     r,c = divmod(ccode,16)
     s = chr(ccode)
diff --git a/examples/mathtext2_demo.py b/examples/mathtext2_demo.py
@@ -8,57 +8,57 @@
 
 BUILD_FT2FONT = True
 
-You have to put the following lines in your matplotlibrc file
+You have to put the following lines in your matplotlibrc file if you want to
+enable mathtext2 globaly (not needed for running this example):
 
 mathtext.mathtext2: True            # Needed to enable the new mathtext
 mathtext.rm     :   FreeSerif.ttf
 mathtext.it     :   FreeSerifItalic.ttf     # Text italic
 mathtext.tt     :   FreeMono.ttf    # Typewriter (monospaced)
 mathtext.mit    :   FreeSerifItalic.ttf     # Math italic
 mathtext.cal    :   FreeSansOblique.ttf # Caligraphic
-mathtext.nonascii:  FreeSerif.ttf # Used for \sum, \infty etc.
+mathtext.nonascii:  FreeSerif.ttf # #Used for \sum, \infty etc.
 
-Note that "FreeSerif.ttf" etc. may be replaced by any font. Also, for now
-the font files must me in the mpl-data dir.
+Note that "FreeSerif.ttf" etc. may be replaced by any font. Font files must be
+in your system's font path.
 
 Only the first parameter must be set (mathtext2 uses BaKoMa fonts by
 default, and they come packaged with matplotlib, so the above lines
 override them) because mathtext2 is disabled by default.
 
-This demo assumes that you have FreeSerif.ttf in the mpl-data dir.
+This demo assumes that you have FreeSerif.ttf installed.
 You can get FreeSerif.ttf (and other files) from:
 http://download.savannah.gnu.org/releases/freefont/
-
-FreeFonts are distributed under GPL
+if you are on windows. On linux, they are usually shipped by default.
+FreeFonts are distributed under GPL.
 
 """
 # We override the default params
 from matplotlib import rcParams
-#rcParams['mathtext.mathtext2'] = True
+rcParams['mathtext.mathtext2'] = True
 
 # You can put other fonts to override the default ones
-#rcParams['mathtext.rm'] = 'FreeSerif.ttf'
+rcParams['mathtext.rm'] = 'FreeSerif.ttf'
 #rcParams['mathtext.it'] = 'FreeSerifItalic.ttf'
 #rcParams['mathtext.tt'] = 'FreeMono.ttf'
 #rcParams['mathtext.mit'] = 'FreeSerifItalic.ttf'
 #rcParams['mathtext.cal'] = 'FreeSansOblique.ttf'
 
 # This is used by mathtext2 to find chars with ord > 255 (Unicode characters)
-#rcParams['mathtext.nonascii'] = 'FreeSerif.ttf'
-
+rcParams['mathtext.nonascii'] = 'FreeSerif.ttf'
 from pylab import *
 subplot(111, axisbg='y')
 plot([1,2,3], 'r')
 x = arange(0.0, 3.0, 0.1)
-
-tex = r'$u_{x^2_1}^{y_{-q_u}}$'
-text(0.5, 2., tex, fontsize=20)
-show()
 grid(True)
+
+tex = r'$1+1\ u_{x^2_1}^{y_{-q_u}}$'
+#text(0.5, 2., tex, fontsize=20)
+#show()
 #xlabel(r'$\Delta_i^j$', fontsize=20)
 #ylabel(r'$\Delta_{i+1}^j$', fontsize=20)
 #tex = r'$\cal{R}\prod_{i=\alpha_{i+1}}^\infty a_i\rm{sin}(2 \pi f x_i)$'
-tex = ur"$1^j_3$"
+#tex = ur"$1^j_3$"
 #tex = ur"$Tj_1j_jj_gT$"
 #tex = ur"$F_1^1y_{1_{2_{3_2\sum_1^2{4}^6}}3}1_23$"
 #tex = ur"$x_2{\cal TRALALA}\sum_1^2$"
@@ -68,18 +68,22 @@
 #tex = ur"$\sin\exp{\rm sin\ exp}$"
 #tex = ur"$a^{\sin x}\sin b\sin(x/x), {\rm sin}(x/x){\rm sin\ }(x/x)$"
 #tex = ur"$1\frac {\int_{-\infty}^\infty} 22$"
+#tex = ur"$\rm a\vtext{Traktor}b$"
+tex = ur"$a\vtext{a}$"
 #tex = ur"$\frac{\int_{-\infty}^\infty} 2$"
 #tex = ur"$1_\frac{\sum^2_{i_{23}=0}} 2678$"
-tex = ur"$1_{\frac{\sum^2_{i_{23}=0}}{\sum_{i=\frac94}^\infty} 345}678$"
+#tex = ur"$1_{\frac{\sum^2_{i_{23}=0}}{\sum_{i=\frac94}^\infty} 345}678$"
 text(0.5, 2., tex, fontsize=20)
 tex = r'${\cal R}\prod_{i=\alpha_{i+1}}^\infty a_i\sin\exp(2 \pi f x_i)$'
-text(1, 1.9, tex, fontsize=20)
+#text(1, 1.9, tex, fontsize=20)
 tex = ur"$F_1^1y_{1_{2_{3_2\sum_1^2{4}^6}}3}1_23$"
-text(1, 1.7, tex, fontsize=20)
+#text(1, 1.7, tex, fontsize=20)
 tex = ur"$x = \sin(\sum_{i=0}^\infty y_i)$"
-text(1, 1.5, tex, fontsize=20)
+#text(1, 1.5, tex, fontsize=20)
 #title(r'$\Delta_i^j \hspace{0.4} \rm{versus} \hspace{0.4} \Delta_{i+1}^j$', fontsize=20)
-savefig('mathtext_demo.png')
+
+#savefig('mathtext_demo.png')
+savefig('mathtext_demo.svg')
 #savefig('mathtext_demo.ps')
 
 
diff --git a/lib/matplotlib/_mathtext_data.py b/lib/matplotlib/_mathtext_data.py
@@ -3,14 +3,11 @@
 """
 
 # this dict maps symbol names to fontnames, glyphindex.  To get the
-# glyph index from the character code, you have to use a reverse
-# dictionary grom font.get_charmaps, eg,
+# glyph index from the character code, you have to use get_charmap
 """
 from matplotlib.ft2font import FT2Font
 font = FT2Font('/usr/local/share/matplotlib/cmr10.ttf')
-codes = font.get_charmap().items()
-rd = dict([(charcode, glyphind) for glyphind,charcode in codes])
-items = rd.items()
+items = font.get_charmap().items()
 items.sort()
 
 for charcode, glyphind in items:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -15,7 +15,7 @@ def _fn_name(): return sys._getframe(1).f_code.co_name
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
 
-from matplotlib.cbook import is_string_like, izip, reverse_dict
+from matplotlib.cbook import is_string_like, izip
 from matplotlib.figure import Figure
 
 from matplotlib.font_manager import fontManager
@@ -753,14 +753,13 @@ def draw_unicode(self, gc, x, y, s, prop, angle):
         self.set_font(font.get_sfnt()[(1,0,0,6)], prop.get_size_in_points())
 
         cmap = font.get_charmap()
-        glyphd = reverse_dict(cmap)
         lastgind = None
         #print 'text', s
         lines = []
         thisx, thisy = 0,0
         for c in s:
             ccode = ord(c)
-            gind = glyphd.get(ccode)
+            gind = cmap.get(ccode)
             if gind is None:
                 ccode = ord('?')
                 name = '.notdef'
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -302,11 +302,12 @@ class UnicodeFonts(Fonts):
     filenamesd should be declared as a class atribute
  * glyphdict: a dict used for caching of glyph specific data
  * fonts: a dict of facename -> fontface pairs
- * charmaps: a dict of facename -> charmap pairs
+ * charmaps: a dict of facename -> charmap pairs. Charmap maps character
+   codes to glyph indices
  * glyphmaps: a dict of facename -> glyphmap pairs. A glyphmap is an
     inverted charmap
  * output: a string in ['Agg','SVG','PS'], coresponding to the backends
- * index: Fontfile specific index of a glyph/char. Taken from a charmap.
+ * index: Fontfile specific index of a glyph.
 
 """
 
@@ -324,16 +325,16 @@ def __init__(self, output='Agg'):
         self.fonts = dict(
             [ (facename, font_open(self.filenamesd[facename])) for
                     facename in self.facenames])
-        # a dict of glyphindex -> charcode pairs
+        # a dict of charcode -> glyphindex pairs
         self.charmaps = dict(
             [ (facename, self.fonts[facename].get_charmap())
                 for facename in self.facenames])
-        # a dict of charcode -> glyphindex pairs
+        # a dict of glyphindex -> charcode pairs
         self.glyphmaps = {}
         for facename in self.facenames:
             charmap = self.charmaps[facename]
-            self.glyphmaps[facename] = dict([(charcode, glyphind)
-                for glyphind, charcode in charmap.items()])
+            self.glyphmaps[facename] = dict([(glyphind, charcode)
+                for charcode, glyphind in charmap.items()])
         for fontface in self.fonts.values():
             fontface.clear()
         if self.output == 'SVG':
@@ -578,11 +579,11 @@ def __init__(self, useSVG=False):
 
         self.charmaps = dict(
             [ (name, self.fonts[name].get_charmap()) for name in self.fnames])
-        # glyphmaps is a dict names to a dict of charcode -> glyphindex
+        # 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([(ccode, glyphind) for glyphind, ccode in cmap.items()])
+            self.glyphmaps[name] = dict([(glyphind, ccode) for ccode, glyphind in cmap.items()])
         
         for font in self.fonts.values():
             font.clear()
@@ -607,7 +608,7 @@ def _get_info (self, font, sym, fontsize, dpi):
 
         if latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
-            num = self.charmaps[basename][num]
+            num = self.glyphmaps[basename][num]
         elif len(sym) == 1:
             num = ord(sym)
         else:
@@ -658,7 +659,7 @@ def render(self, ox, oy, font, sym, fontsize, dpi):
             basename = self.fontmap[font]
             if latex_to_bakoma.has_key(sym):
                 basename, num = latex_to_bakoma[sym]
-                num = self.charmaps[basename][num]
+                num = self.glyphmaps[basename][num]
             elif len(sym) == 1:
                 num = ord(sym)
             else:
@@ -693,7 +694,7 @@ def _get_num(self, font, sym):
         basename = self.fontmap[font]
         if latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
-            num = self.charmaps[basename][num]
+            num = self.glyphmaps[basename][num]
         elif len(sym) == 1:
             num = ord(sym)
         else:
@@ -705,7 +706,7 @@ class BakomaPSFonts(Fonts):
     """
     Use the Bakoma postscript fonts for rendering to backend_ps
     """
-    fnames = ('cmmi10', 'cmsy10', 'cmex10',
+    facenames = ('cmmi10', 'cmsy10', 'cmex10',
               'cmtt10', 'cmr10')
     # allocate a new set of fonts
     basepath = os.path.join( get_data_path(), 'fonts', 'ttf' )
@@ -721,10 +722,13 @@ def __init__(self):
         self.glyphd = {}
         self.fonts = dict(
             [ (name, FT2Font(os.path.join(self.basepath, name) + '.ttf'))
-              for name in self.fnames])
+              for name in self.facenames])
 
-        self.charmaps = dict(
-            [ (name, self.fonts[name].get_charmap()) for name in self.fnames])
+        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()
 
@@ -741,7 +745,7 @@ def _get_info (self, font, sym, fontsize, dpi):
         if latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
             sym = self.fonts[basename].get_glyph_name(num)
-            num = self.charmaps[basename][num]
+            num = self.glyphmaps[basename][num]
         elif len(sym) == 1:
             num = ord(sym)
         else:
@@ -812,7 +816,7 @@ def _get_filename_and_num (self, font, sym, fontsize, dpi):
         if latex_to_bakoma.has_key(sym):
             basename, num = latex_to_bakoma[sym]
             sym = self.fonts[basename].get_glyph_name(num)
-            num = self.charmaps[basename][num]
+            num = self.glyphmaps[basename][num]
         elif len(sym) == 1:
             num = ord(sym)
         else:
diff --git a/lib/matplotlib/mathtext2.py b/lib/matplotlib/mathtext2.py
diff --git a/setup.py b/setup.py
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
