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

Commit8c70d76

committed

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

1 parent99a521b commit8c70d76Copy full SHA for 8c70d76

File tree

12 files changed

+309

-217

lines changed

lib/matplotlib
- backends
  - backend_pdf.py
- cbook.py
- dviread.py
- dviread.pyi
- tests
  - baseline_images/dviread
  - test_dviread.py
- textpath.py

12 files changed

+309

-217

lines changed

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

Lines changed: 6 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -940,18 +940,13 @@ def dviFontName(self, dvifont):`
`940`	`940`
`941`	`941`	`tex_font_map=dviread.PsfontsMap(dviread.find_tex_file('pdftex.map'))`
`942`	`942`	`psfont=tex_font_map[dvifont.texname]`
`943`		`-ifpsfont.filenameisNone:`
`944`		`-raiseValueError(`
`945`		`-"No usable font file found for {} (TeX: {}); "`
`946`		`-"the font may lack a Type-1 version"`
`947`		`- .format(psfont.psname,dvifont.texname))`
`948`		`-`
`949`	`943`	`pdfname=next(self._internal_font_seq)`
`950`	`944`	`_log.debug('Assigning font %s = %s (dvi)',pdfname,dvifont.texname)`
`951`	`945`	`self._dviFontInfo[dvifont.texname]=types.SimpleNamespace(`
`952`	`946`	`dvifont=dvifont,`
`953`	`947`	`pdfname=pdfname,`
`954`		`-fontfile=psfont.filename,`
	`948`	`+# raises ValueError if psfont.filename is None.`
	`949`	`+fontfile=str(dvifont.resolve_path()),`
`955`	`950`	`basefont=psfont.psname,`
`956`	`951`	`encodingfile=psfont.encoding,`
`957`	`952`	`effects=psfont.effects)`
`@@ -996,11 +991,11 @@ def _embedTeXFont(self, fontinfo):`
`996`	`991`
`997`	`992`	`# Widths`
`998`	`993`	`widthsObject=self.reserveObject('font widths')`
`999`		`-tfm=fontinfo.dvifont._tfm`
	`994`	`+font_metrics=fontinfo.dvifont._metrics`
`1000`	`995`	`# convert from TeX's 12.20 representation to 1/1000 text space units.`
`1001`		`-widths= [(1000*metrics.tex_width)>>20`
`1002`		`-if (metrics:=tfm.get_metrics(char))else0`
`1003`		`-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)]`
`1004`	`999`	`self.writeObject(widthsObject,widths)`
`1005`	`1000`
`1006`	`1001`	`# Font dictionary`

`‎lib/matplotlib/cbook.py`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,16 +43,20 @@ class _ExceptionInfo:`
`43`	`43`	`users and result in incorrect tracebacks.`
`44`	`44`	`"""`
`45`	`45`
`46`		`-def__init__(self,cls,*args):`
	`46`	`+def__init__(self,cls,*args,notes=None):`
`47`	`47`	`self._cls=cls`
`48`	`48`	`self._args=args`
	`49`	`+self._notes=notesifnotesisnotNoneelse []`
`49`	`50`
`50`	`51`	`@classmethod`
`51`	`52`	`deffrom_exception(cls,exc):`
`52`		`-returncls(type(exc),*exc.args)`
	`53`	`+returncls(type(exc),*exc.args,notes=getattr(exc,"__notes__", []))`
`53`	`54`
`54`	`55`	`defto_exception(self):`
`55`		`-returnself._cls(*self._args)`
	`56`	`+exc=self._cls(*self._args)`
	`57`	`+fornoteinself._notes:`
	`58`	`+exc.add_note(note)`
	`59`	`+returnexc`
`56`	`60`
`57`	`61`
`58`	`62`	`def_get_running_interactive_framework():`

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!

Commit8c70d76

File tree

12 files changed

12 files changed

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

`‎lib/matplotlib/cbook.py`

0 commit comments