Skip to content

Commit 8858d8c

Browse files
committed
Enhance support for tex dates
1 parent b525983 commit 8858d8c

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

lib/matplotlib/dates.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,9 @@ def _wrap_in_tex(text):
595595
p = r'([a-zA-Z]+)'
596596
ret_text = re.sub(p, r'}$\1$\\mathdefault{', text)
597597

598-
# Braces ensure dashes are not spaced like binary operators.
599-
ret_text = '$\\mathdefault{'+ret_text.replace('-', '{-}')+'}$'
598+
# Braces ensure symbols are not spaced like binary operators.
599+
ret_text = ret_text.replace('-', '{-}').replace(':', '{:}').replace(' ', r'\;')
600+
ret_text = '$\\mathdefault{' + ret_text + '}$'
600601
ret_text = ret_text.replace('$\\mathdefault{}$', '')
601602
return ret_text
602603

lib/matplotlib/tests/test_dates.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ def callable_formatting_function(dates, _):
325325
(datetime.timedelta(weeks=52 * 200),
326326
[r'$\mathdefault{%d}$' % (year,) for year in range(1990, 2171, 20)]),
327327
(datetime.timedelta(days=30),
328-
[r'Jan$\mathdefault{ %02d 1990}$' % (day,) for day in range(1, 32, 3)]),
328+
[r'Jan$\mathdefault{\;%02d\;1990}$' % (day,) for day in range(1, 32, 3)]),
329329
(datetime.timedelta(hours=20),
330-
[r'$\mathdefault{%02d:00:00}$' % (hour,) for hour in range(0, 21, 2)]),
330+
[r'$\mathdefault{%02d{:}00{:}00}$' % (hour,) for hour in range(0, 21, 2)]),
331331
])
332332
def test_date_formatter_usetex(delta, expected):
333333
d1 = datetime.datetime(1990, 1, 1)
@@ -609,14 +609,14 @@ def test_concise_formatter_show_offset(t_delta, expected):
609609
'$\\mathdefault{25}$', '$\\mathdefault{29}$', 'Feb',
610610
'$\\mathdefault{05}$', '$\\mathdefault{09}$']),
611611
(datetime.timedelta(hours=40),
612-
['Jan$\\mathdefault{{-}01}$', '$\\mathdefault{04:00}$',
613-
'$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
614-
'$\\mathdefault{16:00}$', '$\\mathdefault{20:00}$',
615-
'Jan$\\mathdefault{{-}02}$', '$\\mathdefault{04:00}$',
616-
'$\\mathdefault{08:00}$', '$\\mathdefault{12:00}$',
617-
'$\\mathdefault{16:00}$']),
612+
['Jan$\\mathdefault{{-}01}$', '$\\mathdefault{04{:}00}$',
613+
'$\\mathdefault{08{:}00}$', '$\\mathdefault{12{:}00}$',
614+
'$\\mathdefault{16{:}00}$', '$\\mathdefault{20{:}00}$',
615+
'Jan$\\mathdefault{{-}02}$', '$\\mathdefault{04{:}00}$',
616+
'$\\mathdefault{08{:}00}$', '$\\mathdefault{12{:}00}$',
617+
'$\\mathdefault{16{:}00}$']),
618618
(datetime.timedelta(seconds=2),
619-
['$\\mathdefault{59.5}$', '$\\mathdefault{00:00}$',
619+
['$\\mathdefault{59.5}$', '$\\mathdefault{00{:}00}$',
620620
'$\\mathdefault{00.5}$', '$\\mathdefault{01.0}$',
621621
'$\\mathdefault{01.5}$', '$\\mathdefault{02.0}$',
622622
'$\\mathdefault{02.5}$']),

0 commit comments

Comments
 (0)