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

[raph at ghostscript.com]

Author: raph
Date: 2006-11-03 12:47:10 -0800 (Fri, 03 Nov 2006)
New Revision: 7156

Modified:
   trunk/gs/lib/gs_fonts.ps
   trunk/gs/src/gdevpdtt.c
   trunk/gs/src/zbfont.c
Log:
Fix: Change /.OrigFont key to /OrigFont to match (undocumented) Adobe
behavior. Fixes CET 15-04-1 et al and 16-08-1. Note: test file
Bug687615.ps depends on old undocumented behavior, but has been patched
in the comparefiles repository.


Modified: trunk/gs/lib/gs_fonts.ps
===================================================================
--- trunk/gs/lib/gs_fonts.ps	2006-11-03 20:43:13 UTC (rev 7155)
+++ trunk/gs/lib/gs_fonts.ps	2006-11-03 20:47:10 UTC (rev 7156)
@@ -448,8 +448,8 @@
          } if
        }
       ifelse
-      dup /.OrigFont known not {
-        dup dup /.OrigFont exch .growput
+      dup /OrigFont known not {
+        dup dup /OrigFont exch .growput
       } if
       true exch
                 % If this is a CIDFont, CIDFontType takes precedence
@@ -539,7 +539,7 @@
         2 copy /FontName exch put
       } if
       1 index exch /.Alias exch put    % <bool> <name> <dict>
-      dup dup /.OrigFont exch .growput
+      dup dup /OrigFont exch .growput
                 % Don't bind in definefont, since Level 2 redefines it.
       /definefont .systemvar exec
     }

Modified: trunk/gs/src/gdevpdtt.c
===================================================================
--- trunk/gs/src/gdevpdtt.c	2006-11-03 20:43:13 UTC (rev 7155)
+++ trunk/gs/src/gdevpdtt.c	2006-11-03 20:47:10 UTC (rev 7156)
@@ -666,7 +666,7 @@
 	 * (the bug 686970). Also comparefiles\455690.pdf appears to
 	 * have similar problem. Therefore we added a support to lib/gs_fonts.ps,
 	 * src/zbfont.c, src/gsfont.c that provides an acces to the original
-	 * font via a special key .OrigFont added to the font dictionary while definefont.
+	 * font via a special key OrigFont added to the font dictionary while definefont.
 	 * Now we work through this access with PS interpreter, 
 	 * but keep the old heuristic for other clients.
 	 */

Modified: trunk/gs/src/zbfont.c
===================================================================
--- trunk/gs/src/zbfont.c	2006-11-03 20:43:13 UTC (rev 7155)
+++ trunk/gs/src/zbfont.c	2006-11-03 20:47:10 UTC (rev 7156)
@@ -576,7 +576,7 @@
 	read_matrix(mem, pmatrix, pmat) < 0
 	)
 	return_error(e_invalidfont);
-    if (dict_find_string(op, ".OrigFont", &porigfont) <= 0)
+    if (dict_find_string(op, "OrigFont", &porigfont) <= 0)
 	porigfont = NULL;
     if (pomat!= NULL) {
 	if (porigfont == NULL ||