--- libgnomeprint-2.3.1/libgnomeprint/gnome-font-face.c.fixttf	2003-02-04 17:31:48.000000000 +0100
+++ libgnomeprint-2.3.1/libgnomeprint/gnome-font-face.c	2003-09-08 14:16:04.000000000 +0200
@@ -1222,7 +1222,7 @@
 	if (pso->encodedbytes == 1) {
 		gint glyph;
 		/* 8-bit vector */
-		gf_pso_sprintf (pso, "/%s findfont dup length dict begin\n", embeddedname);
+		gf_pso_sprintf (pso, "(%s) cvn findfont dup length dict begin\n", embeddedname);
 		gf_pso_sprintf (pso, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
 		gf_pso_sprintf (pso, "/Encoding [\n");
 		for (glyph = 0; glyph < 256; glyph++) {
@@ -1238,7 +1238,7 @@
 			gf_pso_sprintf (pso, ((glyph & 0xf) == 0xf) ? "/%s\n" : "/%s ", c);
 		}
 		gf_pso_sprintf (pso, "] def currentdict end\n");
-		gf_pso_sprintf (pso, "/%s exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "(%s) cvn exch definefont pop\n", pso->encodedname);
 	} else {
 		gint nfonts, nglyphs, i, j;
 		/* 16-bit vector */
@@ -1249,7 +1249,7 @@
 		/* Common entries */
 		gf_pso_sprintf (pso, "/FontType 0 def\n");
 		gf_pso_sprintf (pso, "/FontMatrix [1 0 0 1 0 0] def\n");
-		gf_pso_sprintf (pso, "/FontName /%s-Glyph-Composite def\n", embeddedname);
+		gf_pso_sprintf (pso, "/FontName (%s-Glyph-Composite) cvn def\n", embeddedname);
 		gf_pso_sprintf (pso, "/LanguageLevel 2 def\n");
 
 		/* Type 0 entries */
@@ -1258,7 +1258,7 @@
 		/* Bitch 'o' bitches */
 		gf_pso_sprintf (pso, "/FDepVector [\n");
 		for (i = 0; i < nfonts; i++) {
-			gf_pso_sprintf (pso, "/%s findfont dup length dict begin\n", embeddedname);
+			gf_pso_sprintf (pso, "(%s) cvn findfont dup length dict begin\n", embeddedname);
 			gf_pso_sprintf (pso, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
 			gf_pso_sprintf (pso, "/Encoding [\n");
 			for (j = 0; j < 256; j++) {
@@ -1276,7 +1276,7 @@
 				gf_pso_sprintf (pso, ((j & 0xf) == 0xf) ? "/%s\n" : "/%s ", c);
 			}
 			gf_pso_sprintf (pso, "] def\n");
-			gf_pso_sprintf (pso, "currentdict end /%s-Glyph-Page-%d exch definefont\n", embeddedname, i);
+			gf_pso_sprintf (pso, "currentdict end (%s-Glyph-Page-%d) cvn exch definefont\n", embeddedname, i);
 		}
 		gf_pso_sprintf (pso, "] def\n");
 		gf_pso_sprintf (pso, "/Encoding [\n");
@@ -1287,7 +1287,7 @@
 		}
 		gf_pso_sprintf (pso, "] def\n");
 		gf_pso_sprintf (pso, "currentdict end\n");
-		gf_pso_sprintf (pso, "/%s exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "(%s) cvn exch definefont pop\n", pso->encodedname);
 	}
 }
 
@@ -1332,7 +1332,7 @@
 		MfrRevision = 1.0;
 		gf_pso_sprintf (pso, "%%!PS-TrueTypeFont-%g-%g\n", TTVersion, MfrRevision);
 		gf_pso_sprintf (pso, "11 dict begin\n");
-		gf_pso_sprintf (pso, "/FontName /%s def\n", embeddedname);
+		gf_pso_sprintf (pso, "/FontName (%s) cvn def\n", embeddedname);
 		gf_pso_sprintf (pso, "/Encoding 256 array\n");
 		gf_pso_sprintf (pso, "0 1 255 {1 index exch /.notdef put} for\n");
 		gf_pso_sprintf (pso, "readonly def\n");
@@ -1408,7 +1408,7 @@
 		gint glyph;
 		/* 8-bit vector */
 		pso->encodedbytes = 1;
-		gf_pso_sprintf (pso, "/%s findfont dup length dict begin\n", embeddedname);
+		gf_pso_sprintf (pso, "(%s) cvn findfont dup length dict begin\n", embeddedname);
 		gf_pso_sprintf (pso, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
 		gf_pso_sprintf (pso, "/Encoding [\n");
 		for (glyph = 0; glyph < 256; glyph++) {
@@ -1421,7 +1421,7 @@
 			}
 		}
 		gf_pso_sprintf (pso, "] def currentdict end\n");
-		gf_pso_sprintf (pso, "/%s exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "(%s) cvn exch definefont pop\n", pso->encodedname);
 	} else {
 		gint nfonts, nglyphs, i, j;
 		/* 16-bit vector */
@@ -1433,14 +1433,14 @@
 		/* Common entries */
 		gf_pso_sprintf (pso, "/FontType 0 def\n");
 		gf_pso_sprintf (pso, "/FontMatrix [1 0 0 1 0 0] def\n");
-		gf_pso_sprintf (pso, "/FontName /%s-Glyph-Composite def\n", embeddedname);
+		gf_pso_sprintf (pso, "/FontName (%s-Glyph-Composite) cvn def\n", embeddedname);
 		gf_pso_sprintf (pso, "/LanguageLevel 2 def\n");
 		/* Type 0 entries */
 		gf_pso_sprintf (pso, "/FMapType 2 def\n");
 		/* Bitch 'o' bitches */
 		gf_pso_sprintf (pso, "/FDepVector [\n");
 		for (i = 0; i < nfonts; i++) {
-			gf_pso_sprintf (pso, "/%s findfont dup length dict begin\n", embeddedname);
+			gf_pso_sprintf (pso, "(%s) cvn findfont dup length dict begin\n", embeddedname);
 			gf_pso_sprintf (pso, "{1 index /FID ne {def} {pop pop} ifelse} forall\n");
 			gf_pso_sprintf (pso, "/Encoding [\n");
 			for (j = 0; j < 256; j++) {
@@ -1455,7 +1455,7 @@
 				}
 			}
 			gf_pso_sprintf (pso, "] def\n");
-			gf_pso_sprintf (pso, "currentdict end /%s-Glyph-Page-%d exch definefont\n", embeddedname, i);
+			gf_pso_sprintf (pso, "currentdict end (%s-Glyph-Page-%d) cvn exch definefont\n", embeddedname, i);
 		}
 		gf_pso_sprintf (pso, "] def\n");
 		gf_pso_sprintf (pso, "/Encoding [\n");
@@ -1466,7 +1466,7 @@
 		}
 		gf_pso_sprintf (pso, "] def\n");
 		gf_pso_sprintf (pso, "currentdict end\n");
-		gf_pso_sprintf (pso, "/%s exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "(%s) cvn exch definefont pop\n", pso->encodedname);
 	}
 }
 
