[gs-cvs] rev 8269 - in trunk/gs: lib src

[ray at ghostscript.com]

Author: ray
Date: 2007-10-03 10:37:35 -0700 (Wed, 03 Oct 2007)
New Revision: 8269

Modified:
   trunk/gs/lib/FCOfontmap-PCLPS2
   trunk/gs/lib/FCOfontmap-PCLPS3
   trunk/gs/lib/FCOfontmap-PS3
   trunk/gs/src/int.mak
Log:
Revert patch 8268 (restoring the FCOfontmap-* files) and add the Encoding/
directory to the RESOURCE_LIST so that it will be include in the %rom%
file system. This is the _real_ fix to bug #689050 and explains why the
symptoms appeared to be related to having Wingdings installed on the
system. Thanks to Henry and Igor in pointing out the incorrect Encoding
used in the previous patch that led me to the actual problem.


Modified: trunk/gs/lib/FCOfontmap-PCLPS2
===================================================================
--- trunk/gs/lib/FCOfontmap-PCLPS2	2007-10-03 04:40:18 UTC (rev 8268)
+++ trunk/gs/lib/FCOfontmap-PCLPS2	2007-10-03 17:37:35 UTC (rev 8269)
@@ -15,9 +15,8 @@
 
 % $Id$
 
-FCOfontfile2 ReadFCOfontmap:
-0     Wingdings-Regular DingbatsEncoding FCO_Dingbats
-EndFCOfontmap
+% May add general FAPIfontmap records here like this :
+/Wingdings-Regular << /Path FCOfontfile2 /FontType 1 /FAPI /UFST /SubfontId 0 /Encoding /Wingdings /Decoding /FCO_Wingdings>> ;
 
 % Mapping Postscript fonts to pclp2_xj.fco FCO members :
 FCOfontfile ReadFCOfontmap:

Modified: trunk/gs/lib/FCOfontmap-PCLPS3
===================================================================
--- trunk/gs/lib/FCOfontmap-PCLPS3	2007-10-03 04:40:18 UTC (rev 8268)
+++ trunk/gs/lib/FCOfontmap-PCLPS3	2007-10-03 17:37:35 UTC (rev 8269)
@@ -15,9 +15,8 @@
 
 % $Id$
 
-FCOfontfile2 ReadFCOfontmap:
-0     Wingdings-Regular DingbatsEncoding FCO_Dingbats
-EndFCOfontmap
+% May add general FAPIfontmap records here like this :
+/Wingdings-Regular << /Path FCOfontfile2 /FontType 1 /FAPI /UFST /SubfontId 0 /Encoding /Wingdings /Decoding /FCO_Wingdings>> ;
 
 % Mapping Postscript fonts to pclp2_xj.fco FCO members :
 FCOfontfile ReadFCOfontmap:

Modified: trunk/gs/lib/FCOfontmap-PS3
===================================================================
--- trunk/gs/lib/FCOfontmap-PS3	2007-10-03 04:40:18 UTC (rev 8268)
+++ trunk/gs/lib/FCOfontmap-PS3	2007-10-03 17:37:35 UTC (rev 8269)
@@ -15,9 +15,8 @@
 
 % $Id$
 
-FCOfontfile2 ReadFCOfontmap:
-0     Wingdings-Regular DingbatsEncoding FCO_Dingbats
-EndFCOfontmap
+% May add general FAPIfontmap records here like this :
+/Wingdings-Regular << /Path FCOfontfile2 /FontType 1 /FAPI /UFST /SubfontId 0 /Encoding /Wingdings /Decoding /FCO_Wingdings>> ;
 
 % Mapping Postscript fonts to ps3___xh.fco FCO members :
 FCOfontfile ReadFCOfontmap:

Modified: trunk/gs/src/int.mak
===================================================================
--- trunk/gs/src/int.mak	2007-10-03 04:40:18 UTC (rev 8268)
+++ trunk/gs/src/int.mak	2007-10-03 17:37:35 UTC (rev 8269)
@@ -993,7 +993,7 @@
 #	The init files are put in the lib/ directory (gs_init.ps + EXTRA_INIT_FILES)
 #	Resource files go into Resource/...
 
-RESOURCE_LIST=ColorSpace/ Decoding/ Font/ ProcSet/ IdiomSet/ CIDFont/ CMap/
+RESOURCE_LIST=ColorSpace/ Decoding/ Encoding/ Font/ ProcSet/ IdiomSet/ CIDFont/ CMap/
 
 # PCLXL_ PJL and XPS hooks are for other parsers that may be built with a PS
 # language switch build.