8000 FIX DateFormatter for month names when usetex=True by smartlixx · Pull Request #19849 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

FIX DateFormatter for month names when usetex=True #19849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 14, 2021
Merged

FIX DateFormatter for month names when usetex=True #19849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf92699
FIX DateFormatter for month names when usetex=True
smartlixx Apr 2, 2021
5a8fc07
Change the implementation of _wrap_in_tex
smartlixx Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
8000
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/matplotlib/dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
import functools
import logging
import math
import re

from dateutil.rrule import (rrule, MO, TU, WE, TH, FR, SA, SU, YEARLY,
MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY,
Expand Down Expand Up @@ -591,8 +592,13 @@ def drange(dstart, dend, delta):


def _wrap_in_tex(text):
p = r'([a-zA-Z]+)'
ret_text = re.sub(p, r'}$\1$\\mathdefault{', text)

# Braces ensure dashes are not spaced like binary operators.
return '$\\mathdefault{' + text.replace('-', '{-}') + '}$'
ret_text = '$\\mathdefault{'+ret_text.replace('-', '{-}')+'}$'
ret_text = ret_text.replace('$\\mathdefault{}$', '')
return ret_text


## date tickers and formatters ###
Expand Down 8000
10 changes: 5 additions & 5 deletions lib/matplotlib/tests/test_dates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def callable_formatting_function(dates, _):
(datetime.timedelta(weeks=52 * 200),
[r'$\mathdefault{%d}$' % (year,) for year in range(1990, 2171, 20)]),
(datetime.timedelta(days=30),
[r'$\mathdefault{Jan %02d 1990}$' % (day,) for day in range(1, 32, 3)]),
[r'Jan$\mathdefault{ %02d 1990}$' % (day,) for day in range(1, 32, 3)]),
(datetime.timedelta(hours=20),
[r'$\mathdefault{%02d:00:00}$' % (hour,) for hour in range(0, 21, 2)]),
])
Expand Down Expand Up @@ -550,15 +550,15 @@ def test_concise_formatter_show_offset(t_delta, expected):
(datetime.timedelta(weeks=52 * 200),
['$\\mathdefault{%d}$' % (t, ) for t in range(1980, 2201, 20)]),
(datetime.timedelta(days=40),
['$\\mathdefault{Jan}$', '$\\mathdefault{05}$', '$\\mathdefault{09}$',
['Jan', '$\\mathdefault{05}$', '$\\mathdefault{09}$',
'$\\mathdefault{13}$', '$\\mathdefault{17}$', '$\\mathdefault{21}$',
'$\\mathdefault{25}$', '$\\mathdefault{29}$', '$\\mathdefault{Feb}$',
'$\\mathdefault{25}$', '$\\mathdefault{29}$', 'Feb',
'$\\mathdefault{05}$', '$\\mathdefault{09}$']),
(datetime.timedelta(hours=40),
['$\\mathdefault{Jan{-}01}$', '$\\mathdefault{04:00}$',
['Jan$\\mathdefault{{-}01}$', '$\\mathdefault{04:00}$',
'$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
'$\\mathdefault{16:00}$', '$\\mathdefault{20:00}$',
'$\\mathdefault{Jan{-}02}$', '$\\mathdefault{04:00}$',
'Jan$\\mathdefault{{-}02}$', '$\\mathdefault{04:00}$',
'$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
'$\\mathdefault{16:00}$']),
(datetime.timedelta(seconds=2),
Expand Down
0