Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7d51f37

Browse filesBrowse files
tacaswelltacaswell
authored
Revert "Deprecate text.latex.unicode."
1 parent 50b0e16 commit 7d51f37
Copy full SHA for 7d51f37

File tree

Expand file treeCollapse file tree

12 files changed

+17
-17
lines changed
Filter options
Expand file treeCollapse file tree

12 files changed

+17
-17
lines changed

‎doc/api/next_api_changes/2018-02-15-AL-deprecations.rst

Copy file name to clipboardExpand all lines: doc/api/next_api_changes/2018-02-15-AL-deprecations.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@ The following classes, methods, functions, and attributes are deprecated:
3939

4040
The following rcParams are deprecated:
4141
- ``pgf.debug`` (the pgf backend relies on logging),
42-
- ``text.latex.unicode``,

‎doc/api/next_api_changes/2018-05-15-AL.rst

Copy file name to clipboardExpand all lines: doc/api/next_api_changes/2018-05-15-AL.rst
-8Lines changed: 0 additions & 8 deletions
This file was deleted.

‎examples/text_labels_and_annotations/tex_demo.py

Copy file name to clipboardExpand all lines: examples/text_labels_and_annotations/tex_demo.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import numpy as np
1818
import matplotlib
1919
matplotlib.rcParams['text.usetex'] = True
20+
matplotlib.rcParams['text.latex.unicode'] = True
2021
import matplotlib.pyplot as plt
2122

2223

‎examples/text_labels_and_annotations/usetex_baseline_test.py

Copy file name to clipboardExpand all lines: examples/text_labels_and_annotations/usetex_baseline_test.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from matplotlib import rcParams
1313
rcParams['text.usetex'] = True
14+
rcParams['text.latex.unicode'] = True
1415

1516

1617
class Axes(maxes.Axes):

‎lib/matplotlib/__init__.py

Copy file name to clipboardExpand all lines: lib/matplotlib/__init__.py
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,7 @@ def gen_candidates():
813813
# do NOT include in _all_deprecated
814814
_deprecated_set = {'axes.hold',
815815
'backend.qt4',
816-
'backend.qt5',
817-
'text.latex.unicode'}
816+
'backend.qt5'}
818817

819818
_all_deprecated = set(itertools.chain(
820819
_deprecated_ignore_map, _deprecated_map, _obsolete_set))

‎lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle

Copy file name to clipboardExpand all lines: lib/matplotlib/mpl-data/stylelib/_classic_test.mplstyle
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ text.usetex : False # use latex for all text handling. The following fo
109109
# If another font is desired which can loaded using the
110110
# LaTeX \usepackage command, please inquire at the
111111
# matplotlib mailing list
112+
text.latex.unicode : False # use "ucs" and "inputenc" LaTeX packages for handling
113+
# unicode strings.
112114
text.latex.preamble : # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURES
113115
# AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
114116
# IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.

‎lib/matplotlib/mpl-data/stylelib/classic.mplstyle

Copy file name to clipboardExpand all lines: lib/matplotlib/mpl-data/stylelib/classic.mplstyle
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ text.usetex : False # use latex for all text handling. The following fo
111111
# If another font is desired which can loaded using the
112112
# LaTeX \usepackage command, please inquire at the
113113
# matplotlib mailing list
114+
text.latex.unicode : False # use "ucs" and "inputenc" LaTeX packages for handling
115+
# unicode strings.
114116
text.latex.preamble : # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURES
115117
# AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
116118
# IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.

‎lib/matplotlib/rcsetup.py

Copy file name to clipboardExpand all lines: lib/matplotlib/rcsetup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,7 +1100,7 @@ def _validate_linestyle(ls):
11001100
# text props
11011101
'text.color': ['black', validate_color],
11021102
'text.usetex': [False, validate_bool],
1103-
'text.latex.unicode': [True, validate_bool],
1103+
'text.latex.unicode': [False, validate_bool],
11041104
'text.latex.preamble': [[''], validate_stringlist],
11051105
'text.latex.preview': [False, validate_bool],
11061106
'text.dvipnghack': [None, validate_bool_maybe_none],

‎lib/matplotlib/tests/test_backend_ps.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_ps.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
needs_ghostscript(
3333
('ps', False, {'ps.usedistiller': 'ghostscript'})),
3434
needs_usetex(needs_ghostscript(
35-
('ps', False, {'text.usetex': True}))),
35+
('ps', False, {'text.latex.unicode': True, 'text.usetex': True}))),
3636
('eps', False, {}),
3737
('eps', True, {'ps.useafm': True}),
3838
needs_usetex(needs_ghostscript(
39-
('eps', False, {'text.usetex': True}))),
39+
('eps', False, {'text.latex.unicode': True, 'text.usetex': True}))),
4040
], ids=[
4141
'ps',
4242
'ps with distiller',

‎lib/matplotlib/tests/test_rcparams.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_rcparams.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ def test_if_rctemplate_is_up_to_date():
468468
continue
469469
if k in deprecated:
470470
continue
471-
if k.startswith(("text.latex.unicode", "verbose.")):
471+
if "verbose" in k:
472472
continue
473473
found = False
474474
for line in rclines:

‎lib/matplotlib/texmanager.py

Copy file name to clipboardExpand all lines: lib/matplotlib/texmanager.py
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ def make_tex(self, tex, fontsize):
203203

204204
if rcParams['text.latex.unicode']:
205205
unicode_preamble = r"""
206-
\usepackage[utf8]{inputenc}"""
206+
\usepackage{ucs}
207+
\usepackage[utf8x]{inputenc}"""
207208
else:
208209
unicode_preamble = ''
209210

@@ -254,7 +255,8 @@ def make_tex_preview(self, tex, fontsize):
254255

255256
if rcParams['text.latex.unicode']:
256257
unicode_preamble = r"""
257-
\usepackage[utf8]{inputenc}"""
258+
\usepackage{ucs}
259+
\usepackage[utf8x]{inputenc}"""
258260
else:
259261
unicode_preamble = ''
260262

‎matplotlibrc.template

Copy file name to clipboardExpand all lines: matplotlibrc.template
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ backend : $TEMPLATE_BACKEND
225225
## If another font is desired which can loaded using the
226226
## LaTeX \usepackage command, please inquire at the
227227
## matplotlib mailing list
228+
#text.latex.unicode : False ## use "ucs" and "inputenc" LaTeX packages for handling
229+
## unicode strings.
228230
#text.latex.preamble : ## IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURES
229231
## AND IS THEREFORE UNSUPPORTED. PLEASE DO NOT ASK FOR HELP
230232
## IF THIS FEATURE DOES NOT DO WHAT YOU EXPECT IT TO.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.