Merge branch 'mathdefault'

mdboom · mdboom · commit 40356df42384 · 2008-12-26T16:28:04.000Z
svn path=/trunk/matplotlib/; revision=6702
diff --git a/lib/matplotlib/config/mplconfig.py b/lib/matplotlib/config/mplconfig.py
@@ -168,6 +168,7 @@ class mathtext(TConfig):
         bf  = T.Trait('serif:bold'    , mplT.FontconfigPatternHandler())
         sf  = T.Trait('sans'          , mplT.FontconfigPatternHandler())
         fontset = T.Trait('cm', 'cm', 'stix', 'stixsans', 'custom')
+        default = T.Trait(*("rm cal it tt sf bf default bb frak circled scr regular".split()))
         fallback_to_cm = T.true
 
     class axes(TConfig):
diff --git a/lib/matplotlib/config/rcsetup.py b/lib/matplotlib/config/rcsetup.py
@@ -209,6 +209,9 @@ def validate_font_properties(s):
 
 validate_fontset = ValidateInStrings('fontset', ['cm', 'stix', 'stixsans', 'custom'])
 
+validate_mathtext_default = ValidateInStrings(
+    'default', "rm cal it tt sf bf default bb frak circled scr regular".split())
+
 validate_verbose = ValidateInStrings('verbose',[
     'silent', 'helpful', 'debug', 'debug-annoying',
     ])
@@ -371,6 +374,7 @@ def __call__(self, s):
     'mathtext.bf'         : ['serif:bold', validate_font_properties],
     'mathtext.sf'         : ['sans\-serif', validate_font_properties],
     'mathtext.fontset'    : ['cm', validate_fontset],
+    'mathtext.default'    : ['it', validate_mathtext_default],
     'mathtext.fallback_to_cm' : [True, validate_bool],
 
     'image.aspect'        : ['equal', validate_aspect],  # equal, auto, a number
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -403,7 +403,7 @@ def get_kern(self, font1, fontclass1, sym1, fontsize1,
 
         *fontX*: one of the TeX font names::
 
-          tt, it, rm, cal, sf, bf or default (non-math)
+          tt, it, rm, cal, sf, bf or default/regular (non-math)
 
         *fontclassX*: TODO
 
@@ -419,7 +419,7 @@ def get_metrics(self, font, font_class, sym, fontsize, dpi):
         """
         *font*: one of the TeX font names::
 
-          tt, it, rm, cal, sf, bf or default (non-math)
+          tt, it, rm, cal, sf, bf or default/regular (non-math)
 
         *font_class*: TODO
 
@@ -543,6 +543,7 @@ def __init__(self, default_font_prop, mathtext_backend):
         filename = findfont(default_font_prop)
         default_font = self.CachedFont(FT2Font(str(filename)))
         self._fonts['default'] = default_font
+        self._fonts['regular'] = default_font
 
     def destroy(self):
         self.glyphd = None
@@ -616,7 +617,7 @@ def get_xheight(self, font, fontsize, dpi):
         pclt = cached_font.font.get_sfnt_table('pclt')
         if pclt is None:
             # Some fonts don't store the xHeight, so we do a poor man's xHeight
-            metrics = self.get_metrics(font, 'it', 'x', fontsize, dpi)
+            metrics = self.get_metrics(font, rcParams['mathtext.default'], 'x', fontsize, dpi)
             return metrics.iceberg
         xHeight = (pclt['xHeight'] / 64.0) * (fontsize / 12.0) * (dpi / 100.0)
         return xHeight
@@ -936,7 +937,7 @@ def _map_virtual_font(self, fontname, font_class, uniindex):
             elif not doing_sans_conversion:
                 # This will generate a dummy character
                 uniindex = 0x1
-                fontname = 'it'
+                fontname = rcParams['mathtext.default']
 
         # Handle private use area glyphs
         if (fontname in ('it', 'rm', 'bf') and
@@ -1007,6 +1008,7 @@ def __init__(self, default_font_prop):
         default_font.fname = filename
 
         self.fonts['default'] = default_font
+        self.fonts['regular'] = default_font
         self.pswriter = StringIO()
 
     def _get_font(self, font):
@@ -2064,7 +2066,7 @@ class Parser(object):
 
     _dropsub_symbols = set(r'''\int \oint'''.split())
 
-    _fontnames = set("rm cal it tt sf bf default bb frak circled scr".split())
+    _fontnames = set("rm cal it tt sf bf default bb frak circled scr regular".split())
 
     _function_names = set("""
       arccos csc ker min arcsin deg lg Pr arctan det lim sec arg dim
@@ -2294,7 +2296,7 @@ def copy(self):
         def _get_font(self):
             return self._font
         def _set_font(self, name):
-            if name in ('it', 'rm', 'bf'):
+            if name in Parser._fontnames:
                 self.font_class = name
             self._font = name
         font = property(_get_font, _set_font)
@@ -2336,7 +2338,7 @@ def non_math(self, s, loc, toks):
         hlist = Hlist(symbols)
         # We're going into math now, so set font to 'it'
         self.push_state()
-        self.get_state().font = 'it'
+        self.get_state().font = rcParams['mathtext.default']
         return [hlist]
 
     def _make_space(self, percentage):
@@ -2346,7 +2348,7 @@ def _make_space(self, percentage):
         width = self._em_width_cache.get(key)
         if width is None:
             metrics = state.font_output.get_metrics(
-                state.font, 'it', 'm', state.fontsize, state.dpi)
+                state.font, rcParams['mathtext.default'], 'm', state.fontsize, state.dpi)
             width = metrics.advance
             self._em_width_cache[key] = width
         return Kern(width * percentage)
@@ -2665,7 +2667,7 @@ def frac(self, s, loc, toks):
         # Shift so the fraction line sits in the middle of the
         # equals sign
         metrics = state.font_output.get_metrics(
-            state.font, 'it', '=', state.fontsize, state.dpi)
+            state.font, rcParams['mathtext.default'], '=', state.fontsize, state.dpi)
         shift = (cden.height -
                  ((metrics.ymax + metrics.ymin) / 2 -
                   thickness * 3.0))
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -233,6 +233,9 @@ def validate_font_properties(s):
 
 validate_fontset = ValidateInStrings('fontset', ['cm', 'stix', 'stixsans', 'custom'])
 
+validate_mathtext_default = ValidateInStrings(
+    'default', "rm cal it tt sf bf default bb frak circled scr regular".split())
+
 validate_verbose = ValidateInStrings('verbose',[
     'silent', 'helpful', 'debug', 'debug-annoying',
     ])
@@ -397,6 +400,7 @@ def __call__(self, s):
     'mathtext.bf'         : ['serif:bold', validate_font_properties],
     'mathtext.sf'         : ['sans\-serif', validate_font_properties],
     'mathtext.fontset'    : ['cm', validate_fontset],
+    'mathtext.default'    : ['it', validate_mathtext_default],
     'mathtext.fallback_to_cm' : [True, validate_bool],
 
     'image.aspect'        : ['equal', validate_aspect],  # equal, auto, a number
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -185,6 +185,11 @@ numerix      : %(numerix)s  # numpy, Numeric or numarray
 			         # fonts when a symbol can not be found in one of
 				 # the custom math fonts.
 
+#mathtext.default : it # The default font to use for math.
+                       # Can be any of the LaTeX font names, including
+                       # the special name "regular" for the same font
+                       # used in regular text.
+
 ### AXES
 # default face and edge color, default tick sizes,
 # default fontsizes for ticklabels, and so on.  See
