diff options
Diffstat (limited to 'Master/tlpkg/tlgs/Resource/Init/pdf_font.ps')
-rw-r--r-- | Master/tlpkg/tlgs/Resource/Init/pdf_font.ps | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/Master/tlpkg/tlgs/Resource/Init/pdf_font.ps b/Master/tlpkg/tlgs/Resource/Init/pdf_font.ps index bea9ea95ad1..9fb85f60b60 100644 --- a/Master/tlpkg/tlgs/Resource/Init/pdf_font.ps +++ b/Master/tlpkg/tlgs/Resource/Init/pdf_font.ps @@ -1,4 +1,4 @@ -% Copyright (C) 2001-2018 Artifex Software, Inc. +% Copyright (C) 2001-2019 Artifex Software, Inc. % All Rights Reserved. % % This software is provided AS-IS with no warranty, either express or @@ -37,8 +37,7 @@ /.setlanguagelevel where { pop 2 .setlanguagelevel } if .currentglobal //true .setglobal -/pdfdict where { pop } { /pdfdict 100 dict def } ifelse -GS_PDF_ProcSet begin +/GS_PDF_ProcSet load begin % from userdict at this point pdfdict begin % We cache the PostScript font in an additional element of the @@ -198,7 +197,7 @@ currentdict /known_symbolic_fonts undef } if } if exch pop /Subtype knownoget {/Type1C eq}{//false} ifelse - exch /Flags knownoget {4 and 4 eq not}{false}ifelse and + exch /Flags knownoget {4 and 4 eq not}{//false}ifelse and } {//false} ifelse 1 index /FontType get 2 eq and @@ -696,7 +695,7 @@ currentdict end readonly def exch pop exch % font-res font-dict g2u encoding|null userdict /.lastToUnicode get % font-res font-dict g2u Encoding|null CMap .convert_ToUnicode-into-g2u % font-res font-dict - //null % font-res font-dict null + //null % font-res font-dict //null } ifelse } ifelse } if @@ -714,7 +713,7 @@ currentdict end readonly def pop pop pop currentdict /.stackdepth .forceundef currentdict /.dstackdepth .forceundef - } + } executeonly {pop pop pop} ifelse @@ -838,7 +837,7 @@ setglobal % We also allow the font name analysis to override the Flags setting % for Italic/Oblique as this gives us results more consistent with % Acrobat. - 0 2 index .fontnameproperties 7 and or + 0 2 index //.fontnameproperties exec 7 and or % Rebind the default font name to Helvetica so that % fonts with no properties are handled correctly. //.pdfdfndict begin .substitutefontname end @@ -1221,18 +1220,18 @@ currentdict /eexec_pdf_param_dict .undef %% below will fail. It would be nice to fix the cases of this someday, but %% we use 'nodict'[ to store other PDF state stuff that isn't gstate, and we %% probably always will, so it may well be more trouble than its worth. - /Dummy false gput + /Dummy //false gput Font /Resources get exch pdfopdict /BuildCharDictDepth countdictstack def .pdfruncontext countdictstack BuildCharDictDepth sub { - pdfdict /.Qqwarning_issued .knownget {not}{//true} ifelse + //pdfdict /.Qqwarning_issued .knownget {not}{//true} ifelse { (\n **** Warning: Type 3 glyph has unbalanced q/Q operators \(too many q's\)\n Output may be incorrect.\n) pdfformatwarning - pdfdict /.Qqwarning_issued //true .forceput - } if + //pdfdict /.Qqwarning_issued //true .forceput + } executeonly if Q } repeat Q @@ -1807,7 +1806,7 @@ currentdict /CMap_read_dict undef 11 -1 roll pop % Stack: <w0x'> <w0y'> <llx> <lly> <urx> <ury> <w1x'> <w1y'> <vx'> <vy'> end % recover currentdict -} executeonly def +} bind executeonly def % <string> <match> tailmatch ==> <pre> true % ==> <string> false @@ -1868,16 +1867,12 @@ currentdict /CMap_read_dict undef /findCIDFont { { dup /CIDFont resourcestatus { - pop %size - % Check status. If its 1 then we loaded this CIDFont resource from disk, and - % its safe to use it. If its 0 then it was loaded from the PDF file and its - % *not* safe to use as a replacement for a missing font. If its 2 then its - % not loaded, but is available from external resource and is safe to use. So - % if status is 0, *don't* use this CIDFont. - 0 eq not { - /CIDFont findresource - exit - }if + pop pop dup /CIDFont findresource + dup /Path known + 1 index /ResourcePath known or + { exch pop exit } + { pop dup /CIDFont undefineresource } + ifelse } if .remove_font_name_prefix dup dup length string cvs @@ -2016,7 +2011,7 @@ currentdict /CMap_read_dict undef /CIDFallBack /CIDFont findresource } if exit - } if + } executeonly if } if } if @@ -2361,7 +2356,7 @@ currentdict /bndef undef dup //null eq {pop} { - pdfdict /InputPDFFileName .knownget {.CRCHashFilenameAndObject} if + //pdfdict /InputPDFFileName .knownget {.CRCHashFilenameAndObject} if exch dup /.OrigUniqueIDXUID .knownget not { dup /XUID .knownget not |