[gs-cvs] rev 7031 - trunk/gs/src

[lpd at ghostscript.com]

Author: lpd
Date: 2006-09-10 20:29:39 -0700 (Sun, 10 Sep 2006)
New Revision: 7031

Modified:
   trunk/gs/src/zchar.c
Log:
Makes kshow generate invalidfont if the current font is a composite font,
per PLRM.  (The graphics library does enforce this restriction, but in
gs_kshow_n_init, not in gs_kshow_begin, and the interpreter uses the
latter.)


Modified: trunk/gs/src/zchar.c
===================================================================
--- trunk/gs/src/zchar.c	2006-09-10 22:24:31 UTC (rev 7030)
+++ trunk/gs/src/zchar.c	2006-09-11 03:29:39 UTC (rev 7031)
@@ -147,6 +147,13 @@
     int code;
 
     check_proc(op[-1]);
+    /*
+     * Per PLRM Section xx.x, kshow is illegal if the current font is a
+     * composite font.  The graphics library does not have this limitation,
+     * so we check for it here.
+     */
+    if (gs_currentfont(igs)->FontType == ft_composite)
+	return_error(e_invalidfont);
     if ((code = op_show_setup(i_ctx_p, op)) != 0 ||
 	(code = gs_kshow_begin(igs, op->value.bytes, r_size(op),
 			       imemory, &penum)) < 0)