[gs-cvs] rev 8674 - trunk/gs/lib

[alexcher at ghostscript.com]

Author: alexcher
Date: 2008-04-28 17:31:25 -0700 (Mon, 28 Apr 2008)
New Revision: 8674

Modified:
   trunk/gs/lib/pf2afm.ps
Log:
Make pf2afm utility friendlier to Windows users: check for .pfa or .pfb
extensions case-insensitively and accept backslash as a path separator.
Bug 689804.


Modified: trunk/gs/lib/pf2afm.ps
===================================================================
--- trunk/gs/lib/pf2afm.ps	2008-04-28 21:52:25 UTC (rev 8673)
+++ trunk/gs/lib/pf2afm.ps	2008-04-29 00:31:25 UTC (rev 8674)
@@ -419,8 +419,37 @@
   (EndFontMetrics) =to.ofi
 } def
 
+/pfa_pfb_dict <<
+  /.pfb /pfbn
+  /.pfB /pfbn
+  /.pFb /pfbn
+  /.pFB /pfbn
+  /.Pfb /pfbn
+  /.PfB /pfbn
+  /.PFb /pfbn
+  /.PFB /pfbn
+
+  /.pfa /pfan
+  /.pfA /pfan
+  /.pFa /pfan
+  /.pFA /pfan
+  /.Pfa /pfan
+  /.PfA /pfan
+  /.PFa /pfan
+  /.PFA /pfan
+>> readonly def
+
+% Check whether the file name has pfa or pfb extension.
+/pfa_or_pfb? {      % s -> false   |    /name true
+  dup length 4 lt {
+    pop //false
+  } {
+    dup length 4 sub 4 getinterval //pfa_pfb_dict exch .knownget
+  } ifelse
+} bind def
+
+
 % pf[ba]filename makeafm -
-
 /makeafm {
   count 0 eq {(Missing font file name\n) printquit} if
   /ifn edef
@@ -429,18 +458,11 @@
 % i.e., it analyses the supplied names, appends extensions if needed,
 % and check files:
   /pfbn () def /pfan () def /pfmn () def % initialisation
-  ifn (.pfb) search {
-    3 -1 roll length 0 eq {% file name extension = ".pfb"
-      ifn dup length string copy /pfbn edef
-      /ifn edef
-    }{pop} ifelse
-  } if pop
-  ifn (.pfa) search {
-    3 -1 roll length 0 eq {% file name extension = ".pfa"
-      ifn dup length string copy /pfan edef
-      /ifn edef
-    }{pop} ifelse
-  } if pop
+
+  ifn pfa_or_pfb? {
+      ifn dup length string copy def
+      ifn dup length 4 sub 0 exch getinterval /ifn edef
+  } if
   pfbn () eq pfan () eq and dup {% no extension was supplied, try ".pfb"
     /pfbn ifn (.pfb) concatstrings def
   } if
@@ -469,7 +491,7 @@
     pop pop pop pop
   }{
     () pfmn {
-      (/) search {
+      (/) search dup not { pop (\\) search } if {
         4 -1 roll exch concatstrings exch concatstrings exch
       }{
         exit