@@ -1494,16 +1494,16 @@
 	gf_pso_sprintf (pso, "/BuildChar {1 index /Encoding get exch get 1 index /BuildGlyph get exec } bind def\n");
 	if (pso->encodedbytes == 1) {
 		/* 8-bit empty font */
-		gf_pso_sprintf (pso, "currentdict end /%s exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "currentdict end (%s) cvn exch definefont pop\n", pso->encodedname);
 	} else {
 		/* 16-bit empty font */
-		gf_pso_sprintf (pso, "currentdict end /%s-Base exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "currentdict end (%s-Base) cvn exch definefont pop\n", pso->encodedname);
 		gf_pso_sprintf (pso, "32 dict begin /FontType 0 def /FontMatrix [1 0 0 1 0 0] def\n");
-		gf_pso_sprintf (pso, "/FontName /%s-Glyph-Composite def\n", pso->encodedname);
+		gf_pso_sprintf (pso, "/FontName (%s-Glyph-Composite) cvn def\n", pso->encodedname);
 		gf_pso_sprintf (pso, "/LanguageLevel 2 def /FMapType 2 def\n");
-		gf_pso_sprintf (pso, "/FDepVector [/%s-Base findfont] def", pso->encodedname);
+		gf_pso_sprintf (pso, "/FDepVector [(%s-Base) cvn findfont] def", pso->encodedname);
 		gf_pso_sprintf (pso, "/Encoding 256 array def 0 1 255 {Encoding exch 0 put} for\n");
-		gf_pso_sprintf (pso, "currentdict end /%s exch definefont pop\n", pso->encodedname);
+		gf_pso_sprintf (pso, "currentdict end (%s) cvn exch definefont pop\n", pso->encodedname);
 	}
 }
 
--- libgnomeprint-2.3.1/libgnomeprint/gnome-print-ps2.c.fixttf	2003-02-04 17:31:49.000000000 +0100
+++ libgnomeprint-2.3.1/libgnomeprint/gnome-print-ps2.c	2003-09-08 14:24:06.000000000 +0200
@@ -573,7 +573,7 @@
 	while (ps2->pages->usedfonts) {
 		GnomePrintPs2Font *font;
 		font = ps2->pages->usedfonts->data;
-		ret += gnome_print_ps2_fprintf (ps2, "%%%%+ font %s" EOL, font->pso->encodedname);
+		ret += gnome_print_ps2_fprintf (ps2, "%%%%+ font (%s) cvn" EOL, font->pso->encodedname);
 		ps2->pages->usedfonts = g_slist_remove (ps2->pages->usedfonts, ps2->pages->usedfonts->data);
 	}
 
@@ -647,7 +647,7 @@
 	gnome_print_transport_printf (pc->transport, "%%%%DocumentSuppliedResources: procset pnome-print-procs-%s" EOL, VERSION);
 	/* %%DocumentSuppliedResources: */
 	for (font = ps2->fonts; font != NULL; font = font->next) {
-		gnome_print_transport_printf (pc->transport, "%%%%+ font %s" EOL, font->pso->encodedname);
+		gnome_print_transport_printf (pc->transport, "%%%%+ font (%s) cvn" EOL, font->pso->encodedname);
 	}
 	gnome_print_transport_printf (pc->transport, "%%%%EndComments" EOL);
 	g_free (date);
@@ -683,7 +683,7 @@
 	/* Download fonts */
 	for (font = ps2->fonts; font != NULL; font = font->next) {
 		gnome_font_face_ps_embed (font->pso);
-		gnome_print_transport_printf (pc->transport, "%%%%BeginResource: font %s" EOL, font->pso->encodedname);
+		gnome_print_transport_printf (pc->transport, "%%%%BeginResource: font (%s) cvn" EOL, font->pso->encodedname);
 		gnome_print_transport_write (pc->transport, font->pso->buf, font->pso->length);
 		gnome_print_transport_printf (pc->transport, "%%%%EndResource" EOL);
 	}
@@ -857,7 +857,7 @@
 		ps2->pages->usedfonts = g_slist_prepend (ps2->pages->usedfonts, font);
 	}
 
-	ret += gnome_print_ps2_fprintf (ps2, "/%s FF %g F" EOL, font->pso->encodedname, gnome_font_get_size (gnome_font));
+	ret += gnome_print_ps2_fprintf (ps2, "(%s) cvn FF %g F" EOL, font->pso->encodedname, gnome_font_get_size (gnome_font));
 
 	font->currentsize = gnome_font->size;
 	ps2->selected_font = font;
