change mentions to Vera in docs

zblz · zblz · commit 9a99bd59e251 · 2015-11-05T17:23:40.000Z
diff --git a/doc/users/mathtext.rst b/doc/users/mathtext.rst
@@ -13,14 +13,13 @@ in Donald Knuth's TeX, so the quality is quite good (matplotlib also
 provides a ``usetex`` option for those who do want to call out to TeX
 to generate their text (see :ref:`usetex-tutorial`).
 
-Any text element can use math text.  You should use raw strings
-(precede the quotes with an ``'r'``), and surround the math text with
-dollar signs ($), as in TeX.  Regular text and mathtext can be
-interleaved within the same string.  Mathtext can use the Computer
-Modern fonts (from (La)TeX), `STIX <http://www.aip.org/stixfonts/>`_
-fonts (with are designed to blend well with Times) or a Unicode font
-that you provide.  The mathtext font can be selected with the
-customization variable ``mathtext.fontset`` (see
+Any text element can use math text.  You should use raw strings (precede the
+quotes with an ``'r'``), and surround the math text with dollar signs ($), as in
+TeX. Regular text and mathtext can be interleaved within the same string.
+Mathtext can use DejaVu Sans (default), DejaVu Serif, the Computer Modern fonts
+(from (La)TeX), `STIX <http://www.aip.org/stixfonts/>`_ fonts (with are designed
+to blend well with Times), or a Unicode font that you provide.  The mathtext
+font can be selected with the customization variable ``mathtext.fontset`` (see
 :ref:`customizing-matplotlib`)
 
 .. note::
diff --git a/doc/users/plotting/colormaps/Lfunction.py b/doc/users/plotting/colormaps/Lfunction.py
@@ -14,17 +14,6 @@
 
 
 mpl.rcParams.update({'font.size': 12})
-mpl.rcParams['font.sans-serif'] = ('Arev Sans, Bitstream Vera Sans, '
-                                   'Lucida Grande, Verdana, Geneva, Lucid, '
-                                   'Helvetica, Avant Garde, sans-serif')
-mpl.rcParams['mathtext.fontset'] = 'custom'
-mpl.rcParams['mathtext.cal'] = 'cursive'
-mpl.rcParams['mathtext.rm'] = 'sans'
-mpl.rcParams['mathtext.tt'] = 'monospace'
-mpl.rcParams['mathtext.it'] = 'sans:italic'
-mpl.rcParams['mathtext.bf'] = 'sans:bold'
-mpl.rcParams['mathtext.sf'] = 'sans'
-mpl.rcParams['mathtext.fallback_to_cm'] = 'True'
 
 
 ### Red, original Albers plot
diff --git a/doc/users/plotting/colormaps/grayscale.py b/doc/users/plotting/colormaps/grayscale.py
@@ -16,17 +16,6 @@
 import matplotlib as mpl
 
 mpl.rcParams.update({'font.size': 14})
-mpl.rcParams['font.sans-serif'] = ('Arev Sans, Bitstream Vera Sans, '
-                                   'Lucida Grande, Verdana, Geneva, Lucid, '
-                                   'Helvetica, Avant Garde, sans-serif')
-mpl.rcParams['mathtext.fontset'] = 'custom'
-mpl.rcParams['mathtext.cal'] = 'cursive'
-mpl.rcParams['mathtext.rm'] = 'sans'
-mpl.rcParams['mathtext.tt'] = 'monospace'
-mpl.rcParams['mathtext.it'] = 'sans:italic'
-mpl.rcParams['mathtext.bf'] = 'sans:bold'
-mpl.rcParams['mathtext.sf'] = 'sans'
-mpl.rcParams['mathtext.fallback_to_cm'] = 'True'
 
 
 # indices to step through colormap
diff --git a/doc/users/plotting/colormaps/lightness.py b/doc/users/plotting/colormaps/lightness.py
@@ -16,17 +16,6 @@
 import matplotlib as mpl
 
 mpl.rcParams.update({'font.size': 12})
-mpl.rcParams['font.sans-serif'] = ('Arev Sans, Bitstream Vera Sans, '
-                                   'Lucida Grande, Verdana, Geneva, Lucid, '
-                                   'Helvetica, Avant Garde, sans-serif')
-mpl.rcParams['mathtext.fontset'] = 'custom'
-mpl.rcParams['mathtext.cal'] = 'cursive'
-mpl.rcParams['mathtext.rm'] = 'sans'
-mpl.rcParams['mathtext.tt'] = 'monospace'
-mpl.rcParams['mathtext.it'] = 'sans:italic'
-mpl.rcParams['mathtext.bf'] = 'sans:bold'
-mpl.rcParams['mathtext.sf'] = 'sans'
-mpl.rcParams['mathtext.fallback_to_cm'] = 'True'
 
 # indices to step through colormap
 x = np.linspace(0.0, 1.0, 100)
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -253,8 +253,8 @@ Mathtext_examples
 Below is a sampling of the many TeX expressions now supported by matplotlib's
 internal mathtext engine.  The mathtext module provides TeX style mathematical
 expressions using `FreeType <http://www.freetype.org/>`_
-and the BaKoMa computer modern or `STIX <http://www.stixfonts.org>`_ fonts.
-See the :mod:`matplotlib.mathtext` module for additional details.
+and the DejaVu, BaKoMa computer modern, or `STIX <http://www.stixfonts.org>`_
+fonts.  See the :mod:`matplotlib.mathtext` module for additional details.
 
 .. plot:: mpl_examples/pylab_examples/mathtext_examples.py
 
diff --git a/examples/api/font_family_rc.py b/examples/api/font_family_rc.py
@@ -11,7 +11,7 @@
 and for the font.family you set a list of font styles to try to find
 in order::
 
-  rcParams['font.sans-serif'] = ['Tahoma', 'Bitstream Vera Sans',
+  rcParams['font.sans-serif'] = ['Tahoma', 'DejaVu Sans',
                                  'Lucida Grande', 'Verdana']
 
 """
diff --git a/examples/misc/font_indexing.py b/examples/misc/font_indexing.py
@@ -9,7 +9,7 @@
 
 
 #fname = '/usr/share/fonts/sfd/FreeSans.ttf'
-fname = matplotlib.get_data_path() + '/fonts/ttf/Vera.ttf'
+fname = matplotlib.get_data_path() + '/fonts/ttf/DejaVuSans.ttf'
 font = FT2Font(fname)
 font.set_charmap(0)
 
diff --git a/examples/misc/ftface_props.py b/examples/misc/ftface_props.py
@@ -12,7 +12,7 @@
 
 
 #fname = '/usr/local/share/matplotlib/VeraIt.ttf'
-fname = matplotlib.get_data_path() + '/fonts/ttf/VeraIt.ttf'
+fname = matplotlib.get_data_path() + '/fonts/ttf/DejaVuSans-Oblique.ttf'
 #fname = '/usr/local/share/matplotlib/cmr10.ttf'
 
 font = ft.FT2Font(fname)
diff --git a/examples/pylab_examples/font_table_ttf.py b/examples/pylab_examples/font_table_ttf.py
@@ -29,7 +29,7 @@
     fontname = sys.argv[1]
 else:
     fontname = os.path.join(matplotlib.get_data_path(),
-                            'fonts', 'ttf', 'Vera.ttf')
+                            'fonts', 'ttf', 'DejaVuSans.ttf')
 
 font = FT2Font(fontname)
 codes = list(font.get_charmap().items())
