NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commit224bdb1

committed

Support (first font of) TTC files.

TTC is a TrueType Collection file (a collection of TTFs). Currently,ft2font only supports getting the first font from the collection, andneither the pdf nor ps backends are able to use them (due to limitationsof ttconv). Still, it seems better than nothing to support them for Aggand SVG.

1 parentc508c35 commit224bdb1Copy full SHA for 224bdb1

File tree

5 files changed

+38

-10

lines changed

.travis.yml
lib/matplotlib
- backends
  - backend_pdf.py
  - backend_ps.py
- font_manager.py
- tests
  - test_font_manager.py

5 files changed

+38

-10

lines changed

`‎.travis.yml`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ addons:`
`35`	`35`	`-graphviz`
`36`	`36`	`-libgeos-dev`
`37`	`37`	`-otf-freefont`
	`38`	`+ -ttf-wqy-zenhei`
`38`	`39`
`39`	`40`	`env:`
`40`	`41`	`global:`

`‎lib/matplotlib/backends/backend_pdf.py`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -984,8 +984,13 @@ def get_char_width(charcode):`
`984`	`984`
`985`	`985`	`# Make the charprocs array (using ttconv to generate the`
`986`	`986`	`# actual outlines)`
`987`		`-rawcharprocs=ttconv.get_pdf_charprocs(`
`988`		`-filename.encode(sys.getfilesystemencoding()),glyph_ids)`
	`987`	`+try:`
	`988`	`+rawcharprocs=ttconv.get_pdf_charprocs(`
	`989`	`+filename.encode(sys.getfilesystemencoding()),glyph_ids)`
	`990`	`+exceptRuntimeError:`
	`991`	`+_log.warning("The PDF backend does not currently support the "`
	`992`	`+"selected font.")`
	`993`	`+raise`
`989`	`994`	`charprocs= {}`
`990`	`995`	`forcharnameinsorted(rawcharprocs):`
`991`	`996`	`stream=rawcharprocs[charname]`

`‎lib/matplotlib/backends/backend_ps.py`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1111,10 +1111,16 @@ def print_figure_impl(fh):`
`1111`	`1111`	`raiseRuntimeError(msg)`
`1112`	`1112`	`else:`
`1113`	`1113`	`fh.flush()`
`1114`		`-convert_ttf_to_ps(`
`1115`		`-font_filename.encode(`
`1116`		`-sys.getfilesystemencoding()),`
`1117`		`-fh,fonttype,glyph_ids)`
	`1114`	`+try:`
	`1115`	`+convert_ttf_to_ps(`
	`1116`	`+font_filename.encode(`
	`1117`	`+sys.getfilesystemencoding()),`
	`1118`	`+fh,fonttype,glyph_ids)`
	`1119`	`+exceptRuntimeError:`
	`1120`	`+_log.warning("The PostScript backend does not "`
	`1121`	`+"currently support the selected "`
	`1122`	`+"font.")`
	`1123`	`+raise`
`1118`	`1124`	`print("end",file=fh)`
`1119`	`1125`	`print("%%EndProlog",file=fh)`
`1120`	`1126`

`‎lib/matplotlib/font_manager.py`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,9 @@ def get_fontext_synonyms(fontext):`
`164`	`164`	`Return a list of file extensions extensions that are synonyms for`
`165`	`165`	`the given file extension fileext.`
`166`	`166`	`"""`
`167`		`-return {'ttf':('ttf','otf'),`
`168`		`-'otf':('ttf','otf'),`
`169`		`-'afm':('afm',)}[fontext]`
	`167`	`+return {'ttf':['ttf','ttc','otf'],`
	`168`	`+'otf':['ttf','otf'],`
	`169`	`+'afm':['afm']}[fontext]`
`170`	`170`
`171`	`171`
`172`	`172`	`deflist_fonts(directory,extensions):`

`‎lib/matplotlib/tests/test_font_manager.py`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`frommatplotlib.font_managerimport (`
`14`	`14`	`findfont,FontProperties,fontManager,json_dump,json_load,get_font,`
`15`	`15`	`get_fontconfig_fonts,is_opentype_cff_font,fontManagerasfm)`
`16`		`-frommatplotlibimportrc_context`
	`16`	`+frommatplotlibimportpyplotasplt,rc_context`
`17`	`17`
`18`	`18`	`ifsix.PY2:`
`19`	`19`	`fromdistutils.spawnimportfind_executable`
`@@ -106,3 +106,19 @@ def test_hinting_factor(factor):`
`106`	`106`	`# Check that hinting only changes text layout by a small (10%) amount.`
`107`	`107`	`np.testing.assert_allclose(hinted_font.get_width_height(),expected,`
`108`	`108`	`rtol=0.1)`
	`109`	`+`
	`110`	`+`
	`111`	`+@pytest.mark.xfail(notos.environ.get("TRAVIS"),reason="Font may be missing.")`
	`112`	`+deftest_find_ttc():`
	`113`	`+fp=FontProperties(family=["WenQuanYi Zen Hei"])`
	`114`	`+font=findfont(fp)`
	`115`	`+assertos.path.basename(font)=="wqy-zenhei.ttc"`
	`116`	`+`
	`117`	`+fig,ax=plt.subplots()`
	`118`	`+ax.text(.5,.5,"\N{KANGXI RADICAL DRAGON}",fontproperties=fp)`
	`119`	`+fig.savefig(six.BytesIO(),format="raw")`
	`120`	`+fig.savefig(six.BytesIO(),format="svg")`
	`121`	`+withpytest.raises(RuntimeError):`
	`122`	`+fig.savefig(six.BytesIO(),format="pdf")`
	`123`	`+withpytest.raises(RuntimeError):`
	`124`	`+fig.savefig(six.BytesIO(),format="ps")`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit224bdb1

File tree

5 files changed

5 files changed

`‎.travis.yml`

`‎lib/matplotlib/backends/backend_pdf.py`

`‎lib/matplotlib/backends/backend_ps.py`

`‎lib/matplotlib/font_manager.py`

`‎lib/matplotlib/tests/test_font_manager.py`

0 commit comments