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 acae9bf

Browse filesBrowse files
QuLogicQuLogic
authored
Merge pull request #27339 from meeseeksmachine/auto-backport-of-pr-27299-on-v3.8.x
Backport PR #27299 on branch v3.8.x ([MNT] swap xkcd script for humor sans)
2 parents 95743f0 + cfb494f commit acae9bf
Copy full SHA for acae9bf

File tree

8 files changed

+15
-16
lines changed
Filter options

8 files changed

+15
-16
lines changed

‎.circleci/config.yml

Copy file name to clipboardExpand all lines: .circleci/config.yml
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,22 +59,22 @@ commands:
5959
graphviz \
6060
fonts-crosextra-carlito \
6161
fonts-freefont-otf \
62-
fonts-humor-sans \
6362
fonts-noto-cjk \
6463
optipng
6564
6665
fonts-install:
6766
steps:
6867
- restore_cache:
69-
key: fonts-2
68+
key: fonts-4
7069
- run:
7170
name: Install custom fonts
7271
command: |
7372
mkdir -p ~/.local/share/fonts
7473
wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
74+
wget -nc https://github.com/ipython/xkcd-font/blob/master/xkcd-script/font/xkcd-script.ttf?raw=true -O ~/.local/share/fonts/xkcd-Script.ttf || true
7575
fc-cache -f -v
7676
- save_cache:
77-
key: fonts-2
77+
key: fonts-4
7878
paths:
7979
- ~/.local/share/fonts/
8080

‎.devcontainer/devcontainer.json

Copy file name to clipboardExpand all lines: .devcontainer/devcontainer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"features": {
88
"ghcr.io/devcontainers/features/desktop-lite:1": {},
99
"ghcr.io/rocker-org/devcontainer-features/apt-packages:1": {
10-
"packages": "inkscape,ffmpeg,dvipng,lmodern,cm-super,texlive-latex-base,texlive-latex-extra,texlive-fonts-recommended,texlive-latex-recommended,texlive-pictures,texlive-xetex,fonts-wqy-zenhei,graphviz,fonts-crosextra-carlito,fonts-freefont-otf,fonts-humor-sans,fonts-noto-cjk,optipng"
10+
"packages": "inkscape,ffmpeg,dvipng,lmodern,cm-super,texlive-latex-base,texlive-latex-extra,texlive-fonts-recommended,texlive-latex-recommended,texlive-pictures,texlive-xetex,fonts-wqy-zenhei,graphviz,fonts-crosextra-carlito,fonts-freefont-otf,fonts-comic-neue,fonts-noto-cjk,optipng"
1111
}
1212
},
1313
"onCreateCommand": ".devcontainer/setup.sh",

‎doc/devel/dependencies.rst

Copy file name to clipboardExpand all lines: doc/devel/dependencies.rst
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,7 @@ Optional, but recommended:
399399

400400
* `Inkscape <https://inkscape.org>`_
401401
* `optipng <http://optipng.sourceforge.net>`_
402-
* the font "Humor Sans" (aka the "XKCD" font), or the free alternative
403-
`Comic Neue <http://comicneue.com/>`_
402+
* the font `xkcd script <https://github.com/ipython/xkcd-font/>`_ or `Comic Neue <http://comicneue.com/>`_
404403
* the font "Times New Roman"
405404

406405
.. note::

‎lib/matplotlib/mpl-data/matplotlibrc

Copy file name to clipboardExpand all lines: lib/matplotlib/mpl-data/matplotlibrc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
#font.serif: DejaVu Serif, Bitstream Vera Serif, Computer Modern Roman, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
270270
#font.sans-serif: DejaVu Sans, Bitstream Vera Sans, Computer Modern Sans Serif, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
271271
#font.cursive: Apple Chancery, Textile, Zapf Chancery, Sand, Script MT, Felipa, Comic Neue, Comic Sans MS, cursive
272-
#font.fantasy: Chicago, Charcoal, Impact, Western, Humor Sans, xkcd, fantasy
272+
#font.fantasy: Chicago, Charcoal, Impact, Western, xkcd script, fantasy
273273
#font.monospace: DejaVu Sans Mono, Bitstream Vera Sans Mono, Computer Modern Typewriter, Andale Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
274274

