Skip to content

Commit 4e4114e

Browse files
story645story645
committed
swap xkcd script for humor sans
add xkcd-script font to doc build
1 parent ea66786 commit 4e4114e

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ commands:
4949
ffmpeg \
5050
fonts-crosextra-carlito \
5151
fonts-freefont-otf \
52-
fonts-humor-sans \
5352
fonts-noto-cjk \
5453
fonts-wqy-zenhei \
5554
graphviz \
@@ -73,6 +72,7 @@ commands:
7372
command: |
7473
mkdir -p ~/.local/share/fonts
7574
wget -nc https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O ~/.local/share/fonts/Felipa-Regular.ttf || true
75+
wget -nc https://github.com/dummy-index/xkcd-font/raw/brushup/xkcd-script/font/xkcd-script.ttf -O ~/.local/share/fonts/xkcd-script.ttf || true
7676
fc-cache -f -v
7777
- save_cache:
7878
key: fonts-2

‎.devcontainer/devcontainer.json

+1-1
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

+3-2
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@ Optional
419419

420420
* `Inkscape <https://inkscape.org>`_
421421
* `optipng <http://optipng.sourceforge.net>`_
422-
* the font "Humor Sans" (aka the "XKCD" font), or the free alternative
423-
`Comic Neue <http://comicneue.com/>`_
422+
* the font `xkcd script`_ or `Comic Neue <http://comicneue.com/>`_
424423
* the font "Times New Roman"
424+
425+
.. _`xkcd script`: https://github.com/dummy-index/xkcd-font/raw/brushup/xkcd-script/font/xkcd-script.ttf

‎lib/matplotlib/mpl-data/matplotlibrc

+1-1
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, 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

+1-1
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, 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

+2-3
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ def xkcd(
709709
Turn on `xkcd <https://xkcd.com/>`_ sketch-style drawing mode. This will
710710
only have effect on things drawn after this function is called.
711711
712-
For best results, the "Humor Sans" font should be installed: it is
712+
For best results, the "xkcd script" font should be installed: it is
713713
not included with Matplotlib.
714714
715715
Parameters
@@ -749,8 +749,7 @@ def xkcd(
749749

750750
from matplotlib import patheffects
751751
rcParams.update({
752-
'font.family': ['xkcd', 'xkcd Script', 'Humor Sans', 'Comic Neue',
753-
'Comic Sans MS'],
752+
'font.family': ['xkcd', 'xkcd Script', 'Comic Neue', 'Comic Sans MS'],
754753
'font.size': 14.0,
755754
'path.sketch': (scale, length, randomness),
756755
'path.effects': [

‎lib/matplotlib/tests/test_axes.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8848,7 +8848,7 @@ def test_tick_param_labelfont():
88488848
fig, ax = plt.subplots()
88498849
ax.plot([1, 2, 3, 4], [1, 2, 3, 4])
88508850
ax.set_xlabel('X label in Impact font', fontname='Impact')
8851-
ax.set_ylabel('Y label in Humor Sans', fontname='Humor Sans')
8851+
ax.set_ylabel('Y label in xkcd script', fontname='xkcd script')
88528852
ax.tick_params(color='r', labelfontfamily='monospace')
88538853
plt.title('Title in sans-serif')
88548854
for text in ax.get_xticklabels():

‎lib/matplotlib/textpath.py

+1-1
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)