Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit99a521b

Browse files
authored
Merge pull request#30027 from anntzer/pfp
Make PdfFile font-related attributes private.
2 parents3da6ea9 +a93e681 commit99a521b

File tree

2 files changed

+23
-15
lines changed

2 files changed

+23
-15
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
``PdfFile.fontNames``, ``PdfFile.dviFontNames``, ``PdfFile.type1Descriptors``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
... are deprecated with no replacement.

‎lib/matplotlib/backends/backend_pdf.py

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -719,11 +719,11 @@ def __init__(self, filename, metadata=None):
719719

720720
self.infoDict=_create_pdf_info_dict('pdf',metadataor {})
721721

722-
self.fontNames= {}# maps filenames to internal font names
723722
self._internal_font_seq= (Name(f'F{i}')foriinitertools.count(1))
724-
self.dviFontInfo= {}# maps dvi font names to embedding information
723+
self._fontNames= {}# maps filenames to internal font names
724+
self._dviFontInfo= {}# maps dvi font names to embedding information
725725
# differently encoded Type-1 fonts may share the same descriptor
726-
self.type1Descriptors= {}
726+
self._type1Descriptors= {}
727727
self._character_tracker=_backend_pdf_ps.CharacterTracker()
728728

729729
self.alphaStates= {}# maps alpha values to graphics state objects
@@ -765,6 +765,11 @@ def __init__(self, filename, metadata=None):
765765
'ProcSet':procsets}
766766
self.writeObject(self.resourceObject,resources)
767767

768+
fontNames=_api.deprecated("3.11")(property(lambdaself:self._fontNames))
769+
dviFontNames=_api.deprecated("3.11")(property(lambdaself:self._dviFontNames))
770+
type1Descriptors=_api.deprecated("3.11")(
771+
property(lambdaself:self._type1Descriptors))
772+
768773
defnewPage(self,width,height):
769774
self.endStream()
770775

@@ -894,7 +899,7 @@ def _write_annotations(self):
894899
deffontName(self,fontprop):
895900
"""
896901
Select a font based on fontprop and return a name suitable for
897-
Op.selectfont. If fontprop is a string, it will be interpreted
902+
``Op.selectfont``. If fontprop is a string, it will be interpreted
898903
as the filename of the font.
899904
"""
900905

@@ -908,12 +913,12 @@ def fontName(self, fontprop):
908913
filenames=_fontManager._find_fonts_by_props(fontprop)
909914
first_Fx=None
910915
forfnameinfilenames:
911-
Fx=self.fontNames.get(fname)
916+
Fx=self._fontNames.get(fname)
912917
ifnotfirst_Fx:
913918
first_Fx=Fx
914919
ifFxisNone:
915920
Fx=next(self._internal_font_seq)
916-
self.fontNames[fname]=Fx
921+
self._fontNames[fname]=Fx
917922
_log.debug('Assigning font %s = %r',Fx,fname)
918923
ifnotfirst_Fx:
919924
first_Fx=Fx
@@ -925,11 +930,11 @@ def fontName(self, fontprop):
925930
defdviFontName(self,dvifont):
926931
"""
927932
Given a dvi font object, return a name suitable for Op.selectfont.
928-
This registers the font information in ``self.dviFontInfo`` if not yet
929-
registered.
933+
This registers the font informationinternally (in ``_dviFontInfo``) if
934+
not yetregistered.
930935
"""
931936

932-
dvi_info=self.dviFontInfo.get(dvifont.texname)
937+
dvi_info=self._dviFontInfo.get(dvifont.texname)
933938
ifdvi_infoisnotNone:
934939
returndvi_info.pdfname
935940

@@ -943,7 +948,7 @@ def dviFontName(self, dvifont):
943948

944949
pdfname=next(self._internal_font_seq)
945950
_log.debug('Assigning font %s = %s (dvi)',pdfname,dvifont.texname)
946-
self.dviFontInfo[dvifont.texname]=types.SimpleNamespace(
951+
self._dviFontInfo[dvifont.texname]=types.SimpleNamespace(
947952
dvifont=dvifont,
948953
pdfname=pdfname,
949954
fontfile=psfont.filename,
@@ -954,12 +959,12 @@ def dviFontName(self, dvifont):
954959

955960
defwriteFonts(self):
956961
fonts= {}
957-
fordviname,infoinsorted(self.dviFontInfo.items()):
962+
fordviname,infoinsorted(self._dviFontInfo.items()):
958963
Fx=info.pdfname
959964
_log.debug('Embedding Type-1 font %s from dvi.',dviname)
960965
fonts[Fx]=self._embedTeXFont(info)
961-
forfilenameinsorted(self.fontNames):
962-
Fx=self.fontNames[filename]
966+
forfilenameinsorted(self._fontNames):
967+
Fx=self._fontNames[filename]
963968
_log.debug('Embedding font %s.',filename)
964969
iffilename.endswith('.afm'):
965970
# from pdf.use14corefonts
@@ -1039,10 +1044,10 @@ def _embedTeXFont(self, fontinfo):
10391044
# existing descriptor for this font.
10401045
effects= (fontinfo.effects.get('slant',0.0),
10411046
fontinfo.effects.get('extend',1.0))
1042-
fontdesc=self.type1Descriptors.get((fontinfo.fontfile,effects))
1047+
fontdesc=self._type1Descriptors.get((fontinfo.fontfile,effects))
10431048
iffontdescisNone:
10441049
fontdesc=self.createType1Descriptor(t1font,fontinfo.fontfile)
1045-
self.type1Descriptors[(fontinfo.fontfile,effects)]=fontdesc
1050+
self._type1Descriptors[(fontinfo.fontfile,effects)]=fontdesc
10461051
fontdict['FontDescriptor']=fontdesc
10471052

10481053
self.writeObject(fontdictObject,fontdict)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp