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

[alexcher at ghostscript.com]

Author: alexcher
Date: 2006-11-04 19:00:15 -0800 (Sat, 04 Nov 2006)
New Revision: 7163

Modified:
   trunk/gs/lib/gs_res.ps
Log:
Adjust error reporting from findencoding procedure to match Adobe.
Make "null ... findresource" throw /typecheck instead of /undefinedresource .
Fix CET 13-06.PS


Modified: trunk/gs/lib/gs_res.ps
===================================================================
--- trunk/gs/lib/gs_res.ps	2006-11-04 17:05:22 UTC (rev 7162)
+++ trunk/gs/lib/gs_res.ps	2006-11-05 03:00:15 UTC (rev 7163)
@@ -409,6 +409,11 @@
 % other, the default FindResource must not call ResourceStatus if there is
 % an instance of the desired name already defined in VM.
 /FindResource {
+	dup //null eq {
+          % CET 13-06 wants /typecheck for "null findencoding" but
+          % .knownget doesn't fail on null
+          /findresource .systemvar /typecheck signalerror
+        } if
 	dup .getvminstance {
 	  exch pop 0 get
 	} {
@@ -1006,7 +1011,11 @@
       { pop pop }
      ifelse
    } forall
-  /.findencoding { /Encoding findresource } bind def
+  /.findencoding {
+    { /Encoding findresource } stopped {
+      pop /findencoding $error /errorname get signalerror
+    } if
+  } bind def
   /findencoding /.findencoding load def		% must be a procedure
   /.defineencoding { /Encoding defineresource pop } bind def
 	% ColorRendering resources and ProcSet