Commite0c0085

committed

Parse {lua,xe}tex-generated dvi in dviread.

1 parenta3c14cf commite0c0085Copy full SHA for e0c0085

File tree

+1435

-104

lines changed

+1435

-104

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -991,11 +991,11 @@ def _embedTeXFont(self, fontinfo):`
`991`	`991`
`992`	`992`	`# Widths`
`993`	`993`	`widthsObject=self.reserveObject('font widths')`
`994`		`-tfm=fontinfo.dvifont._tfm`
	`994`	`+font_metrics=fontinfo.dvifont._metrics`
`995`	`995`	`# convert from TeX's 12.20 representation to 1/1000 text space units.`
`996`		`-widths= [(1000*metrics.tex_width)>>20`
`997`		`-if (metrics:=tfm.get_metrics(char))else0`
`998`		`-forcharinrange(max(tfm._glyph_metrics,default=-1)+1)]`
	`996`	`+widths= [(1000*glyph_metrics.tex_width)>>20`
	`997`	`+if (glyph_metrics:=font_metrics.get_metrics(char))else0`
	`998`	`+forcharinrange(max(font_metrics._glyph_metrics,default=-1)+1)]`
`999`	`999`	`self.writeObject(widthsObject,widths)`
`1000`	`1000`
`1001`	`1001`	`# Font dictionary`

Lines changed: 211 additions & 80 deletions

Large diffs are not rendered by default.

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,27 @@ class Dvi:`
`58`	`58`
`59`	`59`	`classDviFont:`
`60`	`60`	`texname:bytes`
`61`		`-size:float`
`62`	`61`	`def__init__(`
`63`		`-self,scale:float,tfm:Tfm,texname:bytes,vf:Vf\|None`
	`62`	`+self,scale:float,metrics:Tfm\|TtfMetrics,texname:bytes,vf:Vf\|None`
`64`	`63`	`)->None: ...`
	`64`	`+@classmethod`
	`65`	`+deffrom_luatex(cls,scale:float,texname:bytes): ...`
	`66`	`+@classmethod`
	`67`	`+deffrom_xetex(`
	`68`	`+cls,scale:float,texname:bytes,subfont:int,effects:dict[str,float]`
	`69`	`+ ): ...`
`65`	`70`	`def__eq__(self,other:object)->bool: ...`
`66`	`71`	`def__ne__(self,other:object)->bool: ...`
`67`	`72`	`@property`
	`73`	`+defsize(self)->float: ...`
	`74`	`+@property`
`68`	`75`	`defwidths(self)->list[int]: ...`
	`76`	`+@property`
	`77`	`+defpath(self)->Path: ...`
	`78`	`+@property`
	`79`	`+defsubfont(self)->int: ...`
	`80`	`+@property`
	`81`	`+defeffects(self)->dict[str,float]: ...`
`69`	`82`
`70`	`83`	`classVf(Dvi):`
`71`	`84`	`def__init__(self,filename:str\|os.PathLike)->None: ...`
`@@ -91,6 +104,10 @@ class Tfm:`
`91`	`104`	`@property`
`92`	`105`	`defdepth(self)->dict[int,int]: ...`
`93`	`106`
	`107`	`+classTtfMetrics:`
	`108`	`+def__init__(self,filename:str\|os.PathLike)->None: ...`
	`109`	`+defget_metrics(self,idx:int)->TexMetrics: ...`
	`110`	`+`
`94`	`111`	`classPsFont(NamedTuple):`
`95`	`112`	`texname:bytes`
`96`	`113`	`psname:bytes`

Comments

(0)