Merge pull request #8853 from geib7592/doc_textprops

dstansby · web-flow · commit 8fac114ed3e6 · 2017-07-11T09:29:53.000+01:00
Add sentence to textprops tutorial mentioning mathtext rcParams
diff --git a/tutorials/text/mathtext.py b/tutorials/text/mathtext.py
@@ -15,6 +15,7 @@
 to generate their text (see :ref:`sphx_glr_tutorials_text_usetex.py`).
 """
 
+###############################################################################
 # 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.
@@ -32,7 +33,7 @@
 #    <http://thread.gmane.org/gmane.comp.python.matplotlib.general/19963/focus=19978>`_.
 #
 # Here is a simple example::
-
+#
 #     # plain text
 #     plt.title('alpha > beta')
 #
@@ -151,6 +152,8 @@
 #
 #     \sqrt[3]{x}
 #
+# .. _mathtext-fonts:
+#
 # Fonts
 # -----
 #
diff --git a/tutorials/text/text_props.py b/tutorials/text/text_props.py
@@ -143,7 +143,9 @@
 #  Default Font
 # ==============
 #
-# The base default font is controlled by a set of rcParams:
+# The base default font is controlled by a set of rcParams. To set the font
+# for mathematical expressions, use the rcParams beginning with ``mathtext``
+# (see :ref:`mathtext <mathtext-fonts>`).
 #
 # +---------------------+----------------------------------------------------+
 # | rcParam             | usage                                              |
@@ -212,7 +214,7 @@
 #
 # or set it in your :file:`.matplotlibrc` file::
 #
-#    font.sans-serif: Source Han Sans TW, Ariel, sans-serif
+#    font.sans-serif: Source Han Sans TW, Arial, sans-serif
 #
 # To control the font used on per-artist basis use the ``'name'``,
 # ``'fontname'`` or ``'fontproperties'`` kwargs documented :ref:`above

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	to generate their text (see :ref:`sphx_glr_tutorials_text_usetex.py`).
`16`	`16`	`"""`
`17`	`17`
	`18`	`+###############################################################################`
`18`	`19`	`# Any text element can use math text. You should use raw strings (precede the`
`19`	`20`	# quotes with an ``'r'``), and surround the math text with dollar signs ($), as in
`20`	`21`	`# TeX. Regular text and mathtext can be interleaved within the same string.`
`@@ -32,7 +33,7 @@`
`32`	`33`	# <http://thread.gmane.org/gmane.comp.python.matplotlib.general/19963/focus=19978>`_.
`33`	`34`	`#`
`34`	`35`	`# Here is a simple example::`
`35`		`-`
	`36`	`+#`
`36`	`37`	`# # plain text`
`37`	`38`	`# plt.title('alpha > beta')`
`38`	`39`	`#`
`@@ -151,6 +152,8 @@`
`151`	`152`	`#`
`152`	`153`	`# \sqrt[3]{x}`
`153`	`154`	`#`
	`155`	`+# .. _mathtext-fonts:`
	`156`	`+#`
`154`	`157`	`# Fonts`
`155`	`158`	`# -----`
`156`	`159`	`#`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,9 @@`
`143`	`143`	`# Default Font`
`144`	`144`	`# ==============`
`145`	`145`	`#`
`146`		`-# The base default font is controlled by a set of rcParams:`
	`146`	`+# The base default font is controlled by a set of rcParams. To set the font`
	`147`	+# for mathematical expressions, use the rcParams beginning with ``mathtext``
	`148`	+# (see :ref:`mathtext <mathtext-fonts>`).
`147`	`149`	`#`
`148`	`150`	`# +---------------------+----------------------------------------------------+`
`149`	`151`	`# \| rcParam \| usage \|`
`@@ -212,7 +214,7 @@`
`212`	`214`	`#`
`213`	`215`	# or set it in your :file:`.matplotlibrc` file::
`214`	`216`	`#`
`215`		`-# font.sans-serif: Source Han Sans TW, Ariel, sans-serif`
	`217`	`+# font.sans-serif: Source Han Sans TW, Arial, sans-serif`
`216`	`218`	`#`
`217`	`219`	# To control the font used on per-artist basis use the ``'name'``,
`218`	`220`	# ``'fontname'`` or ``'fontproperties'`` kwargs documented :ref:`above