Commitea47ff4

authored

Merge pull request#22359 from anntzer/texfont

Slightly refactor TeX source generation.

2 parentsa258d42 +08ac151 commitea47ff4Copy full SHA for ea47ff4

File tree

+15

-11

lines changed

+15

-11

lines changed

Lines changed: 15 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -206,23 +206,27 @@ def make_tex(self, tex, fontsize):`
`206`	`206`	`"""`
`207`	`207`	`basefile=self.get_basefile(tex,fontsize)`
`208`	`208`	`texfile='%s.tex'%basefile`
`209`		`-fontcmd= {'sans-serif':r'{\sffamily %s}',`
`210`		`-'monospace':r'{\ttfamily %s}'}.get(self._font_family,`
`211`		`-r'{\rmfamily %s}')`
`212`		`-`
`213`		`-Path(texfile).write_text(`
`214`		`-r"""`
`215`		`-%s`
	`209`	`+fontcmd= (r'\sffamily'ifself._font_family=='sans-serif'else`
	`210`	`+r'\ttfamily'ifself._font_family=='monospace'else`
	`211`	`+r'\rmfamily')`
	`212`	`+tex_template=r"""`
	`213`	`+%(preamble)s`
`216`	`214`	`\pagestyle{empty}`
`217`	`215`	`\begin{document}`
`218`	`216`	`%% The empty hbox ensures that a page is printed even for empty inputs, except`
`219`	`217`	`%% when using psfrag which gets confused by it.`
`220`		`-\fontsize{%f}{%f}%%`
	`218`	`+\fontsize{%(fontsize)f}{%(baselineskip)f}%%`
`221`	`219`	`\ifdefined\psfrag\else\hbox{}\fi%%`
`222`		`-%s`
	`220`	`+{%(fontcmd)s %(tex)s}`
`223`	`221`	`\end{document}`
`224`		`-"""% (self._get_preamble(),fontsize,fontsize*1.25,fontcmd%tex),`
`225`		`-encoding='utf-8')`
	`222`	`+"""`
	`223`	`+Path(texfile).write_text(tex_template% {`
	`224`	`+"preamble":self._get_preamble(),`
	`225`	`+"fontsize":fontsize,`
	`226`	`+"baselineskip":fontsize*1.25,`
	`227`	`+"fontcmd":fontcmd,`
	`228`	`+"tex":tex,`
	`229`	`+ },encoding="utf-8")`
`226`	`230`
`227`	`231`	`returntexfile`
`228`	`232`

Comments

(0)