Add an rcParam for hinting, and set it to False when running tests.

mdboom · mdboom · commit 77a00a7e420b · 2009-09-08T15:17:20.000Z
svn path=/trunk/matplotlib/; revision=7712
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -893,6 +893,8 @@ def test(verbosity=0):
     from testing.noseclasses import KnownFailure
     from nose.plugins.manager import PluginManager
     use('Agg') # use Agg backend for these tests
+    rcParams['font.family'] = 'Bitstream Vera Sans'
+    rcParams['text.hinting'] = False
     plugins = []
     plugins.append( KnownFailure() )
     plugins.extend( [plugin() for plugin in nose.plugins.builtin.plugins] )
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -30,7 +30,7 @@
 from matplotlib.cbook import is_string_like, maxdict
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont
-from matplotlib.ft2font import FT2Font, LOAD_FORCE_AUTOHINT
+from matplotlib.ft2font import FT2Font, LOAD_FORCE_AUTOHINT, LOAD_NO_HINTING
 from matplotlib.mathtext import MathTextParser
 from matplotlib.path import Path
 from matplotlib.transforms import Bbox, BboxBase
@@ -69,6 +69,12 @@ def __init__(self, width, height, dpi):
         if __debug__: verbose.report('RendererAgg.__init__ done',
                                      'debug-annoying')
 
+    def _get_hinting_flag(self):
+        if rcParams['text.hinting']:
+            return LOAD_FORCE_AUTOHINT
+        else:
+            return LOAD_NO_HINTING
+
     def draw_markers(self, *kl, **kw):
         # for filtering to work with rastrization, methods needs to be wrapped.
         # maybe there is better way to do it.
@@ -132,14 +138,15 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath):
         if ismath:
             return self.draw_mathtext(gc, x, y, s, prop, angle)
 
+        flags = self._get_hinting_flag()
         font = self._get_agg_font(prop)
         if font is None: return None
         if len(s) == 1 and ord(s) > 127:
-            font.load_char(ord(s), flags=LOAD_FORCE_AUTOHINT)
+            font.load_char(ord(s), flags=flags)
         else:
             # We pass '0' for angle here, since it will be rotated (in raster
             # space) in the following call to draw_text_image).
-            font.set_text(s, 0, flags=LOAD_FORCE_AUTOHINT)
+            font.set_text(s, 0, flags=flags)
         font.draw_glyphs_to_bitmap()
 
         #print x, y, int(x), int(y), s
@@ -168,8 +175,10 @@ def get_text_width_height_descent(self, s, prop, ismath):
             ox, oy, width, height, descent, fonts, used_characters = \
                 self.mathtext_parser.parse(s, self.dpi, prop)
             return width, height, descent
+
+        flags = self._get_hinting_flag()
         font = self._get_agg_font(prop)
-        font.set_text(s, 0.0, flags=LOAD_FORCE_AUTOHINT)  # the width and height of unrotated string
+        font.set_text(s, 0.0, flags=flags)  # the width and height of unrotated string
         w, h = font.get_width_height()
         d = font.get_descent()
         w /= 64.0  # convert from subpixels
diff --git a/lib/matplotlib/config/mplconfig.py b/lib/matplotlib/config/mplconfig.py
@@ -154,6 +154,7 @@ class font(TConfig):
     class text(TConfig):
         color = T.Trait('black',mplT.ColorHandler())
         usetex = T.false
+        hinting = T.true
 
         class latex(TConfig):
             unicode = T.false
@@ -338,6 +339,7 @@ def __init__(self, tconfig):
         'text.latex.unicode' : (self.tconfig.text.latex, 'unicode'),
         'text.latex.preamble' : (self.tconfig.text.latex, 'preamble'),
         'text.dvipnghack' : (self.tconfig.text.latex, 'dvipnghack'),
+        'text.hinting' : (self.tconfig.text, 'hinting'),
 
         'mathtext.cal'        : (self.tconfig.mathtext, 'cal'),
         'mathtext.rm'         : (self.tconfig.mathtext, 'rm'),
diff --git a/lib/matplotlib/config/rcsetup.py b/lib/matplotlib/config/rcsetup.py
@@ -361,6 +361,7 @@ def __call__(self, s):
     'text.fontvariant'    : ['normal', str],
     'text.fontweight'     : ['normal', str],
     'text.fontsize'       : ['medium', validate_fontsize],
+    'text.hinting'        : [True, validate_bool],
 
     'mathtext.cal'        : ['cursive', validate_font_properties],
     'mathtext.rm'         : ['serif', validate_font_properties],
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -222,7 +222,10 @@ def get_results(self, box):
                 self.fonts_object.get_used_characters())
 
     def get_hinting_type(self):
-        return LOAD_FORCE_AUTOHINT
+        if rcParams['text.hinting']:
+            return LOAD_FORCE_AUTOHINT
+        else:
+            return LOAD_NO_HINTING
 
 def MathtextBackendAgg():
     return MathtextBackendBbox(MathtextBackendAggRender())
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -404,6 +404,7 @@ def __call__(self, s):
     'text.fontvariant'    : ['normal', str],
     'text.fontweight'     : ['normal', str],
     'text.fontsize'       : ['medium', validate_fontsize],
+    'text.hinting'        : [True, validate_bool],
 
     'mathtext.cal'        : ['cursive', validate_font_properties],
     'mathtext.rm'         : ['serif', validate_font_properties],
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -25,7 +25,7 @@
 
 from matplotlib.path import Path
 import matplotlib.font_manager as font_manager
-from matplotlib.ft2font import FT2Font, KERNING_DEFAULT, LOAD_NO_HINTING
+from matplotlib.ft2font import FT2Font
 
 
 def _process_text_args(override, fontdict=None, **kwargs):
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -167,6 +167,9 @@ backend      : %(backend)s
 				# In that case, all text will be sent to TeX for
 				# processing.
 
+#text.hinting : True # If True, text will be hinted, otherwise not.  This only
+                     # affects the Agg backend.
+
 # The following settings allow you to select the fonts in math mode.
 # They map from a TeX font name to a fontconfig font pattern.
 # These settings are only used if mathtext.fontset is 'custom'.
@@ -290,7 +293,7 @@ backend      : %(backend)s
                                   # A value of 20000 is probably a good
                                   # starting point.
 ### SAVING FIGURES
-#path.simplify : False  # When True, simplify paths by removing "invisible" 
+#path.simplify : False  # When True, simplify paths by removing "invisible"
                         # points to reduce file size and increase rendering
                         # speed
 #path.simplify_threshold : 0.1  # The threshold of similarity below which
