Repository navigation
Commit 473f209
committed
Revert datetime usetex ticklabels to use default tex font.
with `{\fontfamily{\familydefault}\selectfont ...}`, instead of using
math and selectively escaping parts of the string.
Note that this is only possible now that tex strings are passed "all at
once" to the tex process rather than "one line at a time", because if
breaking at `"\n"` as previously done, then the braces of the tex
command above would become unbalanced (and lines other than the first
would not see the `\selectfont`).
The main difference in rendering is that hyphens (e.g. in YY-MM-DD) are
now rendered as plain hyphens rather than minus signs, but some googling
suggests that this is in fact correct (see e.g. ctan datetime2 or
isodate packages). Also, month names are now rendered with serif, but
that seems more consistent with day and years which are also serifed
(and which were the original source of all these issues).
See also the script below, which reproduces the various issues raised
over the years:
```python
from datetime import datetime, timedelta
from matplotlib.dates import ConciseDateFormatter, DateFormatter
import matplotlib.pyplot as plt
import numpy as np
plt.rcdefaults(); plt.rcParams['text.usetex'] = True
fig, axs = plt.subplots(4, constrained_layout=True, figsize=(12, 4))
t0 = datetime.now()
ts = [t0 + i * timedelta(days=1) for i in range(10)]
axs[0].plot(ts, range(10))
axs[1].plot(ts, range(10))
axs[1].xaxis.set_major_formatter(ConciseDateFormatter(axs[1].xaxis.get_major_locator()))
ts = [t0 + i * timedelta(seconds=6) for i in range(100)]
axs[2].plot(ts, range(100))
axs[3].xaxis.set_major_formatter(DateFormatter('%d/%m\n%Y'))
plt.show()
```1 parent 9016b26 commit 473f209
2 files changed
Lines changed: 20 additions & 32 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -173,7 +173,6 @@ | |||
| 173 | 173 | import functools | |
| 174 | 174 | import logging | |
| 175 | 175 | import math | |
| 176 | - import re | ||
| 177 | 176 | ||
| 178 | 177 | from dateutil.rrule import (rrule, MO, TU, WE, TH, FR, SA, SU, YEARLY, | |
| 179 | 178 | MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY, | |
@@ -605,16 +604,7 @@ def drange(dstart, dend, delta): | |||
| 605 | 604 | ||
| 606 | 605 | ||
| 607 | 606 | def _wrap_in_tex(text): | |
| 608 | - p = r'([a-zA-Z]+)' | ||
| 609 | - ret_text = re.sub(p, r'}$\1$\\mathdefault{', text) | ||
| 610 | - | ||
| 611 | - # Braces ensure symbols are not spaced like binary operators. | ||
| 612 | - ret_text = ret_text.replace('-', '{-}').replace(':', '{:}') | ||
| 613 | - # To not concatenate space between numbers. | ||
| 614 | - ret_text = ret_text.replace(' ', r'\;') | ||
| 615 | - ret_text = '$\\mathdefault{' + ret_text + '}$' | ||
| 616 | - ret_text = ret_text.replace('$\\mathdefault{}$', '') | ||
| 617 | - return ret_text | ||
| 607 | + return r"{\fontfamily{\familydefault}\selectfont " + text + "}" | ||
| 618 | 608 | ||
| 619 | 609 | ||
| 620 | 610 | ## date tickers and formatters ### | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -323,13 +323,13 @@ def callable_formatting_function(dates, _): | |||
| 323 | 323 | ||
| 324 | 324 | @pytest.mark.parametrize('delta, expected', [ | |
| 325 | 325 | (datetime.timedelta(weeks=52 * 200), | |
| 326 | - [r'$\mathdefault{%d}$' % year for year in range(1990, 2171, 20)]), | ||
| 326 | + range(1990, 2171, 20)), | ||
| 327 | 327 | (datetime.timedelta(days=30), | |
| 328 | - [r'$\mathdefault{1990{-}01{-}%02d}$' % day for day in range(1, 32, 3)]), | ||
| 328 | + ['1990-01-%02d' % day for day in range(1, 32, 3)]), | ||
| 329 | 329 | (datetime.timedelta(hours=20), | |
| 330 | - [r'$\mathdefault{01{-}01\;%02d}$' % hour for hour in range(0, 21, 2)]), | ||
| 330 | + ['01-01 %02d' % hour for hour in range(0, 21, 2)]), | ||
| 331 | 331 | (datetime.timedelta(minutes=10), | |
| 332 | - [r'$\mathdefault{01\;00{:}%02d}$' % minu for minu in range(0, 11)]), | ||
| 332 | + ['01 00:%02d' % minu for minu in range(0, 11)]), | ||
| 333 | 333 | ]) | |
| 334 | 334 | def test_date_formatter_usetex(delta, expected): | |
| 335 | 335 | style.use("default") | |
@@ -342,7 +342,8 @@ def test_date_formatter_usetex(delta, expected): | |||
| 342 | 342 | locator.axis.set_view_interval(mdates.date2num(d1), mdates.date2num(d2)) | |
| 343 | 343 | ||
| 344 | 344 | formatter = mdates.AutoDateFormatter(locator, usetex=True) | |
| 345 | - assert [formatter(loc) for loc in locator()] == expected | ||
| 345 | + assert [formatter(loc) for loc in locator()] == [ | ||
| 346 | + r'{\fontfamily{\familydefault}\selectfont %s}' % s for s in expected] | ||
| 346 | 347 | ||
| 347 | 348 | ||
| 348 | 349 | def test_drange(): | |
@@ -637,24 +638,14 @@ def test_offset_changes(): | |||
| 637 | 638 | ||
| 638 | 639 | @pytest.mark.parametrize('t_delta, expected', [ | |
| 639 | 640 | (datetime.timedelta(weeks=52 * 200), | |
| 640 | - ['$\\mathdefault{%d}$' % (t, ) for t in range(1980, 2201, 20)]), | ||
| 641 | + range(1980, 2201, 20)), | ||
| 641 | 642 | (datetime.timedelta(days=40), | |
| 642 | - ['Jan', '$\\mathdefault{05}$', '$\\mathdefault{09}$', | ||
| 643 | - '$\\mathdefault{13}$', '$\\mathdefault{17}$', '$\\mathdefault{21}$', | ||
| 644 | - '$\\mathdefault{25}$', '$\\mathdefault{29}$', 'Feb', | ||
| 645 | - '$\\mathdefault{05}$', '$\\mathdefault{09}$']), | ||
| 643 | + ['Jan', '05', '09', '13', '17', '21', '25', '29', 'Feb', '05', '09']), | ||
| 646 | 644 | (datetime.timedelta(hours=40), | |
| 647 | - ['Jan$\\mathdefault{{-}01}$', '$\\mathdefault{04{:}00}$', | ||
| 648 | - '$\\mathdefault{08{:}00}$', '$\\mathdefault{12{:}00}$', | ||
| 649 | - '$\\mathdefault{16{:}00}$', '$\\mathdefault{20{:}00}$', | ||
| 650 | - 'Jan$\\mathdefault{{-}02}$', '$\\mathdefault{04{:}00}$', | ||
| 651 | - '$\\mathdefault{08{:}00}$', '$\\mathdefault{12{:}00}$', | ||
| 652 | - '$\\mathdefault{16{:}00}$']), | ||
| 645 | + ['Jan-01', '04:00', '08:00', '12:00', '16:00', '20:00', | ||
| 646 | + 'Jan-02', '04:00', '08:00', '12:00', '16:00']), | ||
| 653 | 647 | (datetime.timedelta(seconds=2), | |
| 654 | - ['$\\mathdefault{59.5}$', '$\\mathdefault{00{:}00}$', | ||
| 655 | - '$\\mathdefault{00.5}$', '$\\mathdefault{01.0}$', | ||
| 656 | - '$\\mathdefault{01.5}$', '$\\mathdefault{02.0}$', | ||
| 657 | - '$\\mathdefault{02.5}$']), | ||
| 648 | + ['59.5', '00:00', '00.5', '01.0', '01.5', '02.0', '02.5']), | ||
| 658 | 649 | ]) | |
| 659 | 650 | def test_concise_formatter_usetex(t_delta, expected): | |
| 660 | 651 | d1 = datetime.datetime(1997, 1, 1) | |
@@ -665,7 +656,8 @@ def test_concise_formatter_usetex(t_delta, expected): | |||
| 665 | 656 | locator.axis.set_view_interval(mdates.date2num(d1), mdates.date2num(d2)) | |
| 666 | 657 | ||
| 667 | 658 | formatter = mdates.ConciseDateFormatter(locator, usetex=True) | |
| 668 | - assert formatter.format_ticks(locator()) == expected | ||
| 659 | + assert formatter.format_ticks(locator()) == [ | ||
| 660 | + r'{\fontfamily{\familydefault}\selectfont %s}' % s for s in expected] | ||
| 669 | 661 | ||
| 670 | 662 | ||
| 671 | 663 | def test_concise_formatter_formats(): | |
@@ -1326,3 +1318,9 @@ def test_concise_formatter_call(): | |||
| 1326 | 1318 | def test_date_ticker_factory(span, expected_locator): | |
| 1327 | 1319 | locator, _ = mdates.date_ticker_factory(span) | |
| 1328 | 1320 | assert isinstance(locator, expected_locator) | |
| 1321 | + | ||
| 1322 | + | ||
| 1323 | + def test_usetex_newline(): | ||
| 1324 | + fig, ax = plt.subplots() | ||
| 1325 | + ax.xaxis.set_major_formatter(mdates.DateFormatter('%d/%m\n%Y')) | ||
| 1326 | + fig.canvas.draw() | ||
0 commit comments