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

Commit7402350

committed

Support not embedding glyphs in svg mathtests.

1 parente077394 commit7402350Copy full SHA for 7402350

File tree

2 files changed

+47

-2

lines changed

lib/matplotlib
- testing
  - compare.py
- tests
  - test_mathtext.py

2 files changed

+47

-2

lines changed

`‎lib/matplotlib/testing/compare.py`

Lines changed: 24 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,21 @@ def __del__(self):`
`214`	`214`	`self._tmpdir.cleanup()`
`215`	`215`
`216`	`216`
	`217`	`+class_SVGWithMatplotlibFontsConverter(_SVGConverter):`
	`218`	`+"""`
	`219`	`+ A SVG converter which explicitly adds the fonts shipped by Matplotlib to`
	`220`	+ Inkspace's font search path, to better support `svg.fonttype = "none"`
	`221`	`+ (which is in particular used by certain mathtext tests).`
	`222`	`+ """`
	`223`	`+`
	`224`	`+def__call__(self,orig,dest):`
	`225`	`+ifnothasattr(self,"_tmpdir"):`
	`226`	`+self._tmpdir=TemporaryDirectory()`
	`227`	`+shutil.copytree(cbook._get_data_path("fonts/ttf"),`
	`228`	`+Path(self._tmpdir.name,"fonts"))`
	`229`	`+returnsuper().__call__(orig,dest)`
	`230`	`+`
	`231`	`+`
`217`	`232`	`def_update_converter():`
`218`	`233`	`try:`
`219`	`234`	`mpl._get_executable_info("gs")`
`@@ -235,6 +250,7 @@ def _update_converter():`
`235`	`250`	`#: extension to png format.`
`236`	`251`	`converter= {}`
`237`	`252`	`_update_converter()`
	`253`	`+_svg_with_matplotlib_fonts_converter=_SVGWithMatplotlibFontsConverter()`
`238`	`254`
`239`	`255`
`240`	`256`	`defcomparable_formats():`
`@@ -284,7 +300,14 @@ def convert(filename, cache):`
`284`	`300`	`returnstr(newpath)`
`285`	`301`
`286`	`302`	`_log.debug("For %s: converting to png.",filename)`
`287`		`-converter[path.suffix[1:]](path,newpath)`
	`303`	`+convert=converter[path.suffix[1:]]`
	`304`	`+ifpath.suffix==".svg":`
	`305`	`+contents=path.read_text()`
	`306`	`+if'style="font:'incontents:`
	`307`	`+# for svg.fonttype = none, we explicitly patch the font search`
	`308`	`+# path so that fonts shipped by Matplotlib are found.`
	`309`	`+convert=_svg_with_matplotlib_fonts_converter`
	`310`	`+convert(path,newpath)`
`288`	`311`
`289`	`312`	`ifcache_dirisnotNone:`
`290`	`313`	`_log.debug("For %s: caching conversion result.",filename)`

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

Lines changed: 23 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,11 @@`
`116`	`116`	`r'$\left(X\right)_{a}^{b}$',# github issue 7615`
`117`	`117`	`r'$\dfrac{\$100.00}{y}$',# github issue #1888`
`118`	`118`	`]`
`119`		`-# 'Lightweight' tests test only a single fontset (dejavusans, which is the`
	`119`	`+# 'svgastext' tests switch svg output to embed text as text (rather than as`
	`120`	`+# paths).`
	`121`	`+svgastext_math_tests= [`
	`122`	`+]`
	`123`	`+# 'lightweight' tests test only a single fontset (dejavusans, which is the`
`120`	`124`	`# default) and only png outputs, in order to minimize the size of baseline`
`121`	`125`	`# images.`
`122`	`126`	`lightweight_math_tests= [`
`@@ -199,6 +203,24 @@ def test_mathtext_rendering(baseline_images, fontset, index, text):`
`199`	`203`	`horizontalalignment='center',verticalalignment='center')`
`200`	`204`
`201`	`205`
	`206`	`+@pytest.mark.parametrize('index, text',enumerate(svgastext_math_tests),`
	`207`	`+ids=range(len(svgastext_math_tests)))`
	`208`	`+@pytest.mark.parametrize(`
	`209`	`+'fontset', ['cm','stix','stixsans','dejavusans','dejavuserif'])`
	`210`	`+@pytest.mark.parametrize('baseline_images', ['mathtext0'],indirect=True)`
	`211`	`+@image_comparison(`
	`212`	`+baseline_images=None,`
	`213`	`+savefig_kwarg={'metadata': {# Minimize image size.`
	`214`	`+'Creator':None,'Date':None,'Format':None,'Type':None}})`
	`215`	`+deftest_mathtext_rendering_svgastext(baseline_images,fontset,index,text):`
	`216`	`+mpl.rcParams['mathtext.fontset']=fontset`
	`217`	`+mpl.rcParams['svg.fonttype']='none'# Minimize image size.`
	`218`	`+fig=plt.figure(figsize=(5.25,0.75))`
	`219`	`+fig.patch.set(visible=False)# Minimize image size.`
	`220`	`+fig.text(0.5,0.5,text,`
	`221`	`+horizontalalignment='center',verticalalignment='center')`
	`222`	`+`
	`223`	`+`
`202`	`224`	`@pytest.mark.parametrize('index, text',enumerate(lightweight_math_tests),`
`203`	`225`	`ids=range(len(lightweight_math_tests)))`
`204`	`226`	`@pytest.mark.parametrize('fontset', ['dejavusans'])`

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!

Commit7402350

File tree

2 files changed

2 files changed

`‎lib/matplotlib/testing/compare.py`

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

0 commit comments