Commite1750a8

anntzer

authored and

timhoffm

committed

Don't try to find TeX-only fonts when layouting TeX text. (#13170)

Text.is_math_text is only ever called with self.get_usetex() as secondargument, so just change it to a private method (Text._preprocess_math)that calls self.get_usetex() internally; deprecate is_math_text whichis clearly a private internal helper. This also helps clarifying thatusetex mode is only ever called if self.get_usetex() is True (in thetextobj.is_math_text(...) line, textobj is actually the same object(!)as self so shares the same get_usetex() value).In Text._get_layout, if self.get_usetex() is True (and only in thatcase), self._fontproperties can refer to a TeX-only font (e.g. "ComputerModern Roman"). If that's the case, don't try to callrenderer.get_text_width_height_descent with ismath=False, as that wouldtrigger a font resolution that can fail (perhaps there's no "ComputerModern Roman" font available in the font cache; it may only be availableto TeX) and cause a spurious warning.

1 parenta598811 commite1750a8Copy full SHA for e1750a8

File tree

3 files changed

+31

-5

lines changed

doc/api/next_api_changes
- 2019-01-13-AL.rst
lib/matplotlib
- contour.py
- text.py

3 files changed

+31

-5

lines changed

`‎doc/api/next_api_changes/2019-01-13-AL.rst`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,4 @@`
	`1`	`+Deprecations`
	`2`	+````````````
	`3`	`+`
	`4`	+``Text.is_math_text`` is deprecated.

`‎lib/matplotlib/contour.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ def get_label_width(self, lev, fmt, fsize):`
`264`	`264`	`ifnotisinstance(lev,str):`
`265`	`265`	`lev=self.get_text(lev,fmt)`
`266`	`266`
`267`		`-lev,ismath=text.Text.is_math_text(lev)`
	`267`	`+lev,ismath=text.Text()._preprocess_math(lev)`
`268`	`268`	`ifismath=='TeX':`
`269`	`269`	`ifnothasattr(self,'_TeX_manager'):`
`270`	`270`	`self._TeX_manager=texmanager.TexManager()`

`‎lib/matplotlib/text.py`

Lines changed: 26 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -286,11 +286,12 @@ def _get_layout(self, renderer):`
`286`	`286`
`287`	`287`	`# Full vertical extent of font, including ascenders and descenders:`
`288`	`288`	`_,lp_h,lp_d=renderer.get_text_width_height_descent(`
`289`		`-"lp",self._fontproperties,ismath=False)`
	`289`	`+"lp",self._fontproperties,`
	`290`	`+ismath="TeX"ifself.get_usetex()elseFalse)`
`290`	`291`	`min_dy= (lp_h-lp_d)*self._linespacing`
`291`	`292`
`292`	`293`	`fori,lineinenumerate(lines):`
`293`		`-clean_line,ismath=self.is_math_text(line,self.get_usetex())`
	`294`	`+clean_line,ismath=self._preprocess_math(line)`
`294`	`295`	`ifclean_line:`
`295`	`296`	`w,h,d=renderer.get_text_width_height_descent(`
`296`	`297`	`clean_line,self._fontproperties,ismath=ismath)`
`@@ -697,8 +698,7 @@ def draw(self, renderer):`
`697`	`698`	`y=y+posy`
`698`	`699`	`ifrenderer.flipy():`
`699`	`700`	`y=canvash-y`
`700`		`-clean_line,ismath=textobj.is_math_text(line,`
`701`		`-self.get_usetex())`
	`701`	`+clean_line,ismath=textobj._preprocess_math(line)`
`702`	`702`
`703`	`703`	`iftextobj.get_path_effects():`
`704`	`704`	`frommatplotlib.patheffectsimportPathEffectRenderer`
`@@ -1152,6 +1152,7 @@ def set_text(self, s):`
`1152`	`1152`	`self.stale=True`
`1153`	`1153`
`1154`	`1154`	`@staticmethod`
	`1155`	`+@cbook.deprecated("3.1")`
`1155`	`1156`	`defis_math_text(s,usetex=None):`
`1156`	`1157`	`"""`
`1157`	`1158`	`Returns a cleaned string and a boolean flag.`
`@@ -1174,6 +1175,27 @@ def is_math_text(s, usetex=None):`
`1174`	`1175`	`else:`
`1175`	`1176`	`returns.replace(r'\$','$'),False`
`1176`	`1177`
	`1178`	`+def_preprocess_math(self,s):`
	`1179`	`+"""`
	`1180`	`+ Return the string s after mathtext preprocessing, and the kind of`
	`1181`	`+ mathtext support needed.`
	`1182`	`+`
	`1183`	`+ - If self is configured to use TeX, return s unchanged except that`
	`1184`	`+ a single space gets escaped, and the flag "TeX".`
	`1185`	`+ - Otherwise, if s is mathtext (has an even number of unescaped dollar`
	`1186`	`+ signs), return s and the flag True.`
	`1187`	`+ - Otherwise, return s with dollar signs unescaped, and the flag`
	`1188`	`+ False.`
	`1189`	`+ """`
	`1190`	`+ifself.get_usetex():`
	`1191`	`+ifs==" ":`
	`1192`	`+s=r"\ "`
	`1193`	`+returns,"TeX"`
	`1194`	`+elifcbook.is_math_text(s):`
	`1195`	`+returns,True`
	`1196`	`+else:`
	`1197`	`+returns.replace(r"\$","$"),False`
	`1198`	`+`
`1177`	`1199`	`defset_fontproperties(self,fp):`
`1178`	`1200`	`"""`
`1179`	`1201`	`Set the font properties that control the text.`

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!

Commite1750a8

File tree

3 files changed

3 files changed

`‎doc/api/next_api_changes/2019-01-13-AL.rst`

`‎lib/matplotlib/contour.py`

`‎lib/matplotlib/text.py`

0 commit comments