Revision: 3711
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3711&view=rev
Author: dsdale
Date: 2007-08-16 12:43:35 -0700 (Thu, 16 Aug 2007)
Log Message:
-----------
update traited config for text.markup
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/config/mplconfig.py
trunk/matplotlib/lib/matplotlib/config/rcsetup.py
Modified: trunk/matplotlib/lib/matplotlib/config/mplconfig.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-08-16 12:53:13 UTC
(rev 3710)
+++ trunk/matplotlib/lib/matplotlib/config/mplconfig.py 2007-08-16 19:43:35 UTC
(rev 3711)
@@ -153,7 +153,7 @@
class text(TConfig):
color = T.Trait('black',mplT.ColorHandler())
usetex = T.false
- markup = T.Trait('plain', 'tex')
+ markup = T.Trait('plain', 'plain', 'tex')
class latex(TConfig):
unicode = T.false
Modified: trunk/matplotlib/lib/matplotlib/config/rcsetup.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/rcsetup.py 2007-08-16 12:53:13 UTC
(rev 3710)
+++ trunk/matplotlib/lib/matplotlib/config/rcsetup.py 2007-08-16 19:43:35 UTC
(rev 3711)
@@ -198,6 +198,17 @@
except ValueError:
raise ValueError('not a valid font size')
+def validate_mathtext_font(s):
+ s = eval(s)
+ if type(s) in (list, tuple) and len(s) == 3:
+ return s
+ raise ValueError('Mathtext font specifier must be a 3-tuple of (family,
weight, style)')
+
+validate_markup = ValidateInStrings(
+ 'markup',
+ ['plain', 'tex'],
+ ignorecase=True)
+
validate_verbose = ValidateInStrings('verbose',[
'silent', 'helpful', 'debug', 'debug-annoying',
])
@@ -323,21 +334,24 @@
'font.stretch' : ['normal', str], #
'font.weight' : ['normal', str], #
'font.size' : [12.0, validate_float], #
- 'font.serif' : [['Bitstream Vera Serif','New Century Schoolbook',
- 'Century Schoolbook L','Utopia','ITC Bookman',
- 'Bookman','Nimbus Roman No9 L','Times New Roman',
- 'Times','Palatino','Charter','serif'],
+ 'font.serif' : [['Bitstream Vera Serif', 'DejaVu Serif',
+ 'New Century Schoolbook', 'Century Schoolbook L',
+ 'Utopia', 'ITC Bookman', 'Bookman',
+ 'Nimbus Roman No9 L','Times New Roman',
+ 'Times','Palatino','Charter','serif'],
validate_stringlist],
- 'font.sans-serif' : [['Bitstream Vera Sans','Lucida Grande','Verdana',
- 'Geneva','Lucid','Arial','Helvetica','Avant Garde',
- 'sans-serif'], validate_stringlist],
+ 'font.sans-serif' : [['Bitstream Vera Sans', 'DejaVu Sans',
+ 'Lucida Grande', 'Verdana', 'Geneva', 'Lucid',
+ 'Arial', 'Helvetica', 'Avant Garde', 'sans-serif'],
+ validate_stringlist],
'font.cursive' : [['Apple Chancery','Textile','Zapf Chancery',
'Sand','cursive'], validate_stringlist],
'font.fantasy' : [['Comic Sans MS','Chicago','Charcoal','Impact'
'Western','fantasy'], validate_stringlist],
- 'font.monospace' : [['Bitstream Vera Sans Mono','Andale Mono'
- 'Nimbus Mono L','Courier New','Courier','Fixed'
- 'Terminal','monospace'], validate_stringlist],
+ 'font.monospace' : [['Bitstream Vera Sans Mono', 'DejaVu Sans Mono',
+ 'Andale Mono', 'Nimbus Mono L', 'Courier New',
+ 'Courier','Fixed', 'Terminal','monospace'],
+ validate_stringlist],
# text props
'text.color' : ['k', validate_color], # black
@@ -345,8 +359,22 @@
'text.latex.unicode' : [False, validate_bool],
'text.latex.preamble' : [[''], validate_latex_preamble],
'text.dvipnghack' : [False, validate_bool],
+ 'text.fontstyle' : ['normal', str],
+ 'text.fontangle' : ['normal', str],
+ 'text.fontvariant' : ['normal', str],
+ 'text.fontweight' : ['normal', str],
+ 'text.fontsize' : ['medium', validate_fontsize],
+ 'text.markup' : ['plain', validate_markup],
- # image props
+ 'mathtext.cal' : [('cursive', 'normal', 'normal'),
validate_mathtext_font],
+ 'mathtext.rm' : [('serif', 'normal', 'normal'),
validate_mathtext_font],
+ 'mathtext.tt' : [('monospace', 'normal', 'normal'),
validate_mathtext_font],
+ 'mathtext.it' : [('serif', 'normal', 'italic'),
validate_mathtext_font],
+ 'mathtext.bf' : [('serif', 'bold', 'normal'),
validate_mathtext_font],
+ 'mathtext.sf' : [('sans-serif', 'normal', 'normal'),
validate_mathtext_font],
+ 'mathtext.use_cm' : [True, validate_bool],
+ 'mathtext.fallback_to_cm' : [True, validate_bool],
+
'image.aspect' : ['equal', validate_aspect], # equal, auto, a
number
'image.interpolation' : ['bilinear', str],
'image.cmap' : ['jet', str], # one of gray, jet, etc
@@ -445,8 +473,8 @@
'pdf.fonttype' : [3, validate_fonttype], # 3 (Type3) or 42 (Truetype)
'svg.image_inline' : [True, validate_bool], # write raster image data
directly into the svg file
'svg.image_noscale' : [False, validate_bool], # suppress scaling of
raster data embedded in SVG
- 'svg.embed_char_paths' : [False, validate_bool], # True to save
-#all characters as paths in the SVG
+ 'svg.embed_char_paths' : [False, validate_bool], # True to save all
characters as paths in the SVG
+ 'plugins.directory' : ['.matplotlib_plugins', str], # where plugin
directory is locate
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
