[gs-commits] ghostpdl branch, master, updated. jbig2dec-0.14-1862-g0ea433a

The ghostpdl branch, master has been updated
       via  0ea433a1a172298eda11203d698ce6fe69be58d2 (commit)
      from  51aff033bdc8744adfd86ce8b35ef00f23621de2 (commit)

----------------------------------------------------------------------
commit 0ea433a1a172298eda11203d698ce6fe69be58d2
Author: Chris Liddell <[email protected]>
Date:   Fri Nov 15 08:26:36 2019 +0000

    Support CIDFSubstFont being a path/file
    
    Preivously, to use a custom CIDFont substitute in a custom location, it was
    necessary to both both CIDFSubstPath (for the location) and CIDFSubstFont
    (the file name).
    
    We'll now check the CIDFSubstFont value and if it looks like it includes a path
    (i.e. contains a directory/file separator string) then we'll use it as is,
    ignoring the CIDFSubstPath

diff --git a/Resource/Init/gs_cidfm.ps b/Resource/Init/gs_cidfm.ps
index 5eb25f0..cd9ed88 100644
--- a/Resource/Init/gs_cidfm.ps
+++ b/Resource/Init/gs_cidfm.ps
@@ -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]


Summary of changes:
 Resource/Init/gs_cidfm.ps | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)