diff options
Diffstat (limited to 'Master/tlpkg/tlgs/Resource/Init/gs_cidfm.ps')
-rw-r--r-- | Master/tlpkg/tlgs/Resource/Init/gs_cidfm.ps | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Master/tlpkg/tlgs/Resource/Init/gs_cidfm.ps b/Master/tlpkg/tlgs/Resource/Init/gs_cidfm.ps index 5eb25f0042f..f22e45d6d63 100644 --- a/Master/tlpkg/tlgs/Resource/Init/gs_cidfm.ps +++ b/Master/tlpkg/tlgs/Resource/Init/gs_cidfm.ps @@ -1,4 +1,4 @@ -% Copyright (C) 2001-2019 Artifex Software, Inc. +% Copyright (C) 2001-2020 Artifex Software, Inc. % All Rights Reserved. % % This software is provided AS-IS with no warranty, either express or @@ -120,7 +120,12 @@ currentdict end def (DroidSansFallback.ttf) } if } if - concatstrings + % If CIDFSubstFont looks like a path/file (rather than just file) + % use it without the CIDFSubstPath string + dup .file_name_directory_separator rsearch + {pop pop pop exch pop} + {pop concatstrings} + ifelse % The CSI data just has to be valid, the substition machinery will % generally overwrite it with appropriate values for the missing font. /CSI [(Identity) 0] @@ -136,7 +141,7 @@ currentdict end def % <dir.../base.extn> .basename <dir> /.splitdirname { (/) rsearch { //true } { (\\) rsearch } ifelse - {3 -2 roll pop pop //true}{//false} ifelse + {exch concatstrings exch pop //true}{//false} ifelse } bind def % <file> .addcidfmappath - @@ -209,7 +214,7 @@ currentdict end def } loop } forall currentdict end - {exch pop (/) concatstrings /PermitFileReading exch .addcontrolpath} forall + {exch pop /PermitFileReading exch .addcontrolpath} forall % Checks for vicious substitution cycles. dup length dict copy % <<map>> |