8000 Merge pull request #20228 from meeseeksmachine/auto-backport-of-pr-19… · matplotlib/matplotlib@c315e45 · GitHub
[go: up one dir, main page]
Skip to content

Commit c315e45

Browse files
QuLogicQuLogic
authored
Merge pull request #20228 from meeseeksmachine/auto-backport-of-pr-19849-on-v3.4.x
Backport PR #19849 on branch v3.4.x (FIX DateFormatter for month names when usetex=True)
2 parents 97f47ba + 3afd4d0 commit c315e45

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

‎lib/matplotlib/dates.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,13 @@ def drange(dstart, dend, delta):
572572

573573

574574
def _wrap_in_tex(text):
575+
p = r'([a-zA-Z]+)'
576+
ret_text = re.sub(p, r'}$\1$\\mathdefault{', text)
577+
575578
# Braces ensure dashes are not spaced like binary operators.
576-
return '$\\mathdefault{' + text.replace('-', '{-}') + '}$'
579+
ret_text = '$\\mathdefault{'+ret_text.replace('-', '{-}')+'}$'
580+
ret_text = ret_text.replace('$\\mathdefault{}$', '')
581+
return ret_text
577582

578583

579584
## date tickers and formatters ###

‎lib/matplotlib/tests/test_dates.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def callable_formatting_function(dates, _):
270270
(datetime.timedelta(weeks=52 * 200),
271271
[r'$\mathdefault{%d}$' % (year,) for year in range(1990, 2171, 20)]),
272272
(datetime.timedelta(days=30),
273-
[r'$\mathdefault{Jan %02d 1990}$' % (day,) for day in range(1, 32, 3)]),
273+
[r'Jan$\mathdefault{ %02d 1990}$' % (day,) for day in range(1, 32, 3)]),
274274
(datetime.timedelta(hours=20),
275275
[r'$\mathdefault{%02d:00:00}$' % (hour,) for hour in range(0, 21, 2)]),
276276
])
@@ -551,15 +551,15 @@ def test_concise_formatter_show_offset(t_delta, expected):
551551
(datetime.timedelta(weeks=52 * 200),
552552
['$\\mathdefault{%d}$' % (t, ) for t in range(1980, 2201, 20)]),
553553
(datetime.timedelta(days=40),
554-
['$\\mathdefault{Jan}$', '$\\mathdefault{05}$', '$\\mathdefault{09}$',
554+
['Jan', '$\\mathdefault{05}$', '$\\mathdefault{09}$',
555555
'$\\mathdefault{13}$', '$\\mathdefault{17}$', '$\\mathdefault{21}$',
556-
'$\\mathdefault{25}$', '$\\mathdefault{29}$', '$\\mathdefault{Feb}$',
556+
'$\\mathdefault{25}$', '$\\mathdefault{29}$', 'Feb',
557557
'$\\mathdefault{05}$', '$\\mathdefault{09}$']),
558558
(datetime.timedelta(hours=40),
559-
['$\\mathdefault{Jan{-}01}$', '$\\mathdefault{04:00}$',
559+
['Jan$\\mathdefault{{-}01}$', '$\\mathdefault{04:00}$',
560560
'$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
561561
'$\\mathdefault{16:00}$', '$\\mathdefault{20:00}$',
562-
'$\\mathdefault{Jan{-}02}$', '$\\mathdefault{04:00}$',
562+
'Jan$\\mathdefault{{-}02}$', '$\\mathdefault{04:00}$',
563563
'$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
564564
'$\\mathdefault{16:00}$']),
565565
(datetime.timedelta(seconds=2),

0 commit comments

Comments
 (0)
0