275275

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

Copy file name to clipboardExpand all lines: lib/matplotlib/mpl-data/stylelib/classic.mplstyle
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ font.size : 12.0
9191
font.serif : DejaVu Serif, New Century Schoolbook, Century Schoolbook L, Utopia, ITC Bookman, Bookman, Nimbus Roman No9 L, Times New Roman, Times, Palatino, Charter, serif
9292
font.sans-serif: DejaVu Sans, Lucida Grande, Verdana, Geneva, Lucid, Arial, Helvetica, Avant Garde, sans-serif
9393
font.cursive : Apple Chancery, Textile, Zapf Chancery, Sand, Script MT, Felipa, cursive
94-
font.fantasy : Comic Sans MS, Chicago, Charcoal, ImpactWestern, Humor Sans, fantasy
94+
font.fantasy : Comic Sans MS, Chicago, Charcoal, ImpactWestern, xkcd script, fantasy
9595
font.monospace : DejaVu Sans Mono, Andale Mono, Nimbus Mono L, Courier New, Courier, Fixed, Terminal, monospace
9696

9797
### TEXT

‎lib/matplotlib/pyplot.py

Copy file name to clipboardExpand all lines: lib/matplotlib/pyplot.py
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -707,11 +707,12 @@ def xkcd(
707707
scale: float = 1, length: float = 100, randomness: float = 2
708708
) -> ExitStack:
709709
"""
710-
Turn on `xkcd <https://xkcd.com/>`_ sketch-style drawing mode. This will
711-
only have effect on things drawn after this function is called.
710+
Turn on `xkcd <https://xkcd.com/>`_ sketch-style drawing mode.
712711
713-
For best results, the "Humor Sans" font should be installed: it is
714-
not included with Matplotlib.
712+
This will only have an effect on things drawn after this function is called.
713+
714+
For best results, install the `xkcd script <https://github.com/ipython/xkcd-font/>`_
715+
font; xkcd fonts are not packaged with Matplotlib.
715716
716717
Parameters
717718
----------
@@ -750,8 +751,7 @@ def xkcd(
750751

751752
from matplotlib import patheffects
752753
rcParams.update({
753-
'font.family': ['xkcd', 'xkcd Script', 'Humor Sans', 'Comic Neue',
754-
'Comic Sans MS'],
754+
'font.family': ['xkcd', 'xkcd Script', 'Comic Neue', 'Comic Sans MS'],
755755
'font.size': 14.0,
756756
'path.sketch': (scale, length, randomness),
757757
'path.effects': [

‎lib/matplotlib/tests/test_axes.py

Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_axes.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8813,7 +8813,7 @@ def test_tick_param_labelfont():
88138813
fig, ax = plt.subplots()
88148814
ax.plot([1, 2, 3, 4], [1, 2, 3, 4])
88158815
ax.set_xlabel('X label in Impact font', fontname='Impact')
8816-
ax.set_ylabel('Y label in Humor Sans', fontname='Humor Sans')
8816+
ax.set_ylabel('Y label in xkcd script', fontname='xkcd script')
88178817
ax.tick_params(color='r', labelfontfamily='monospace')
88188818
plt.title('Title in sans-serif')
88198819
for text in ax.get_xticklabels():

‎lib/matplotlib/textpath.py

Copy file name to clipboardExpand all lines: lib/matplotlib/textpath.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def get_text_path(self, prop, s, ismath=False):
9999
from matplotlib.text import TextToPath
100100
from matplotlib.font_manager import FontProperties
101101
102-
fp = FontProperties(family="Humor Sans", style="italic")
102+
fp = FontProperties(family="Comic Neue", style="italic")
103103
verts, codes = TextToPath().get_text_path(fp, "ABC")
104104
path = Path(verts, codes, closed=False)
105105

0 commit comments

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