[gs-commits] rev 11796 - trunk/gs/Resource/Init

[chrisl at ghostscript.com]

Author: chrisl
Date: 2010-10-13 10:48:04 +0000 (Wed, 13 Oct 2010)
New Revision: 11796

Modified:
   trunk/gs/Resource/Init/gs_fntem.ps
Log:
We have far fewer font Decodings than there are "well known" Encodings, so
assuming that for such an Encoding we always have a predefined Decoding
is problematic.

We'll now try to find a predefined Decoding, and if one isn't found
we'll derive one from the Encoding (as we previously did only for
non-well known Encodings).

Bug 691677

No cluster differences expected.



Modified: trunk/gs/Resource/Init/gs_fntem.ps
===================================================================
--- trunk/gs/Resource/Init/gs_fntem.ps	2010-10-13 06:56:16 UTC (rev 11795)
+++ trunk/gs/Resource/Init/gs_fntem.ps	2010-10-13 10:48:04 UTC (rev 11796)
@@ -318,10 +318,15 @@
     } {
       dup //encodingnames
       exch .knownget {
-        exch pop
-        /Decoding findresource 1 index exch /Decoding exch put
-      } {
-        % unknown encoding, convert it to decoding :
+        { /Decoding findresource } stopped {pop pop true}{ exch pop 1 index exch /Decoding exch put false } ifelse
+      }
+      {
+          true
+      } ifelse 
+
+      {
+        % unknown encoding, or an encoding for which we don't have a
+        % predefined decoding, convert it to decoding :
         dup length dict begin
         /.notdef 0 def
         0 1 currentdict length 1 sub
@@ -335,8 +340,8 @@
         pop
         currentdict end
         1 index exch /Decoding exch put
+      } if
       } ifelse
-    } ifelse
     exit
   } loop
   dup /CIDFontType known {