Updated Windows metrics for core fonts

Ian Pilcher ian.pilcher at home.com
Tue Jun 5 17:20:19 CDT 2001


I have given up on figuring out how Windows and/or the Windows Post-
Script driver calculate metrics for PostScript fonts.  (The final straw
was discovering that the ASCII and Unicode versions of GetTextMetrics
return different metrics for the same printer font!)

Rather than imitate such bizarre behavior, I have decided to simply
use the metrics from the "equivalent" TrueType fonts.  Compatibility
with the core PostScript fonts was a design point for these TrueType
fonts, so this should work for all but the most advanced typesetting
programs.

This patch also removes the metrics for 'Helvetica Condensed'.  As far
as I can tell, it isn't really one of the core fonts (it's not listed
in the majority of PPD files), and the URW fonts package upon which most
Ghostscript users depend does not include a substitute.

Modified files:
    dlls/wineps: Makefile.in
    dlls/wineps/data: agl.c

Removed files:
    dlls/wineps/data: Helvetica_Condensed.c Helvetica_Condensed_Bold.c
                      Helvetica_Condensed_BoldObl.c
                      Helvetica_Condensed_Oblique.c

Log message:
    Ian Pilcher
    Update built-in metrics for core PostScript fonts

-- 
========================================================================
Ian Pilcher                                         ian.pilcher at home.com
========================================================================
-------------- next part --------------
diff -urN ../wine-20010604cvs/dlls/wineps/Makefile.in ./dlls/wineps/Makefile.in
--- ../wine-20010604cvs/dlls/wineps/Makefile.in	Tue May 29 18:16:33 2001
+++ ./dlls/wineps/Makefile.in	Tue Jun  5 11:57:56 2001
@@ -25,10 +25,6 @@
 	Helvetica \
 	Helvetica_Bold \
 	Helvetica_BoldOblique \
-	Helvetica_Condensed \
-	Helvetica_Condensed_Bold \
-	Helvetica_Condensed_BoldObl \
-	Helvetica_Condensed_Oblique \
 	Helvetica_Narrow \
 	Helvetica_Narrow_Bold \
 	Helvetica_Narrow_BoldOblique \
diff -urN ../wine-20010604cvs/dlls/wineps/data/AvantGarde_Book.c ./dlls/wineps/data/AvantGarde_Book.c
--- ../wine-20010604cvs/dlls/wineps/data/AvantGarde_Book.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/AvantGarde_Book.c	Tue Jun  5 15:45:08 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Gothic, which is Copyright
+ *  	1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Avant Garde Gothic Book",		/* FullName */
     "ITC Avant Garde Gothic",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     955,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	955,				/* WinMetrics.sAscender */
-	-222,				/* WinMetrics.sDescender */
+	1006,				/* WinMetrics.sAscender */
+	-220,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	740,				/* WinMetrics.sTypoAscender */
-	-191,				/* WinMetrics.sTypoDescender */
-	269,				/* WinMetrics.sTypoLineGap */
-	955,				/* WinMetrics.usWinAscent */
-	222				/* WinMetrics.usWinDescent */
+	486,				/* WinMetrics.sAvgCharWidth */
+	750,				/* WinMetrics.sTypoAscender */
+	-208,				/* WinMetrics.sTypoDescender */
+	112,				/* WinMetrics.sTypoLineGap */
+	971,				/* WinMetrics.usWinAscent */
+	220				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/AvantGarde_BookOblique.c ./dlls/wineps/data/AvantGarde_BookOblique.c
--- ../wine-20010604cvs/dlls/wineps/data/AvantGarde_BookOblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/AvantGarde_BookOblique.c	Tue Jun  5 15:42:53 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Gothic Italic, which is
+ *  	Copyright 1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Avant Garde Gothic Book Oblique",	/* FullName */
     "ITC Avant Garde Gothic",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -10.5,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     955,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	955,				/* WinMetrics.sAscender */
-	-222,				/* WinMetrics.sDescender */
+	1006,				/* WinMetrics.sAscender */
+	-220,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	740,				/* WinMetrics.sTypoAscender */
-	-191,				/* WinMetrics.sTypoDescender */
-	269,				/* WinMetrics.sTypoLineGap */
-	955,				/* WinMetrics.usWinAscent */
-	222				/* WinMetrics.usWinDescent */
+	486,				/* WinMetrics.sAvgCharWidth */
+	750,				/* WinMetrics.sTypoAscender */
+	-208,				/* WinMetrics.sTypoDescender */
+	112,				/* WinMetrics.sTypoLineGap */
+	971,				/* WinMetrics.usWinAscent */
+	220				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/AvantGarde_Demi.c ./dlls/wineps/data/AvantGarde_Demi.c
--- ../wine-20010604cvs/dlls/wineps/data/AvantGarde_Demi.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/AvantGarde_Demi.c	Tue Jun  5 15:33:36 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Gothic Bold, which is Copyright
+ *  	1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Avant Garde Gothic Demi",		/* FullName */
     "ITC Avant Garde Gothic",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    600,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     969,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	1021,				/* WinMetrics.sAscender */
-	-251,				/* WinMetrics.sDescender */
+	1006,				/* WinMetrics.sAscender */
+	-220,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	740,				/* WinMetrics.sTypoAscender */
-	-184,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	1021,				/* WinMetrics.usWinAscent */
-	251				/* WinMetrics.usWinDescent */
+	486,				/* WinMetrics.sAvgCharWidth */
+	750,				/* WinMetrics.sTypoAscender */
+	-208,				/* WinMetrics.sTypoDescender */
+	112,				/* WinMetrics.sTypoLineGap */
+	971,				/* WinMetrics.usWinAscent */
+	220				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/AvantGarde_DemiOblique.c ./dlls/wineps/data/AvantGarde_DemiOblique.c
--- ../wine-20010604cvs/dlls/wineps/data/AvantGarde_DemiOblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/AvantGarde_DemiOblique.c	Tue Jun  5 15:27:56 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Gothic Bold Italic, which is
+ *  	Copyright 1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Avant Garde Gothic Demi Oblique",	/* FullName */
     "ITC Avant Garde Gothic",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    600,					/* Weight */
+    FW_BOLD,					/* Weight */
     -10.5,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     969,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	1021,				/* WinMetrics.sAscender */
-	-251,				/* WinMetrics.sDescender */
+	1006,				/* WinMetrics.sAscender */
+	-220,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	740,				/* WinMetrics.sTypoAscender */
-	-184,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	1021,				/* WinMetrics.usWinAscent */
-	251				/* WinMetrics.usWinDescent */
+	485,				/* WinMetrics.sAvgCharWidth */
+	750,				/* WinMetrics.sTypoAscender */
+	-208,				/* WinMetrics.sTypoDescender */
+	112,				/* WinMetrics.sTypoLineGap */
+	1006,				/* WinMetrics.usWinAscent */
+	220				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Bookman_Demi.c ./dlls/wineps/data/Bookman_Demi.c
--- ../wine-20010604cvs/dlls/wineps/data/Bookman_Demi.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Bookman_Demi.c	Tue Jun  5 14:36:40 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Bookman Old Style Bold, which is
+ *  	Copyright 1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Bookman Demi",				/* FullName */
     "ITC Bookman",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    600,					/* Weight */
+    FW_DEMIBOLD,				/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     934,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	934,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
+	942,				/* WinMetrics.sAscender */
+	-232,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	725,				/* WinMetrics.sTypoAscender */
-	-211,				/* WinMetrics.sTypoDescender */
-	264,				/* WinMetrics.sTypoLineGap */
-	934,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	527,				/* WinMetrics.sAvgCharWidth */
+	717,				/* WinMetrics.sTypoAscender */
+	-223,				/* WinMetrics.sTypoDescender */
+	130,				/* WinMetrics.sTypoLineGap */
+	941,				/* WinMetrics.usWinAscent */
+	231				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Bookman_DemiItalic.c ./dlls/wineps/data/Bookman_DemiItalic.c
--- ../wine-20010604cvs/dlls/wineps/data/Bookman_DemiItalic.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Bookman_DemiItalic.c	Tue Jun  5 14:34:37 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Bookman Old Style Bold Italic, which is
+ *  	Copyright 1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Bookman Demi Italic",			/* FullName */
     "ITC Bookman",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    600,					/* Weight */
+    FW_DEMIBOLD,				/* Weight */
     -10,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     941,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	941,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
+	942,				/* WinMetrics.sAscender */
+	-232,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	732,				/* WinMetrics.sTypoAscender */
-	-212,				/* WinMetrics.sTypoDescender */
-	256,				/* WinMetrics.sTypoLineGap */
-	941,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	538,				/* WinMetrics.sAvgCharWidth */
+	716,				/* WinMetrics.sTypoAscender */
+	-223,				/* WinMetrics.sTypoDescender */
+	130,				/* WinMetrics.sTypoLineGap */
+	942,				/* WinMetrics.usWinAscent */
+	231				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Bookman_Light.c ./dlls/wineps/data/Bookman_Light.c
--- ../wine-20010604cvs/dlls/wineps/data/Bookman_Light.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Bookman_Light.c	Tue Jun  5 14:31:52 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Bookman Old Style, which is Copyright
+ *  	1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Bookman Light",			/* FullName */
     "ITC Bookman",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    300,					/* Weight */
+    FW_LIGHT,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     908,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	908,				/* WinMetrics.sAscender */
-	-251,				/* WinMetrics.sDescender */
+	942,				/* WinMetrics.sAscender */
+	-232,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	717,				/* WinMetrics.sTypoAscender */
-	-227,				/* WinMetrics.sTypoDescender */
-	256,				/* WinMetrics.sTypoLineGap */
-	908,				/* WinMetrics.usWinAscent */
-	251				/* WinMetrics.usWinDescent */
+	492,				/* WinMetrics.sAvgCharWidth */
+	716,				/* WinMetrics.sTypoAscender */
+	-225,				/* WinMetrics.sTypoDescender */
+	128,				/* WinMetrics.sTypoLineGap */
+	894,				/* WinMetrics.usWinAscent */
+	231				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Bookman_LightItalic.c ./dlls/wineps/data/Bookman_LightItalic.c
--- ../wine-20010604cvs/dlls/wineps/data/Bookman_LightItalic.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Bookman_LightItalic.c	Tue Jun  5 14:29:36 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Bookman Old Style Italic, which is
+ *  	Copyright 1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Bookman Light Italic",			/* FullName */
     "ITC Bookman",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    300,					/* Weight */
+    FW_LIGHT,					/* Weight */
     -10,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     883,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	883,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	17,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	717,				/* WinMetrics.sTypoAscender */
-	-211,				/* WinMetrics.sTypoDescender */
-	272,				/* WinMetrics.sTypoLineGap */
-	883,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	942,				/* WinMetrics.sAscender */
+	-232,				/* WinMetrics.sDescender */
+	0,				/* WinMetrics.sLineGap */
+	482,				/* WinMetrics.sAvgCharWidth */
+	716,				/* WinMetrics.sTypoAscender */
+	-230,				/* WinMetrics.sTypoDescender */
+	123,				/* WinMetrics.sTypoLineGap */
+	875,				/* WinMetrics.usWinAscent */
+	232				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Courier.c ./dlls/wineps/data/Courier.c
--- ../wine-20010604cvs/dlls/wineps/data/Courier.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Courier.c	Tue Jun  5 14:25:53 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Courier New, which is Copyright
+ *  	1990-1994 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -1007,7 +1010,7 @@
     "Courier",					/* FullName */
     "Courier",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     TRUE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -1020,15 +1023,15 @@
     753,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	805,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	95,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	629,				/* WinMetrics.sTypoAscender */
-	-156,				/* WinMetrics.sTypoDescender */
-	415,				/* WinMetrics.sTypoLineGap */
-	805,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	833,				/* WinMetrics.sAscender */
+	-300,				/* WinMetrics.sDescender */
+	0,				/* WinMetrics.sLineGap */
+	600,				/* WinMetrics.sAvgCharWidth */
+	613,				/* WinMetrics.sTypoAscender */
+	-188,				/* WinMetrics.sTypoDescender */
+	0,				/* WinMetrics.sTypoLineGap */
+	833,				/* WinMetrics.usWinAscent */
+	300				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Courier_Bold.c ./dlls/wineps/data/Courier_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/Courier_Bold.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Courier_Bold.c	Tue Jun  5 14:22:47 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Courier New Bold, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -1007,7 +1010,7 @@
     "Courier Bold",				/* FullName */
     "Courier",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     TRUE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -1020,15 +1023,15 @@
     801,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	801,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	99,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	626,				/* WinMetrics.sTypoAscender */
-	-141,				/* WinMetrics.sTypoDescender */
-	433,				/* WinMetrics.sTypoLineGap */
-	801,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	833,				/* WinMetrics.sAscender */
+	-300,				/* WinMetrics.sDescender */
+	0,				/* WinMetrics.sLineGap */
+	600,				/* WinMetrics.sAvgCharWidth */
+	633,				/* WinMetrics.sTypoAscender */
+	-209,				/* WinMetrics.sTypoDescender */
+	0,				/* WinMetrics.sTypoLineGap */
+	833,				/* WinMetrics.usWinAscent */
+	300				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Courier_BoldOblique.c ./dlls/wineps/data/Courier_BoldOblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Courier_BoldOblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Courier_BoldOblique.c	Tue Jun  5 14:20:22 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Courier New Bold Italic, which is
+ *  	Copyright 1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -1007,7 +1010,7 @@
     "Courier Bold Oblique",			/* FullName */
     "Courier",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     -12,					/* ItalicAngle */
     TRUE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -1020,15 +1023,15 @@
     801,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	801,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	99,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	626,				/* WinMetrics.sTypoAscender */
-	-141,				/* WinMetrics.sTypoDescender */
-	433,				/* WinMetrics.sTypoLineGap */
-	801,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	833,				/* WinMetrics.sAscender */
+	-300,				/* WinMetrics.sDescender */
+	0,				/* WinMetrics.sLineGap */
+	600,				/* WinMetrics.sAvgCharWidth */
+	633,				/* WinMetrics.sTypoAscender */
+	-209,				/* WinMetrics.sTypoDescender */
+	0,				/* WinMetrics.sTypoLineGap */
+	833,				/* WinMetrics.usWinAscent */
+	300				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Courier_Oblique.c ./dlls/wineps/data/Courier_Oblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Courier_Oblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Courier_Oblique.c	Tue Jun  5 14:17:28 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Courier New Italic, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -1007,7 +1010,7 @@
     "Courier Oblique",				/* FullName */
     "Courier",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -12,					/* ItalicAngle */
     TRUE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -1020,15 +1023,15 @@
     753,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	805,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	95,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	629,				/* WinMetrics.sTypoAscender */
-	-156,				/* WinMetrics.sTypoDescender */
-	415,				/* WinMetrics.sTypoLineGap */
-	805,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	833,				/* WinMetrics.sAscender */
+	-300,				/* WinMetrics.sDescender */
+	0,				/* WinMetrics.sLineGap */
+	600,				/* WinMetrics.sAvgCharWidth */
+	613,				/* WinMetrics.sTypoAscender */
+	-188,				/* WinMetrics.sTypoDescender */
+	0,				/* WinMetrics.sTypoLineGap */
+	833,				/* WinMetrics.usWinAscent */
+	300				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica.c ./dlls/wineps/data/Helvetica.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica.c	Tue Jun  5 14:13:43 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial, which is Copyright 1990-1992 The
+ *  	Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica",				/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     931,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	931,				/* WinMetrics.sAscender */
-	-225,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	931,				/* WinMetrics.usWinAscent */
-	225				/* WinMetrics.usWinDescent */
+	905,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
+	33,				/* WinMetrics.sLineGap */
+	441,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-210,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	905,				/* WinMetrics.usWinAscent */
+	212				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Bold.c ./dlls/wineps/data/Helvetica_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Bold.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Bold.c	Tue Jun  5 14:11:29 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Bold, which is Copyright 1990-1992
+ *  	The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Bold",				/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     962,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	962,				/* WinMetrics.sAscender */
-	-228,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	962,				/* WinMetrics.usWinAscent */
-	228				/* WinMetrics.usWinDescent */
+	905,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
+	33,				/* WinMetrics.sLineGap */
+	479,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-210,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	905,				/* WinMetrics.usWinAscent */
+	212				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_BoldOblique.c ./dlls/wineps/data/Helvetica_BoldOblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_BoldOblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_BoldOblique.c	Tue Jun  5 14:09:06 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Bold Italic, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Bold Oblique",			/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     -12,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     962,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	962,				/* WinMetrics.sAscender */
-	-228,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	962,				/* WinMetrics.usWinAscent */
-	228				/* WinMetrics.usWinDescent */
+	905,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
+	33,				/* WinMetrics.sLineGap */
+	479,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-210,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	905,				/* WinMetrics.usWinAscent */
+	212				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed.c ./dlls/wineps/data/Helvetica_Condensed.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Condensed.c	Wed Dec 31 18:00:00 1969
@@ -1,1015 +0,0 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica Condensed Medium
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	This data is derived from the Adobe Font Metrics files at
- *
- *	    ftp://ftp.adobe.com/pub/adobe/type/win/all/afmfiles/base35/
- *
- *	which are Copyright 1985-1992 Adobe Systems Incorporated.
- *
- */
-
-#include "psdrv.h"
-
-
-/*
- *  Glyph metrics
- */
-
-static AFMMETRICS met_Helvetica_Condensed[228] = 
-{
-    {
-	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
-		{    0,    0,    0,    0 }, NULL	/* space */
-    },
-    {
-	 33, 0x0021,  333, PSDRV_AGLGlyphNames +  907,
-		{  121,    0,  212,  750 }, NULL	/* exclam */
-    },
-    {
-	 34, 0x0022,  250, PSDRV_AGLGlyphNames + 1118,
-		{   44,  513,  207,  739 }, NULL	/* quotedbl */
-    },
-    {
-	 35, 0x0023,  500, PSDRV_AGLGlyphNames + 1043,
-		{    5,    0,  495,  750 }, NULL	/* numbersign */
-    },
-    {
-	 36, 0x0024,  500, PSDRV_AGLGlyphNames +  866,
-		{   35, -116,  465,  815 }, NULL	/* dollar */
-    },
-    {
-	 37, 0x0025,  833, PSDRV_AGLGlyphNames + 1094,
-		{   55,  -15,  756,  750 }, NULL	/* percent */
-    },
-    {
-	 38, 0x0026,  667, PSDRV_AGLGlyphNames +  755,
-		{   75,  -18,  620,  750 }, NULL	/* ampersand */
-    },
-    {
-	169, 0x0027,  250, PSDRV_AGLGlyphNames + 1126,
-		{   99,  513,  151,  739 }, NULL	/* quotesingle */
-    },
-    {
-	 40, 0x0028,  333, PSDRV_AGLGlyphNames + 1081,
-		{   76, -215,  289,  750 }, NULL	/* parenleft */
-    },
-    {
-	 41, 0x0029,  333, PSDRV_AGLGlyphNames + 1087,
-		{   44, -215,  257,  750 }, NULL	/* parenright */
-    },
-    {
-	 42, 0x002a,  500, PSDRV_AGLGlyphNames +  782,
-		{   96,  455,  405,  750 }, NULL	/* asterisk */
-    },
-    {
-	 43, 0x002b,  500, PSDRV_AGLGlyphNames + 1105,
-		{   44,    0,  457,  505 }, NULL	/* plus */
-    },
-    {
-	 44, 0x002c,  250, PSDRV_AGLGlyphNames +  835,
-		{   80, -146,  171,  100 }, NULL	/* comma */
-    },
-    {
-	 45, 0x002d,  333, PSDRV_AGLGlyphNames +  961,
-		{   45,  275,  288,  358 }, NULL	/* hyphen */
-    },
-    {
-	 46, 0x002e,  250, PSDRV_AGLGlyphNames + 1095,
-		{   80,    0,  171,  100 }, NULL	/* period */
-    },
-    {
-	 47, 0x002f,  278, PSDRV_AGLGlyphNames + 1167,
-		{  -13,  -27,  291,  750 }, NULL	/* slash */
-    },
-    {
-	 48, 0x0030,  500, PSDRV_AGLGlyphNames + 1253,
-		{   46,  -15,  455,  750 }, NULL	/* zero */
-    },
-    {
-	 49, 0x0031,  500, PSDRV_AGLGlyphNames + 1060,
-		{   74,    0,  317,  750 }, NULL	/* one */
-    },
-    {
-	 50, 0x0032,  500, PSDRV_AGLGlyphNames + 1206,
-		{   44,    0,  447,  750 }, NULL	/* two */
-    },
-    {
-	 51, 0x0033,  500, PSDRV_AGLGlyphNames + 1188,
-		{   38,  -15,  447,  750 }, NULL	/* three */
-    },
-    {
-	 52, 0x0034,  500, PSDRV_AGLGlyphNames +  930,
-		{   28,    0,  451,  750 }, NULL	/* four */
-    },
-    {
-	 53, 0x0035,  500, PSDRV_AGLGlyphNames +  922,
-		{   43,  -15,  446,  735 }, NULL	/* five */
-    },
-    {
-	 54, 0x0036,  500, PSDRV_AGLGlyphNames + 1163,
-		{   43,  -15,  458,  750 }, NULL	/* six */
-    },
-    {
-	 55, 0x0037,  500, PSDRV_AGLGlyphNames + 1154,
-		{   44,    0,  456,  735 }, NULL	/* seven */
-    },
-    {
-	 56, 0x0038,  500, PSDRV_AGLGlyphNames +  886,
-		{   46,  -15,  454,  750 }, NULL	/* eight */
-    },
-    {
-	 57, 0x0039,  500, PSDRV_AGLGlyphNames + 1032,
-		{   43,  -15,  458,  750 }, NULL	/* nine */
-    },
-    {
-	 58, 0x003a,  250, PSDRV_AGLGlyphNames +  833,
-		{   80,    0,  171,  547 }, NULL	/* colon */
-    },
-    {
-	 59, 0x003b,  250, PSDRV_AGLGlyphNames + 1153,
-		{   80, -146,  171,  547 }, NULL	/* semicolon */
-    },
-    {
-	 60, 0x003c,  500, PSDRV_AGLGlyphNames + 1003,
-		{   42,  -10,  459,  518 }, NULL	/* less */
-    },
-    {
-	 61, 0x003d,  500, PSDRV_AGLGlyphNames +  900,
-		{   44,  124,  457,  384 }, NULL	/* equal */
-    },
-    {
-	 62, 0x003e,  500, PSDRV_AGLGlyphNames +  948,
-		{   42,  -10,  459,  518 }, NULL	/* greater */
-    },
-    {
-	 63, 0x003f,  500, PSDRV_AGLGlyphNames + 1114,
-		{   60,    0,  462,  750 }, NULL	/* question */
-    },
-    {
-	 64, 0x0040,  800, PSDRV_AGLGlyphNames +  785,
-		{   36,  -15,  764,  750 }, NULL	/* at */
-    },
-    {
-	 65, 0x0041,  556, PSDRV_AGLGlyphNames +    0,
-		{   11,    0,  546,  750 }, NULL	/* A */
-    },
-    {
-	 66, 0x0042,  556, PSDRV_AGLGlyphNames +   25,
-		{   80,    0,  503,  750 }, NULL	/* B */
-    },
-    {
-	 67, 0x0043,  556, PSDRV_AGLGlyphNames +   29,
-		{   53,  -18,  503,  765 }, NULL	/* C */
-    },
-    {
-	 68, 0x0044,  611, PSDRV_AGLGlyphNames +   42,
-		{   82,    0,  548,  750 }, NULL	/* D */
-    },
-    {
-	 69, 0x0045,  500, PSDRV_AGLGlyphNames +   52,
-		{   74,    0,  451,  750 }, NULL	/* E */
-    },
-    {
-	 70, 0x0046,  444, PSDRV_AGLGlyphNames +   75,
-		{   74,    0,  426,  750 }, NULL	/* F */
-    },
-    {
-	 71, 0x0047,  611, PSDRV_AGLGlyphNames +   77,
-		{   54,  -18,  532,  765 }, NULL	/* G */
-    },
-    {
-	 72, 0x0048,  611, PSDRV_AGLGlyphNames +   87,
-		{   79,    0,  532,  750 }, NULL	/* H */
-    },
-    {
-	 73, 0x0049,  278, PSDRV_AGLGlyphNames +   97,
-		{   98,    0,  181,  750 }, NULL	/* I */
-    },
-    {
-	 74, 0x004a,  444, PSDRV_AGLGlyphNames +  118,
-		{   21,  -15,  368,  750 }, NULL	/* J */
-    },
-    {
-	 75, 0x004b,  556, PSDRV_AGLGlyphNames +  121,
-		{   79,    0,  546,  750 }, NULL	/* K */
-    },
-    {
-	 76, 0x004c,  500, PSDRV_AGLGlyphNames +  125,
-		{   83,    0,  472,  750 }, NULL	/* L */
-    },
-    {
-	 77, 0x004d,  778, PSDRV_AGLGlyphNames +  135,
-		{   76,    0,  702,  750 }, NULL	/* M */
-    },
-    {
-	 78, 0x004e,  611, PSDRV_AGLGlyphNames +  140,
-		{   77,    0,  534,  750 }, NULL	/* N */
-    },
-    {
-	 79, 0x004f,  611, PSDRV_AGLGlyphNames +  148,
-		{   59,  -18,  553,  765 }, NULL	/* O */
-    },
-    {
-	 80, 0x0050,  556, PSDRV_AGLGlyphNames +  174,
-		{   86,    0,  519,  750 }, NULL	/* P */
-    },
-    {
-	 81, 0x0051,  611, PSDRV_AGLGlyphNames +  179,
-		{   59,  -34,  582,  765 }, NULL	/* Q */
-    },
-    {
-	 82, 0x0052,  611, PSDRV_AGLGlyphNames +  181,
-		{   86,    0,  565,  750 }, NULL	/* R */
-    },
-    {
-	 83, 0x0053,  556, PSDRV_AGLGlyphNames +  189,
-		{   51,  -18,  505,  765 }, NULL	/* S */
-    },
-    {
-	 84, 0x0054,  500, PSDRV_AGLGlyphNames +  238,
-		{   15,    0,  486,  750 }, NULL	/* T */
-    },
-    {
-	 85, 0x0055,  611, PSDRV_AGLGlyphNames +  248,
-		{   81,  -18,  531,  750 }, NULL	/* U */
-    },
-    {
-	 86, 0x0056,  556, PSDRV_AGLGlyphNames +  269,
-		{   11,    0,  545,  750 }, NULL	/* V */
-    },
-    {
-	 87, 0x0057,  833, PSDRV_AGLGlyphNames +  271,
-		{   17,    0,  816,  750 }, NULL	/* W */
-    },
-    {
-	 88, 0x0058,  556, PSDRV_AGLGlyphNames +  277,
-		{   17,    0,  539,  750 }, NULL	/* X */
-    },
-    {
-	 89, 0x0059,  556, PSDRV_AGLGlyphNames +  280,
-		{   11,    0,  546,  750 }, NULL	/* Y */
-    },
-    {
-	 90, 0x005a,  500, PSDRV_AGLGlyphNames +  288,
-		{   28,    0,  473,  750 }, NULL	/* Z */
-    },
-    {
-	 91, 0x005b,  333, PSDRV_AGLGlyphNames +  801,
-		{  100, -209,  275,  750 }, NULL	/* bracketleft */
-    },
-    {
-	 92, 0x005c,  250, PSDRV_AGLGlyphNames +  788,
-		{  -31,    0,  281,  750 }, NULL	/* backslash */
-    },
-    {
-	 93, 0x005d,  333, PSDRV_AGLGlyphNames +  805,
-		{   58, -209,  233,  750 }, NULL	/* bracketright */
-    },
-    {
-	 94, 0x005e,  500, PSDRV_AGLGlyphNames +  780,
-		{   70,  333,  431,  750 }, NULL	/* asciicircum */
-    },
-    {
-	 95, 0x005f,  500, PSDRV_AGLGlyphNames + 1221,
-		{    0, -125,  500,  -75 }, NULL	/* underscore */
-    },
-    {
-	193, 0x0060,  333, PSDRV_AGLGlyphNames +  945,
-		{   35,  624,  233,  765 }, NULL	/* grave */
-    },
-    {
-	 97, 0x0061,  444, PSDRV_AGLGlyphNames +  295,
-		{   31,  -15,  417,  571 }, NULL	/* a */
-    },
-    {
-	 98, 0x0062,  500, PSDRV_AGLGlyphNames +  787,
-		{   75,  -15,  447,  750 }, NULL	/* b */
-    },
-    {
-	 99, 0x0063,  444, PSDRV_AGLGlyphNames +  813,
-		{   44,  -15,  405,  571 }, NULL	/* c */
-    },
-    {
-	100, 0x0064,  500, PSDRV_AGLGlyphNames +  848,
-		{   48,  -15,  424,  750 }, NULL	/* d */
-    },
-    {
-	101, 0x0065,  444, PSDRV_AGLGlyphNames +  878,
-		{   43,  -15,  395,  571 }, NULL	/* e */
-    },
-    {
-	102, 0x0066,  278, PSDRV_AGLGlyphNames +  913,
-		{   12,    0,  259,  752 }, NULL	/* f */
-    },
-    {
-	103, 0x0067,  500, PSDRV_AGLGlyphNames +  936,
-		{   45, -189,  426,  571 }, NULL	/* g */
-    },
-    {
-	104, 0x0068,  500, PSDRV_AGLGlyphNames +  954,
-		{   73,    0,  428,  750 }, NULL	/* h */
-    },
-    {
-	105, 0x0069,  222, PSDRV_AGLGlyphNames +  964,
-		{   72,    0,  151,  750 }, NULL	/* i */
-    },
-    {
-	106, 0x006a,  222, PSDRV_AGLGlyphNames +  989,
-		{   13, -190,  154,  750 }, NULL	/* j */
-    },
-    {
-	107, 0x006b,  444, PSDRV_AGLGlyphNames +  991,
-		{   69,    0,  439,  750 }, NULL	/* k */
-    },
-    {
-	108, 0x006c,  222, PSDRV_AGLGlyphNames +  995,
-		{   72,    0,  151,  750 }, NULL	/* l */
-    },
-    {
-	109, 0x006d,  778, PSDRV_AGLGlyphNames + 1016,
-		{   76,    0,  703,  571 }, NULL	/* m */
-    },
-    {
-	110, 0x006e,  500, PSDRV_AGLGlyphNames + 1027,
-		{   73,    0,  428,  571 }, NULL	/* n */
-    },
-    {
-	111, 0x006f,  500, PSDRV_AGLGlyphNames + 1044,
-		{   51,  -15,  449,  571 }, NULL	/* o */
-    },
-    {
-	112, 0x0070,  500, PSDRV_AGLGlyphNames + 1079,
-		{   72, -188,  447,  571 }, NULL	/* p */
-    },
-    {
-	113, 0x0071,  500, PSDRV_AGLGlyphNames + 1113,
-		{   55, -184,  426,  571 }, NULL	/* q */
-    },
-    {
-	114, 0x0072,  333, PSDRV_AGLGlyphNames + 1127,
-		{   81,    0,  322,  563 }, NULL	/* r */
-    },
-    {
-	115, 0x0073,  444, PSDRV_AGLGlyphNames + 1145,
-		{   43,  -15,  400,  571 }, NULL	/* s */
-    },
-    {
-	116, 0x0074,  278, PSDRV_AGLGlyphNames + 1178,
-		{    9,    0,  257,  707 }, NULL	/* t */
-    },
-    {
-	117, 0x0075,  500, PSDRV_AGLGlyphNames + 1212,
-		{   77,  -15,  424,  556 }, NULL	/* u */
-    },
-    {
-	118, 0x0076,  444, PSDRV_AGLGlyphNames + 1234,
-		{   13,    0,  431,  556 }, NULL	/* v */
-    },
-    {
-	119, 0x0077,  667, PSDRV_AGLGlyphNames + 1235,
-		{   19,    0,  649,  556 }, NULL	/* w */
-    },
-    {
-	120, 0x0078,  444, PSDRV_AGLGlyphNames + 1241,
-		{    9,    0,  436,  556 }, NULL	/* x */
-    },
-    {
-	121, 0x0079,  444, PSDRV_AGLGlyphNames + 1243,
-		{    5, -190,  425,  556 }, NULL	/* y */
-    },
-    {
-	122, 0x007a,  389, PSDRV_AGLGlyphNames + 1249,
-		{   24,    0,  366,  556 }, NULL	/* z */
-    },
-    {
-	123, 0x007b,  274, PSDRV_AGLGlyphNames +  793,
-		{    7,  -95,  266,  750 }, NULL	/* braceleft */
-    },
-    {
-	124, 0x007c,  250, PSDRV_AGLGlyphNames +  789,
-		{   93, -250,  157,  750 }, NULL	/* bar */
-    },
-    {
-	125, 0x007d,  274, PSDRV_AGLGlyphNames +  797,
-		{    8,  -95,  267,  750 }, NULL	/* braceright */
-    },
-    {
-	126, 0x007e,  500, PSDRV_AGLGlyphNames +  781,
-		{   44,  166,  457,  345 }, NULL	/* asciitilde */
-    },
-    {
-	161, 0x00a1,  333, PSDRV_AGLGlyphNames +  909,
-		{  121, -179,  212,  571 }, NULL	/* exclamdown */
-    },
-    {
-	162, 0x00a2,  500, PSDRV_AGLGlyphNames +  822,
-		{   58, -137,  418,  667 }, NULL	/* cent */
-    },
-    {
-	163, 0x00a3,  500, PSDRV_AGLGlyphNames + 1173,
-		{   30,  -15,  485,  750 }, NULL	/* sterling */
-    },
-    {
-	168, 0x00a4,  500, PSDRV_AGLGlyphNames +  843,
-		{   24,   50,  475,  553 }, NULL	/* currency */
-    },
-    {
-	165, 0x00a5,  500, PSDRV_AGLGlyphNames + 1247,
-		{  -17,    0,  518,  750 }, NULL	/* yen */
-    },
-    {
-	 -1, 0x00a6,  250, PSDRV_AGLGlyphNames +  810,
-		{   93, -175,  157,  675 }, NULL	/* brokenbar */
-    },
-    {
-	167, 0x00a7,  500, PSDRV_AGLGlyphNames + 1152,
-		{   35, -208,  466,  750 }, NULL	/* section */
-    },
-    {
-	200, 0x00a8,  333, PSDRV_AGLGlyphNames +  859,
-		{   52,  650,  281,  750 }, NULL	/* dieresis */
-    },
-    {
-	 -1, 0x00a9,  800, PSDRV_AGLGlyphNames +  840,
-		{    8,  -18,  792,  765 }, NULL	/* copyright */
-    },
-    {
-	227, 0x00aa,  300, PSDRV_AGLGlyphNames + 1071,
-		{   25,  413,  276,  765 }, NULL	/* ordfeminine */
-    },
-    {
-	171, 0x00ab,  500, PSDRV_AGLGlyphNames +  950,
-		{   85,  125,  415,  495 }, NULL	/* guillemotleft */
-    },
-    {
-	 -1, 0x00ac,  500, PSDRV_AGLGlyphNames + 1009,
-		{   44,  117,  457,  384 }, NULL	/* logicalnot */
-    },
-    {
-	 -1, 0x00ae,  800, PSDRV_AGLGlyphNames + 1135,
-		{    8,  -18,  792,  765 }, NULL	/* registered */
-    },
-    {
-	 -1, 0x00b0,  400, PSDRV_AGLGlyphNames +  856,
-		{   50,  450,  350,  750 }, NULL	/* degree */
-    },
-    {
-	 -1, 0x00b1,  500, PSDRV_AGLGlyphNames + 1106,
-		{   44,    0,  457,  505 }, NULL	/* plusminus */
-    },
-    {
-	 -1, 0x00b2,  300, PSDRV_AGLGlyphNames + 1210,
-		{   19,  300,  281,  750 }, NULL	/* twosuperior */
-    },
-    {
-	 -1, 0x00b3,  300, PSDRV_AGLGlyphNames + 1194,
-		{   17,  291,  283,  750 }, NULL	/* threesuperior */
-    },
-    {
-	194, 0x00b4,  333, PSDRV_AGLGlyphNames +  500,
-		{  100,  624,  298,  765 }, NULL	/* acute */
-    },
-    {
-	182, 0x00b6,  440, PSDRV_AGLGlyphNames + 1080,
-		{    0, -116,  391,  750 }, NULL	/* paragraph */
-    },
-    {
-	180, 0x00b7,  250, PSDRV_AGLGlyphNames + 1096,
-		{   80,  204,  171,  304 }, NULL	/* periodcentered */
-    },
-    {
-	203, 0x00b8,  333, PSDRV_AGLGlyphNames +  821,
-		{   66, -224,  281,    0 }, NULL	/* cedilla */
-    },
-    {
-	 -1, 0x00b9,  300, PSDRV_AGLGlyphNames + 1068,
-		{   67,  300,  233,  750 }, NULL	/* onesuperior */
-    },
-    {
-	235, 0x00ba,  300, PSDRV_AGLGlyphNames + 1072,
-		{   20,  413,  279,  765 }, NULL	/* ordmasculine */
-    },
-    {
-	187, 0x00bb,  500, PSDRV_AGLGlyphNames +  951,
-		{   85,  125,  415,  495 }, NULL	/* guillemotright */
-    },
-    {
-	 -1, 0x00bc,  750, PSDRV_AGLGlyphNames + 1067,
-		{   34,    0,  716,  750 }, NULL	/* onequarter */
-    },
-    {
-	 -1, 0x00bd,  750, PSDRV_AGLGlyphNames + 1064,
-		{   42,    0,  709,  750 }, NULL	/* onehalf */
-    },
-    {
-	 -1, 0x00be,  750, PSDRV_AGLGlyphNames + 1192,
-		{   21,    0,  730,  750 }, NULL	/* threequarters */
-    },
-    {
-	191, 0x00bf,  500, PSDRV_AGLGlyphNames + 1115,
-		{   38, -190,  440,  559 }, NULL	/* questiondown */
-    },
-    {
-	 -1, 0x00c0,  556, PSDRV_AGLGlyphNames +   13,
-		{   11,    0,  546,  959 }, NULL	/* Agrave */
-    },
-    {
-	 -1, 0x00c1,  556, PSDRV_AGLGlyphNames +    4,
-		{   11,    0,  546,  959 }, NULL	/* Aacute */
-    },
-    {
-	 -1, 0x00c2,  556, PSDRV_AGLGlyphNames +    7,
-		{   11,    0,  546,  959 }, NULL	/* Acircumflex */
-    },
-    {
-	 -1, 0x00c3,  556, PSDRV_AGLGlyphNames +   23,
-		{   11,    0,  546,  943 }, NULL	/* Atilde */
-    },
-    {
-	 -1, 0x00c4,  556, PSDRV_AGLGlyphNames +   11,
-		{   11,    0,  546,  944 }, NULL	/* Adieresis */
-    },
-    {
-	 -1, 0x00c5,  556, PSDRV_AGLGlyphNames +   19,
-		{   11,    0,  546,  990 }, NULL	/* Aring */
-    },
-    {
-	225, 0x00c6,  833, PSDRV_AGLGlyphNames +    1,
-		{    0,    0,  785,  750 }, NULL	/* AE */
-    },
-    {
-	 -1, 0x00c7,  556, PSDRV_AGLGlyphNames +   34,
-		{   53, -224,  503,  765 }, NULL	/* Ccedilla */
-    },
-    {
-	 -1, 0x00c8,  500, PSDRV_AGLGlyphNames +   62,
-		{   74,    0,  451,  959 }, NULL	/* Egrave */
-    },
-    {
-	 -1, 0x00c9,  500, PSDRV_AGLGlyphNames +   53,
-		{   74,    0,  451,  959 }, NULL	/* Eacute */
-    },
-    {
-	 -1, 0x00ca,  500, PSDRV_AGLGlyphNames +   57,
-		{   74,    0,  451,  959 }, NULL	/* Ecircumflex */
-    },
-    {
-	 -1, 0x00cb,  500, PSDRV_AGLGlyphNames +   59,
-		{   74,    0,  451,  944 }, NULL	/* Edieresis */
-    },
-    {
-	 -1, 0x00cc,  278, PSDRV_AGLGlyphNames +  109,
-		{    8,    0,  206,  959 }, NULL	/* Igrave */
-    },
-    {
-	 -1, 0x00cd,  278, PSDRV_AGLGlyphNames +   99,
-		{   73,    0,  271,  959 }, NULL	/* Iacute */
-    },
-    {
-	 -1, 0x00ce,  278, PSDRV_AGLGlyphNames +  102,
-		{   -6,    0,  286,  959 }, NULL	/* Icircumflex */
-    },
-    {
-	 -1, 0x00cf,  278, PSDRV_AGLGlyphNames +  104,
-		{   25,    0,  254,  944 }, NULL	/* Idieresis */
-    },
-    {
-	 -1, 0x00d0,  611, PSDRV_AGLGlyphNames +   72,
-		{    9,    0,  548,  750 }, NULL	/* Eth */
-    },
-    {
-	 -1, 0x00d1,  611, PSDRV_AGLGlyphNames +  145,
-		{   77,    0,  534,  943 }, NULL	/* Ntilde */
-    },
-    {
-	 -1, 0x00d2,  611, PSDRV_AGLGlyphNames +  159,
-		{   59,  -18,  553,  959 }, NULL	/* Ograve */
-    },
-    {
-	 -1, 0x00d3,  611, PSDRV_AGLGlyphNames +  151,
-		{   59,  -18,  553,  959 }, NULL	/* Oacute */
-    },
-    {
-	 -1, 0x00d4,  611, PSDRV_AGLGlyphNames +  154,
-		{   59,  -18,  553,  959 }, NULL	/* Ocircumflex */
-    },
-    {
-	 -1, 0x00d5,  611, PSDRV_AGLGlyphNames +  172,
-		{   59,  -18,  553,  943 }, NULL	/* Otilde */
-    },
-    {
-	 -1, 0x00d6,  611, PSDRV_AGLGlyphNames +  156,
-		{   59,  -18,  553,  944 }, NULL	/* Odieresis */
-    },
-    {
-	 -1, 0x00d7,  500, PSDRV_AGLGlyphNames + 1024,
-		{   44,   48,  457,  461 }, NULL	/* multiply */
-    },
-    {
-	233, 0x00d8,  611, PSDRV_AGLGlyphNames +  168,
-		{   29,  -43,  573,  796 }, NULL	/* Oslash */
-    },
-    {
-	 -1, 0x00d9,  611, PSDRV_AGLGlyphNames +  256,
-		{   81,  -18,  531,  959 }, NULL	/* Ugrave */
-    },
-    {
-	 -1, 0x00da,  611, PSDRV_AGLGlyphNames +  249,
-		{   81,  -18,  531,  959 }, NULL	/* Uacute */
-    },
-    {
-	 -1, 0x00db,  611, PSDRV_AGLGlyphNames +  252,
-		{   81,  -18,  531,  959 }, NULL	/* Ucircumflex */
-    },
-    {
-	 -1, 0x00dc,  611, PSDRV_AGLGlyphNames +  254,
-		{   81,  -18,  531,  944 }, NULL	/* Udieresis */
-    },
-    {
-	 -1, 0x00dd,  556, PSDRV_AGLGlyphNames +  281,
-		{   11,    0,  546,  959 }, NULL	/* Yacute */
-    },
-    {
-	 -1, 0x00de,  556, PSDRV_AGLGlyphNames +  244,
-		{   86,    0,  519,  750 }, NULL	/* Thorn */
-    },
-    {
-	251, 0x00df,  500, PSDRV_AGLGlyphNames +  943,
-		{   71,   -5,  445,  765 }, NULL	/* germandbls */
-    },
-    {
-	 -1, 0x00e0,  444, PSDRV_AGLGlyphNames +  750,
-		{   31,  -15,  417,  765 }, NULL	/* agrave */
-    },
-    {
-	 -1, 0x00e1,  444, PSDRV_AGLGlyphNames +  497,
-		{   31,  -15,  417,  765 }, NULL	/* aacute */
-    },
-    {
-	 -1, 0x00e2,  444, PSDRV_AGLGlyphNames +  499,
-		{   31,  -15,  417,  765 }, NULL	/* acircumflex */
-    },
-    {
-	 -1, 0x00e3,  444, PSDRV_AGLGlyphNames +  786,
-		{   31,  -15,  417,  749 }, NULL	/* atilde */
-    },
-    {
-	 -1, 0x00e4,  444, PSDRV_AGLGlyphNames +  502,
-		{   31,  -15,  417,  750 }, NULL	/* adieresis */
-    },
-    {
-	 -1, 0x00e5,  444, PSDRV_AGLGlyphNames +  764,
-		{   31,  -15,  417,  826 }, NULL	/* aring */
-    },
-    {
-	241, 0x00e6,  667, PSDRV_AGLGlyphNames +  503,
-		{   26,  -15,  630,  571 }, NULL	/* ae */
-    },
-    {
-	 -1, 0x00e7,  444, PSDRV_AGLGlyphNames +  818,
-		{   44, -224,  405,  571 }, NULL	/* ccedilla */
-    },
-    {
-	 -1, 0x00e8,  444, PSDRV_AGLGlyphNames +  885,
-		{   43,  -15,  395,  765 }, NULL	/* egrave */
-    },
-    {
-	 -1, 0x00e9,  444, PSDRV_AGLGlyphNames +  879,
-		{   43,  -15,  395,  765 }, NULL	/* eacute */
-    },
-    {
-	 -1, 0x00ea,  444, PSDRV_AGLGlyphNames +  882,
-		{   43,  -15,  395,  765 }, NULL	/* ecircumflex */
-    },
-    {
-	 -1, 0x00eb,  444, PSDRV_AGLGlyphNames +  883,
-		{   43,  -15,  395,  750 }, NULL	/* edieresis */
-    },
-    {
-	 -1, 0x00ec,  222, PSDRV_AGLGlyphNames +  969,
-		{  -20,    0,  178,  765 }, NULL	/* igrave */
-    },
-    {
-	 -1, 0x00ed,  222, PSDRV_AGLGlyphNames +  965,
-		{   45,    0,  243,  765 }, NULL	/* iacute */
-    },
-    {
-	 -1, 0x00ee,  222, PSDRV_AGLGlyphNames +  967,
-		{  -34,    0,  258,  765 }, NULL	/* icircumflex */
-    },
-    {
-	 -1, 0x00ef,  222, PSDRV_AGLGlyphNames +  968,
-		{   -3,    0,  226,  750 }, NULL	/* idieresis */
-    },
-    {
-	 -1, 0x00f0,  500, PSDRV_AGLGlyphNames +  906,
-		{   51,  -15,  449,  831 }, NULL	/* eth */
-    },
-    {
-	 -1, 0x00f1,  500, PSDRV_AGLGlyphNames + 1041,
-		{   73,    0,  428,  749 }, NULL	/* ntilde */
-    },
-    {
-	 -1, 0x00f2,  500, PSDRV_AGLGlyphNames + 1051,
-		{   51,  -15,  449,  765 }, NULL	/* ograve */
-    },
-    {
-	 -1, 0x00f3,  500, PSDRV_AGLGlyphNames + 1045,
-		{   51,  -15,  449,  765 }, NULL	/* oacute */
-    },
-    {
-	 -1, 0x00f4,  500, PSDRV_AGLGlyphNames + 1047,
-		{   51,  -15,  449,  765 }, NULL	/* ocircumflex */
-    },
-    {
-	 -1, 0x00f5,  500, PSDRV_AGLGlyphNames + 1077,
-		{   51,  -15,  449,  749 }, NULL	/* otilde */
-    },
-    {
-	 -1, 0x00f6,  500, PSDRV_AGLGlyphNames + 1048,
-		{   51,  -15,  449,  750 }, NULL	/* odieresis */
-    },
-    {
-	 -1, 0x00f7,  500, PSDRV_AGLGlyphNames +  863,
-		{   44,    3,  457,  505 }, NULL	/* divide */
-    },
-    {
-	249, 0x00f8,  500, PSDRV_AGLGlyphNames + 1074,
-		{   25,  -46,  472,  582 }, NULL	/* oslash */
-    },
-    {
-	 -1, 0x00f9,  500, PSDRV_AGLGlyphNames + 1217,
-		{   77,  -15,  424,  765 }, NULL	/* ugrave */
-    },
-    {
-	 -1, 0x00fa,  500, PSDRV_AGLGlyphNames + 1213,
-		{   77,  -15,  424,  765 }, NULL	/* uacute */
-    },
-    {
-	 -1, 0x00fb,  500, PSDRV_AGLGlyphNames + 1215,
-		{   77,  -15,  424,  765 }, NULL	/* ucircumflex */
-    },
-    {
-	 -1, 0x00fc,  500, PSDRV_AGLGlyphNames + 1216,
-		{   77,  -15,  424,  750 }, NULL	/* udieresis */
-    },
-    {
-	 -1, 0x00fd,  444, PSDRV_AGLGlyphNames + 1244,
-		{    5, -190,  425,  765 }, NULL	/* yacute */
-    },
-    {
-	 -1, 0x00fe,  500, PSDRV_AGLGlyphNames + 1187,
-		{   72, -188,  447,  750 }, NULL	/* thorn */
-    },
-    {
-	 -1, 0x00ff,  444, PSDRV_AGLGlyphNames + 1246,
-		{    5, -190,  425,  750 }, NULL	/* ydieresis */
-    },
-    {
-	245, 0x0131,  222, PSDRV_AGLGlyphNames +  873,
-		{   72,    0,  151,  556 }, NULL	/* dotlessi */
-    },
-    {
-	232, 0x0141,  500, PSDRV_AGLGlyphNames +  132,
-		{  -13,    0,  472,  750 }, NULL	/* Lslash */
-    },
-    {
-	248, 0x0142,  222, PSDRV_AGLGlyphNames + 1013,
-		{   -8,    0,  231,  750 }, NULL	/* lslash */
-    },
-    {
-	234, 0x0152,  833, PSDRV_AGLGlyphNames +  149,
-		{   56,  -18,  787,  765 }, NULL	/* OE */
-    },
-    {
-	250, 0x0153,  722, PSDRV_AGLGlyphNames + 1049,
-		{   40,  -15,  676,  571 }, NULL	/* oe */
-    },
-    {
-	 -1, 0x0160,  556, PSDRV_AGLGlyphNames +  231,
-		{   51,  -18,  505,  959 }, NULL	/* Scaron */
-    },
-    {
-	 -1, 0x0161,  444, PSDRV_AGLGlyphNames + 1147,
-		{   43,  -15,  400,  765 }, NULL	/* scaron */
-    },
-    {
-	 -1, 0x0178,  556, PSDRV_AGLGlyphNames +  284,
-		{   11,    0,  546,  944 }, NULL	/* Ydieresis */
-    },
-    {
-	 -1, 0x017d,  500, PSDRV_AGLGlyphNames +  290,
-		{   28,    0,  473,  959 }, NULL	/* Zcaron */
-    },
-    {
-	 -1, 0x017e,  389, PSDRV_AGLGlyphNames + 1251,
-		{   24,    0,  366,  765 }, NULL	/* zcaron */
-    },
-    {
-	166, 0x0192,  500, PSDRV_AGLGlyphNames +  928,
-		{   10, -192,  488,  750 }, NULL	/* florin */
-    },
-    {
-	195, 0x02c6,  333, PSDRV_AGLGlyphNames +  831,
-		{   21,  624,  313,  765 }, NULL	/* circumflex */
-    },
-    {
-	207, 0x02c7,  333, PSDRV_AGLGlyphNames +  815,
-		{   21,  624,  313,  765 }, NULL	/* caron */
-    },
-    {
-	197, 0x02c9,  333, PSDRV_AGLGlyphNames + 1017,
-		{   10,  657,  323,  715 }, NULL	/* macron */
-    },
-    {
-	198, 0x02d8,  333, PSDRV_AGLGlyphNames +  809,
-		{   12,  629,  321,  765 }, NULL	/* breve */
-    },
-    {
-	199, 0x02d9,  250, PSDRV_AGLGlyphNames +  871,
-		{   86,  650,  165,  750 }, NULL	/* dotaccent */
-    },
-    {
-	202, 0x02da,  250, PSDRV_AGLGlyphNames + 1141,
-		{   23,  593,  227,  796 }, NULL	/* ring */
-    },
-    {
-	206, 0x02db,  333, PSDRV_AGLGlyphNames + 1050,
-		{    0, -191,  208,   13 }, NULL	/* ogonek */
-    },
-    {
-	196, 0x02dc,  333, PSDRV_AGLGlyphNames + 1195,
-		{   -3,  633,  337,  749 }, NULL	/* tilde */
-    },
-    {
-	205, 0x02dd,  333, PSDRV_AGLGlyphNames +  960,
-		{   61,  624,  440,  765 }, NULL	/* hungarumlaut */
-    },
-    {
-	 -1, 0x03bc,  500, PSDRV_AGLGlyphNames + 1023,
-		{   75, -189,  422,  556 }, NULL	/* mu */
-    },
-    {
-	177, 0x2013,  500, PSDRV_AGLGlyphNames +  895,
-		{    0,  275,  500,  345 }, NULL	/* endash */
-    },
-    {
-	208, 0x2014, 1000, PSDRV_AGLGlyphNames +  893,
-		{    0,  275, 1000,  345 }, NULL	/* emdash */
-    },
-    {
-	 96, 0x2018,  222, PSDRV_AGLGlyphNames + 1122,
-		{   64,  521,  158,  767 }, NULL	/* quoteleft */
-    },
-    {
-	 39, 0x2019,  222, PSDRV_AGLGlyphNames + 1124,
-		{   64,  504,  158,  750 }, NULL	/* quoteright */
-    },
-    {
-	184, 0x201a,  222, PSDRV_AGLGlyphNames + 1125,
-		{   64, -146,  158,  100 }, NULL	/* quotesinglbase */
-    },
-    {
-	170, 0x201c,  389, PSDRV_AGLGlyphNames + 1120,
-		{   62,  521,  327,  767 }, NULL	/* quotedblleft */
-    },
-    {
-	186, 0x201d,  389, PSDRV_AGLGlyphNames + 1121,
-		{   62,  504,  327,  750 }, NULL	/* quotedblright */
-    },
-    {
-	185, 0x201e,  389, PSDRV_AGLGlyphNames + 1119,
-		{   62, -146,  327,  100 }, NULL	/* quotedblbase */
-    },
-    {
-	178, 0x2020,  500, PSDRV_AGLGlyphNames +  849,
-		{   40, -176,  461,  750 }, NULL	/* dagger */
-    },
-    {
-	179, 0x2021,  500, PSDRV_AGLGlyphNames +  850,
-		{   39, -176,  462,  750 }, NULL	/* daggerdbl */
-    },
-    {
-	183, 0x2022,  333, PSDRV_AGLGlyphNames +  812,
-		{   15,  222,  318,  529 }, NULL	/* bullet */
-    },
-    {
-	188, 0x2026, 1000, PSDRV_AGLGlyphNames +  891,
-		{  121,    0,  878,  100 }, NULL	/* ellipsis */
-    },
-    {
-	189, 0x2030, 1111, PSDRV_AGLGlyphNames + 1100,
-		{   47,  -16, 1071,  750 }, NULL	/* perthousand */
-    },
-    {
-	172, 0x2039,  278, PSDRV_AGLGlyphNames +  952,
-		{   64,  125,  215,  495 }, NULL	/* guilsinglleft */
-    },
-    {
-	173, 0x203a,  278, PSDRV_AGLGlyphNames +  953,
-		{   63,  125,  214,  495 }, NULL	/* guilsinglright */
-    },
-    {
-	 -1, 0x2122,  750, PSDRV_AGLGlyphNames + 1198,
-		{    0,  329,  719,  750 }, NULL	/* trademark */
-    },
-    {
-	 -1, 0x2212,  500, PSDRV_AGLGlyphNames + 1020,
-		{   44,  219,  457,  289 }, NULL	/* minus */
-    },
-    {
-	164, 0x2215,  167, PSDRV_AGLGlyphNames +  934,
-		{ -174,    0,  341,  750 }, NULL	/* fraction */
-    },
-    {
-	174, 0xfb01,  500, PSDRV_AGLGlyphNames +  918,
-		{   12,    0,  427,  752 }, NULL	/* fi */
-    },
-    {
-	175, 0xfb02,  500, PSDRV_AGLGlyphNames +  927,
-		{   12,    0,  425,  752 }, NULL	/* fl */
-    }
-};
-
-
-/*
- *  Font metrics
- */
-
-AFM PSDRV_Helvetica_Condensed =
-{
-    "Helvetica-Condensed",			/* FontName */
-    "Helvetica Condensed Medium",		/* FullName */
-    "Helvetica",				/* FamilyName */
-    "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
-    0,						/* ItalicAngle */
-    FALSE,					/* IsFixedPitch */
-    -100,					/* UnderlinePosition */
-    50,						/* UnderlineThickness */
-    { -174, -250, 1071, 990 },			/* FontBBox */
-    750,					/* CapHeight */
-    556,					/* XHeight */
-    750,					/* Ascender */
-    -188,					/* Descender */
-    990,					/* FullAscender */
-    {
-	1000,				/* WinMetrics.usUnitsPerEm */
-	990,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	750,				/* WinMetrics.sTypoAscender */
-	-187,				/* WinMetrics.sTypoDescender */
-	263,				/* WinMetrics.sTypoLineGap */
-	990,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
-    },
-    {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[10] - CharWidths[19] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[20] - CharWidths[29] */
-	0, 0, 250, 333, 250, 500, 500, 	/* CharWidths[30] - CharWidths[36] */
-	833, 667, 250, 333, 333, 500, 	/* CharWidths[37] - CharWidths[42] */
-	500, 250, 333, 250, 278, 500, 	/* CharWidths[43] - CharWidths[48] */
-	500, 500, 500, 500, 500, 500, 	/* CharWidths[49] - CharWidths[54] */
-	500, 500, 500, 250, 250, 500, 	/* CharWidths[55] - CharWidths[60] */
-	500, 500, 500, 800, 556, 556, 	/* CharWidths[61] - CharWidths[66] */
-	556, 611, 500, 444, 611, 611, 	/* CharWidths[67] - CharWidths[72] */
-	278, 444, 556, 500, 778, 611, 	/* CharWidths[73] - CharWidths[78] */
-	611, 556, 611, 611, 556, 500, 	/* CharWidths[79] - CharWidths[84] */
-	611, 556, 833, 556, 556, 500, 	/* CharWidths[85] - CharWidths[90] */
-	333, 250, 333, 500, 500, 333, 	/* CharWidths[91] - CharWidths[96] */
-	444, 500, 444, 500, 444, 278, 	/* CharWidths[97] - CharWidths[102] */
-	500, 500, 222, 222, 444, 222, 	/* CharWidths[103] - CharWidths[108] */
-	778, 500, 500, 500, 500, 333, 	/* CharWidths[109] - CharWidths[114] */
-	444, 278, 500, 444, 667, 444, 	/* CharWidths[115] - CharWidths[120] */
-	444, 389, 274, 250, 274, 500, 	/* CharWidths[121] - CharWidths[126] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[127] - CharWidths[136] */
-	0, 0, 0, 0, 0, 0, 0, 0, 222, 	/* CharWidths[137] - CharWidths[145] */
-	222, 389, 389, 333, 500, 1000, 	/* CharWidths[146] - CharWidths[151] */
-	0, 0, 0, 0, 0, 0, 0, 0, 250, 	/* CharWidths[152] - CharWidths[160] */
-	333, 500, 500, 500, 500, 250, 	/* CharWidths[161] - CharWidths[166] */
-	500, 333, 800, 389, 500, 500, 	/* CharWidths[167] - CharWidths[172] */
-	333, 800, 333, 400, 500, 300, 	/* CharWidths[173] - CharWidths[178] */
-	300, 333, 0, 440, 250, 333, 	/* CharWidths[179] - CharWidths[184] */
-	300, 389, 500, 750, 750, 750, 	/* CharWidths[185] - CharWidths[190] */
-	500, 0, 333, 333, 333, 333, 	/* CharWidths[191] - CharWidths[196] */
-	333, 333, 250, 333, 0, 250, 	/* CharWidths[197] - CharWidths[202] */
-	333, 0, 333, 333, 333, 1000, 	/* CharWidths[203] - CharWidths[208] */
-	0, 0, 0, 0, 0, 0, 500, 0, 0, 	/* CharWidths[209] - CharWidths[217] */
-	0, 0, 0, 0, 0, 0, 0, 833, 0, 	/* CharWidths[218] - CharWidths[226] */
-	300, 0, 0, 0, 0, 500, 611, 	/* CharWidths[227] - CharWidths[233] */
-	833, 300, 0, 0, 0, 0, 0, 667, 	/* CharWidths[234] - CharWidths[241] */
-	0, 0, 0, 222, 0, 500, 222, 	/* CharWidths[242] - CharWidths[248] */
-	500, 722, 500, 0, 0, 0, 0	/* CharWidths[249] - CharWidths[255] */
-    },
-    228,					/* NumofMetrics */
-    met_Helvetica_Condensed,			/* Metrics */
-    &PSDRV_AdobeGlyphList			/* Encoding */
-};
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed_Bold.c ./dlls/wineps/data/Helvetica_Condensed_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed_Bold.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Condensed_Bold.c	Wed Dec 31 18:00:00 1969
@@ -1,1015 +0,0 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica Condensed Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	This data is derived from the Adobe Font Metrics files at
- *
- *	    ftp://ftp.adobe.com/pub/adobe/type/win/all/afmfiles/base35/
- *
- *	which are Copyright 1985-1992 Adobe Systems Incorporated.
- *
- */
-
-#include "psdrv.h"
-
-
-/*
- *  Glyph metrics
- */
-
-static AFMMETRICS met_Helvetica_Condensed_Bold[228] = 
-{
-    {
-	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
-		{    0,    0,    0,    0 }, NULL	/* space */
-    },
-    {
-	 33, 0x0021,  333, PSDRV_AGLGlyphNames +  907,
-		{  101,    0,  232,  750 }, NULL	/* exclam */
-    },
-    {
-	 34, 0x0022,  333, PSDRV_AGLGlyphNames + 1118,
-		{   16,  468,  318,  739 }, NULL	/* quotedbl */
-    },
-    {
-	 35, 0x0023,  500, PSDRV_AGLGlyphNames + 1043,
-		{   31,    0,  469,  738 }, NULL	/* numbersign */
-    },
-    {
-	 36, 0x0024,  500, PSDRV_AGLGlyphNames +  866,
-		{   35, -124,  466,  803 }, NULL	/* dollar */
-    },
-    {
-	 37, 0x0025,  833, PSDRV_AGLGlyphNames + 1094,
-		{   31,  -15,  803,  750 }, NULL	/* percent */
-    },
-    {
-	 38, 0x0026,  667, PSDRV_AGLGlyphNames +  755,
-		{   63,  -18,  615,  768 }, NULL	/* ampersand */
-    },
-    {
-	169, 0x0027,  250, PSDRV_AGLGlyphNames + 1126,
-		{   66,  468,  185,  739 }, NULL	/* quotesingle */
-    },
-    {
-	 40, 0x0028,  333, PSDRV_AGLGlyphNames + 1081,
-		{   52, -198,  281,  768 }, NULL	/* parenleft */
-    },
-    {
-	 41, 0x0029,  333, PSDRV_AGLGlyphNames + 1087,
-		{   52, -198,  281,  768 }, NULL	/* parenright */
-    },
-    {
-	 42, 0x002a,  500, PSDRV_AGLGlyphNames +  782,
-		{   79,  412,  422,  738 }, NULL	/* asterisk */
-    },
-    {
-	 43, 0x002b,  500, PSDRV_AGLGlyphNames + 1105,
-		{   26,    0,  475,  492 }, NULL	/* plus */
-    },
-    {
-	 44, 0x002c,  333, PSDRV_AGLGlyphNames +  835,
-		{  101, -145,  233,  132 }, NULL	/* comma */
-    },
-    {
-	 45, 0x002d,  333, PSDRV_AGLGlyphNames +  961,
-		{   48,  255,  286,  370 }, NULL	/* hyphen */
-    },
-    {
-	 46, 0x002e,  333, PSDRV_AGLGlyphNames + 1095,
-		{  101,    0,  233,  132 }, NULL	/* period */
-    },
-    {
-	 47, 0x002f,  278, PSDRV_AGLGlyphNames + 1167,
-		{  -11,  -94,  312,  750 }, NULL	/* slash */
-    },
-    {
-	 48, 0x0030,  500, PSDRV_AGLGlyphNames + 1253,
-		{   48,  -15,  453,  753 }, NULL	/* zero */
-    },
-    {
-	 49, 0x0031,  500, PSDRV_AGLGlyphNames + 1060,
-		{   44,    0,  353,  750 }, NULL	/* one */
-    },
-    {
-	 50, 0x0032,  500, PSDRV_AGLGlyphNames + 1206,
-		{   32,    0,  453,  753 }, NULL	/* two */
-    },
-    {
-	 51, 0x0033,  500, PSDRV_AGLGlyphNames + 1188,
-		{   28,  -15,  453,  753 }, NULL	/* three */
-    },
-    {
-	 52, 0x0034,  500, PSDRV_AGLGlyphNames +  930,
-		{   23,    0,  470,  738 }, NULL	/* four */
-    },
-    {
-	 53, 0x0035,  500, PSDRV_AGLGlyphNames +  922,
-		{   37,  -15,  458,  738 }, NULL	/* five */
-    },
-    {
-	 54, 0x0036,  500, PSDRV_AGLGlyphNames + 1163,
-		{   42,  -15,  459,  753 }, NULL	/* six */
-    },
-    {
-	 55, 0x0037,  500, PSDRV_AGLGlyphNames + 1154,
-		{   32,    0,  454,  738 }, NULL	/* seven */
-    },
-    {
-	 56, 0x0038,  500, PSDRV_AGLGlyphNames +  886,
-		{   41,  -15,  460,  753 }, NULL	/* eight */
-    },
-    {
-	 57, 0x0039,  500, PSDRV_AGLGlyphNames + 1032,
-		{   42,  -15,  459,  753 }, NULL	/* nine */
-    },
-    {
-	 58, 0x003a,  278, PSDRV_AGLGlyphNames +  833,
-		{   73,    0,  205,  556 }, NULL	/* colon */
-    },
-    {
-	 59, 0x003b,  278, PSDRV_AGLGlyphNames + 1153,
-		{   73, -145,  205,  556 }, NULL	/* semicolon */
-    },
-    {
-	 60, 0x003c,  500, PSDRV_AGLGlyphNames + 1003,
-		{   42,  -24,  459,  527 }, NULL	/* less */
-    },
-    {
-	 61, 0x003d,  500, PSDRV_AGLGlyphNames +  900,
-		{   26,   96,  475,  401 }, NULL	/* equal */
-    },
-    {
-	 62, 0x003e,  500, PSDRV_AGLGlyphNames +  948,
-		{   42,  -24,  459,  527 }, NULL	/* greater */
-    },
-    {
-	 63, 0x003f,  500, PSDRV_AGLGlyphNames + 1114,
-		{   51,    0,  440,  768 }, NULL	/* question */
-    },
-    {
-	 64, 0x0040,  833, PSDRV_AGLGlyphNames +  785,
-		{   38,  -18,  795,  768 }, NULL	/* at */
-    },
-    {
-	 65, 0x0041,  556, PSDRV_AGLGlyphNames +    0,
-		{    9,    0,  547,  750 }, NULL	/* A */
-    },
-    {
-	 66, 0x0042,  556, PSDRV_AGLGlyphNames +   25,
-		{   65,    0,  506,  750 }, NULL	/* B */
-    },
-    {
-	 67, 0x0043,  556, PSDRV_AGLGlyphNames +   29,
-		{   55,  -18,  512,  768 }, NULL	/* C */
-    },
-    {
-	 68, 0x0044,  611, PSDRV_AGLGlyphNames +   42,
-		{   72,    0,  550,  750 }, NULL	/* D */
-    },
-    {
-	 69, 0x0045,  500, PSDRV_AGLGlyphNames +   52,
-		{   64,    0,  458,  750 }, NULL	/* E */
-    },
-    {
-	 70, 0x0046,  500, PSDRV_AGLGlyphNames +   75,
-		{   73,    0,  470,  750 }, NULL	/* F */
-    },
-    {
-	 71, 0x0047,  611, PSDRV_AGLGlyphNames +   77,
-		{   55,  -18,  542,  768 }, NULL	/* G */
-    },
-    {
-	 72, 0x0048,  611, PSDRV_AGLGlyphNames +   87,
-		{   68,    0,  544,  750 }, NULL	/* H */
-    },
-    {
-	 73, 0x0049,  278, PSDRV_AGLGlyphNames +   97,
-		{   69,    0,  209,  750 }, NULL	/* I */
-    },
-    {
-	 74, 0x004a,  444, PSDRV_AGLGlyphNames +  118,
-		{    7,  -18,  384,  750 }, NULL	/* J */
-    },
-    {
-	 75, 0x004b,  556, PSDRV_AGLGlyphNames +  121,
-		{   68,    0,  547,  750 }, NULL	/* K */
-    },
-    {
-	 76, 0x004c,  500, PSDRV_AGLGlyphNames +  125,
-		{   68,    0,  468,  750 }, NULL	/* L */
-    },
-    {
-	 77, 0x004d,  778, PSDRV_AGLGlyphNames +  135,
-		{   67,    0,  712,  750 }, NULL	/* M */
-    },
-    {
-	 78, 0x004e,  611, PSDRV_AGLGlyphNames +  140,
-		{   68,    0,  543,  750 }, NULL	/* N */
-    },
-    {
-	 79, 0x004f,  611, PSDRV_AGLGlyphNames +  148,
-		{   61,  -18,  551,  768 }, NULL	/* O */
-    },
-    {
-	 80, 0x0050,  556, PSDRV_AGLGlyphNames +  174,
-		{   68,    0,  529,  750 }, NULL	/* P */
-    },
-    {
-	 81, 0x0051,  611, PSDRV_AGLGlyphNames +  179,
-		{   61,  -71,  587,  768 }, NULL	/* Q */
-    },
-    {
-	 82, 0x0052,  611, PSDRV_AGLGlyphNames +  181,
-		{   66,    0,  567,  750 }, NULL	/* R */
-    },
-    {
-	 83, 0x0053,  556, PSDRV_AGLGlyphNames +  189,
-		{   49,  -18,  508,  768 }, NULL	/* S */
-    },
-    {
-	 84, 0x0054,  500, PSDRV_AGLGlyphNames +  238,
-		{   17,    0,  484,  750 }, NULL	/* T */
-    },
-    {
-	 85, 0x0055,  611, PSDRV_AGLGlyphNames +  248,
-		{   68,  -18,  544,  750 }, NULL	/* U */
-    },
-    {
-	 86, 0x0056,  556, PSDRV_AGLGlyphNames +  269,
-		{   21,    0,  536,  750 }, NULL	/* V */
-    },
-    {
-	 87, 0x0057,  833, PSDRV_AGLGlyphNames +  271,
-		{   24,    0,  810,  750 }, NULL	/* W */
-    },
-    {
-	 88, 0x0058,  556, PSDRV_AGLGlyphNames +  277,
-		{   11,    0,  545,  750 }, NULL	/* X */
-    },
-    {
-	 89, 0x0059,  556, PSDRV_AGLGlyphNames +  280,
-		{   12,    0,  545,  750 }, NULL	/* Y */
-    },
-    {
-	 90, 0x005a,  500, PSDRV_AGLGlyphNames +  288,
-		{   33,    0,  468,  750 }, NULL	/* Z */
-    },
-    {
-	 91, 0x005b,  333, PSDRV_AGLGlyphNames +  801,
-		{   81,  -94,  280,  750 }, NULL	/* bracketleft */
-    },
-    {
-	 92, 0x005c,  250, PSDRV_AGLGlyphNames +  788,
-		{  -89,    0,  340,  750 }, NULL	/* backslash */
-    },
-    {
-	 93, 0x005d,  333, PSDRV_AGLGlyphNames +  805,
-		{   53,  -94,  252,  750 }, NULL	/* bracketright */
-    },
-    {
-	 94, 0x005e,  500, PSDRV_AGLGlyphNames +  780,
-		{   10,  326,  490,  750 }, NULL	/* asciicircum */
-    },
-    {
-	 95, 0x005f,  500, PSDRV_AGLGlyphNames + 1221,
-		{    0, -125,  500,  -75 }, NULL	/* underscore */
-    },
-    {
-	193, 0x0060,  333, PSDRV_AGLGlyphNames +  945,
-		{    1,  629,  250,  775 }, NULL	/* grave */
-    },
-    {
-	 97, 0x0061,  500, PSDRV_AGLGlyphNames +  295,
-		{   42,  -15,  440,  579 }, NULL	/* a */
-    },
-    {
-	 98, 0x0062,  500, PSDRV_AGLGlyphNames +  787,
-		{   64,  -15,  444,  750 }, NULL	/* b */
-    },
-    {
-	 99, 0x0063,  444, PSDRV_AGLGlyphNames +  813,
-		{   49,  -15,  403,  579 }, NULL	/* c */
-    },
-    {
-	100, 0x0064,  500, PSDRV_AGLGlyphNames +  848,
-		{   53,  -15,  433,  750 }, NULL	/* d */
-    },
-    {
-	101, 0x0065,  500, PSDRV_AGLGlyphNames +  878,
-		{   53,  -15,  443,  579 }, NULL	/* e */
-    },
-    {
-	102, 0x0066,  278, PSDRV_AGLGlyphNames +  913,
-		{   21,    0,  257,  750 }, NULL	/* f */
-    },
-    {
-	103, 0x0067,  500, PSDRV_AGLGlyphNames +  936,
-		{   53, -190,  433,  579 }, NULL	/* g */
-    },
-    {
-	104, 0x0068,  500, PSDRV_AGLGlyphNames +  954,
-		{   61,    0,  440,  750 }, NULL	/* h */
-    },
-    {
-	105, 0x0069,  278, PSDRV_AGLGlyphNames +  964,
-		{   74,    0,  204,  750 }, NULL	/* i */
-    },
-    {
-	106, 0x006a,  278, PSDRV_AGLGlyphNames +  989,
-		{   31, -192,  210,  750 }, NULL	/* j */
-    },
-    {
-	107, 0x006b,  444, PSDRV_AGLGlyphNames +  991,
-		{   48,    0,  443,  750 }, NULL	/* k */
-    },
-    {
-	108, 0x006c,  278, PSDRV_AGLGlyphNames +  995,
-		{   74,    0,  204,  750 }, NULL	/* l */
-    },
-    {
-	109, 0x006d,  778, PSDRV_AGLGlyphNames + 1016,
-		{   66,    0,  712,  579 }, NULL	/* m */
-    },
-    {
-	110, 0x006e,  500, PSDRV_AGLGlyphNames + 1027,
-		{   61,    0,  440,  579 }, NULL	/* n */
-    },
-    {
-	111, 0x006f,  500, PSDRV_AGLGlyphNames + 1044,
-		{   53,  -15,  447,  579 }, NULL	/* o */
-    },
-    {
-	112, 0x0070,  500, PSDRV_AGLGlyphNames + 1079,
-		{   58, -189,  438,  579 }, NULL	/* p */
-    },
-    {
-	113, 0x0071,  500, PSDRV_AGLGlyphNames + 1113,
-		{   50, -188,  430,  579 }, NULL	/* q */
-    },
-    {
-	114, 0x0072,  333, PSDRV_AGLGlyphNames + 1127,
-		{   60,    0,  319,  574 }, NULL	/* r */
-    },
-    {
-	115, 0x0073,  444, PSDRV_AGLGlyphNames + 1145,
-		{   28,  -15,  407,  579 }, NULL	/* s */
-    },
-    {
-	116, 0x0074,  278, PSDRV_AGLGlyphNames + 1178,
-		{   14,   -7,  252,  719 }, NULL	/* t */
-    },
-    {
-	117, 0x0075,  500, PSDRV_AGLGlyphNames + 1212,
-		{   58,  -15,  431,  564 }, NULL	/* u */
-    },
-    {
-	118, 0x0076,  444, PSDRV_AGLGlyphNames + 1234,
-		{   10,    0,  434,  564 }, NULL	/* v */
-    },
-    {
-	119, 0x0077,  667, PSDRV_AGLGlyphNames + 1235,
-		{   11,    0,  645,  564 }, NULL	/* w */
-    },
-    {
-	120, 0x0078,  444, PSDRV_AGLGlyphNames + 1241,
-		{    8,    0,  436,  564 }, NULL	/* x */
-    },
-    {
-	121, 0x0079,  444, PSDRV_AGLGlyphNames + 1243,
-		{    5, -195,  429,  564 }, NULL	/* y */
-    },
-    {
-	122, 0x007a,  389, PSDRV_AGLGlyphNames + 1249,
-		{   23,    0,  367,  564 }, NULL	/* z */
-    },
-    {
-	123, 0x007b,  274, PSDRV_AGLGlyphNames +  793,
-		{  -32,  -92,  240,  750 }, NULL	/* braceleft */
-    },
-    {
-	124, 0x007c,  250, PSDRV_AGLGlyphNames +  789,
-		{   75, -250,  175,  750 }, NULL	/* bar */
-    },
-    {
-	125, 0x007d,  274, PSDRV_AGLGlyphNames +  797,
-		{   34,  -94,  306,  750 }, NULL	/* braceright */
-    },
-    {
-	126, 0x007e,  500, PSDRV_AGLGlyphNames +  781,
-		{   26,  153,  475,  359 }, NULL	/* asciitilde */
-    },
-    {
-	161, 0x00a1,  333, PSDRV_AGLGlyphNames +  909,
-		{  102, -170,  232,  579 }, NULL	/* exclamdown */
-    },
-    {
-	162, 0x00a2,  500, PSDRV_AGLGlyphNames +  822,
-		{   72, -122,  428,  671 }, NULL	/* cent */
-    },
-    {
-	163, 0x00a3,  500, PSDRV_AGLGlyphNames + 1173,
-		{   35,  -15,  487,  768 }, NULL	/* sterling */
-    },
-    {
-	168, 0x00a4,  500, PSDRV_AGLGlyphNames +  843,
-		{    9,   58,  492,  560 }, NULL	/* currency */
-    },
-    {
-	165, 0x00a5,  500, PSDRV_AGLGlyphNames + 1247,
-		{  -18,    0,  518,  750 }, NULL	/* yen */
-    },
-    {
-	 -1, 0x00a6,  250, PSDRV_AGLGlyphNames +  810,
-		{   75, -175,  175,  675 }, NULL	/* brokenbar */
-    },
-    {
-	167, 0x00a7,  500, PSDRV_AGLGlyphNames + 1152,
-		{   37, -183,  463,  768 }, NULL	/* section */
-    },
-    {
-	200, 0x00a8,  333, PSDRV_AGLGlyphNames +  859,
-		{    5,  644,  328,  759 }, NULL	/* dieresis */
-    },
-    {
-	 -1, 0x00a9,  830, PSDRV_AGLGlyphNames +  840,
-		{   22,  -18,  808,  768 }, NULL	/* copyright */
-    },
-    {
-	227, 0x00aa,  300, PSDRV_AGLGlyphNames + 1071,
-		{   22,  412,  281,  768 }, NULL	/* ordfeminine */
-    },
-    {
-	171, 0x00ab,  500, PSDRV_AGLGlyphNames +  950,
-		{   74,   62,  419,  447 }, NULL	/* guillemotleft */
-    },
-    {
-	 -1, 0x00ac,  500, PSDRV_AGLGlyphNames + 1009,
-		{   26,  105,  475,  401 }, NULL	/* logicalnot */
-    },
-    {
-	 -1, 0x00ae,  830, PSDRV_AGLGlyphNames + 1135,
-		{   22,  -18,  808,  768 }, NULL	/* registered */
-    },
-    {
-	 -1, 0x00b0,  400, PSDRV_AGLGlyphNames +  856,
-		{   50,  450,  350,  750 }, NULL	/* degree */
-    },
-    {
-	 -1, 0x00b1,  500, PSDRV_AGLGlyphNames + 1106,
-		{   26,  -15,  475,  513 }, NULL	/* plusminus */
-    },
-    {
-	 -1, 0x00b2,  300, PSDRV_AGLGlyphNames + 1210,
-		{   13,  300,  287,  752 }, NULL	/* twosuperior */
-    },
-    {
-	 -1, 0x00b3,  300, PSDRV_AGLGlyphNames + 1194,
-		{   12,  290,  288,  751 }, NULL	/* threesuperior */
-    },
-    {
-	194, 0x00b4,  333, PSDRV_AGLGlyphNames +  500,
-		{   83,  629,  332,  775 }, NULL	/* acute */
-    },
-    {
-	182, 0x00b6,  550, PSDRV_AGLGlyphNames + 1080,
-		{   23, -116,  526,  750 }, NULL	/* paragraph */
-    },
-    {
-	180, 0x00b7,  333, PSDRV_AGLGlyphNames + 1096,
-		{  101,  183,  233,  315 }, NULL	/* periodcentered */
-    },
-    {
-	203, 0x00b8,  333, PSDRV_AGLGlyphNames +  821,
-		{   39, -228,  275,    0 }, NULL	/* cedilla */
-    },
-    {
-	 -1, 0x00b9,  300, PSDRV_AGLGlyphNames + 1068,
-		{   50,  300,  251,  750 }, NULL	/* onesuperior */
-    },
-    {
-	235, 0x00ba,  300, PSDRV_AGLGlyphNames + 1072,
-		{   22,  412,  278,  768 }, NULL	/* ordmasculine */
-    },
-    {
-	187, 0x00bb,  500, PSDRV_AGLGlyphNames +  951,
-		{   81,   62,  426,  447 }, NULL	/* guillemotright */
-    },
-    {
-	 -1, 0x00bc,  750, PSDRV_AGLGlyphNames + 1067,
-		{   20,    0,  729,  750 }, NULL	/* onequarter */
-    },
-    {
-	 -1, 0x00bd,  750, PSDRV_AGLGlyphNames + 1064,
-		{   12,    0,  739,  750 }, NULL	/* onehalf */
-    },
-    {
-	 -1, 0x00be,  750, PSDRV_AGLGlyphNames + 1192,
-		{   12,    0,  739,  751 }, NULL	/* threequarters */
-    },
-    {
-	191, 0x00bf,  500, PSDRV_AGLGlyphNames + 1115,
-		{   60, -190,  449,  579 }, NULL	/* questiondown */
-    },
-    {
-	 -1, 0x00c0,  556, PSDRV_AGLGlyphNames +   13,
-		{    9,    0,  547,  961 }, NULL	/* Agrave */
-    },
-    {
-	 -1, 0x00c1,  556, PSDRV_AGLGlyphNames +    4,
-		{    9,    0,  547,  961 }, NULL	/* Aacute */
-    },
-    {
-	 -1, 0x00c2,  556, PSDRV_AGLGlyphNames +    7,
-		{    9,    0,  547,  956 }, NULL	/* Acircumflex */
-    },
-    {
-	 -1, 0x00c3,  556, PSDRV_AGLGlyphNames +   23,
-		{    9,    0,  547,  930 }, NULL	/* Atilde */
-    },
-    {
-	 -1, 0x00c4,  556, PSDRV_AGLGlyphNames +   11,
-		{    9,    0,  547,  945 }, NULL	/* Adieresis */
-    },
-    {
-	 -1, 0x00c5,  556, PSDRV_AGLGlyphNames +   19,
-		{    9,    0,  547,  991 }, NULL	/* Aring */
-    },
-    {
-	225, 0x00c6,  778, PSDRV_AGLGlyphNames +    1,
-		{  -22,    0,  750,  750 }, NULL	/* AE */
-    },
-    {
-	 -1, 0x00c7,  556, PSDRV_AGLGlyphNames +   34,
-		{   55, -228,  512,  768 }, NULL	/* Ccedilla */
-    },
-    {
-	 -1, 0x00c8,  500, PSDRV_AGLGlyphNames +   62,
-		{   64,    0,  458,  961 }, NULL	/* Egrave */
-    },
-    {
-	 -1, 0x00c9,  500, PSDRV_AGLGlyphNames +   53,
-		{   64,    0,  458,  961 }, NULL	/* Eacute */
-    },
-    {
-	 -1, 0x00ca,  500, PSDRV_AGLGlyphNames +   57,
-		{   64,    0,  458,  956 }, NULL	/* Ecircumflex */
-    },
-    {
-	 -1, 0x00cb,  500, PSDRV_AGLGlyphNames +   59,
-		{   64,    0,  458,  945 }, NULL	/* Edieresis */
-    },
-    {
-	 -1, 0x00cc,  278, PSDRV_AGLGlyphNames +  109,
-		{  -26,    0,  223,  961 }, NULL	/* Igrave */
-    },
-    {
-	 -1, 0x00cd,  278, PSDRV_AGLGlyphNames +   99,
-		{   56,    0,  305,  961 }, NULL	/* Iacute */
-    },
-    {
-	 -1, 0x00ce,  278, PSDRV_AGLGlyphNames +  102,
-		{  -37,    0,  316,  956 }, NULL	/* Icircumflex */
-    },
-    {
-	 -1, 0x00cf,  278, PSDRV_AGLGlyphNames +  104,
-		{  -22,    0,  301,  945 }, NULL	/* Idieresis */
-    },
-    {
-	 -1, 0x00d0,  611, PSDRV_AGLGlyphNames +   72,
-		{   20,    0,  550,  750 }, NULL	/* Eth */
-    },
-    {
-	 -1, 0x00d1,  611, PSDRV_AGLGlyphNames +  145,
-		{   68,    0,  543,  930 }, NULL	/* Ntilde */
-    },
-    {
-	 -1, 0x00d2,  611, PSDRV_AGLGlyphNames +  159,
-		{   61,  -18,  551,  961 }, NULL	/* Ograve */
-    },
-    {
-	 -1, 0x00d3,  611, PSDRV_AGLGlyphNames +  151,
-		{   61,  -18,  551,  961 }, NULL	/* Oacute */
-    },
-    {
-	 -1, 0x00d4,  611, PSDRV_AGLGlyphNames +  154,
-		{   61,  -18,  551,  956 }, NULL	/* Ocircumflex */
-    },
-    {
-	 -1, 0x00d5,  611, PSDRV_AGLGlyphNames +  172,
-		{   61,  -18,  551,  930 }, NULL	/* Otilde */
-    },
-    {
-	 -1, 0x00d6,  611, PSDRV_AGLGlyphNames +  156,
-		{   61,  -18,  551,  945 }, NULL	/* Odieresis */
-    },
-    {
-	 -1, 0x00d7,  500, PSDRV_AGLGlyphNames + 1024,
-		{   26,   22,  475,  476 }, NULL	/* multiply */
-    },
-    {
-	233, 0x00d8,  611, PSDRV_AGLGlyphNames +  168,
-		{   36,  -38,  578,  779 }, NULL	/* Oslash */
-    },
-    {
-	 -1, 0x00d9,  611, PSDRV_AGLGlyphNames +  256,
-		{   68,  -18,  544,  961 }, NULL	/* Ugrave */
-    },
-    {
-	 -1, 0x00da,  611, PSDRV_AGLGlyphNames +  249,
-		{   68,  -18,  544,  961 }, NULL	/* Uacute */
-    },
-    {
-	 -1, 0x00db,  611, PSDRV_AGLGlyphNames +  252,
-		{   68,  -18,  544,  956 }, NULL	/* Ucircumflex */
-    },
-    {
-	 -1, 0x00dc,  611, PSDRV_AGLGlyphNames +  254,
-		{   68,  -18,  544,  945 }, NULL	/* Udieresis */
-    },
-    {
-	 -1, 0x00dd,  556, PSDRV_AGLGlyphNames +  281,
-		{   12,    0,  545,  961 }, NULL	/* Yacute */
-    },
-    {
-	 -1, 0x00de,  556, PSDRV_AGLGlyphNames +  244,
-		{   68,    0,  529,  750 }, NULL	/* Thorn */
-    },
-    {
-	251, 0x00df,  500, PSDRV_AGLGlyphNames +  943,
-		{   60,  -15,  445,  768 }, NULL	/* germandbls */
-    },
-    {
-	 -1, 0x00e0,  500, PSDRV_AGLGlyphNames +  750,
-		{   42,  -15,  440,  775 }, NULL	/* agrave */
-    },
-    {
-	 -1, 0x00e1,  500, PSDRV_AGLGlyphNames +  497,
-		{   42,  -15,  440,  775 }, NULL	/* aacute */
-    },
-    {
-	 -1, 0x00e2,  500, PSDRV_AGLGlyphNames +  499,
-		{   42,  -15,  440,  770 }, NULL	/* acircumflex */
-    },
-    {
-	 -1, 0x00e3,  500, PSDRV_AGLGlyphNames +  786,
-		{   42,  -15,  440,  744 }, NULL	/* atilde */
-    },
-    {
-	 -1, 0x00e4,  500, PSDRV_AGLGlyphNames +  502,
-		{   42,  -15,  440,  759 }, NULL	/* adieresis */
-    },
-    {
-	 -1, 0x00e5,  500, PSDRV_AGLGlyphNames +  764,
-		{   42,  -15,  440,  835 }, NULL	/* aring */
-    },
-    {
-	241, 0x00e6,  722, PSDRV_AGLGlyphNames +  503,
-		{   44,  -15,  672,  579 }, NULL	/* ae */
-    },
-    {
-	 -1, 0x00e7,  444, PSDRV_AGLGlyphNames +  818,
-		{   49, -228,  403,  579 }, NULL	/* ccedilla */
-    },
-    {
-	 -1, 0x00e8,  500, PSDRV_AGLGlyphNames +  885,
-		{   53,  -15,  443,  775 }, NULL	/* egrave */
-    },
-    {
-	 -1, 0x00e9,  500, PSDRV_AGLGlyphNames +  879,
-		{   53,  -15,  443,  775 }, NULL	/* eacute */
-    },
-    {
-	 -1, 0x00ea,  500, PSDRV_AGLGlyphNames +  882,
-		{   53,  -15,  443,  770 }, NULL	/* ecircumflex */
-    },
-    {
-	 -1, 0x00eb,  500, PSDRV_AGLGlyphNames +  883,
-		{   53,  -15,  443,  759 }, NULL	/* edieresis */
-    },
-    {
-	 -1, 0x00ec,  278, PSDRV_AGLGlyphNames +  969,
-		{  -26,    0,  223,  775 }, NULL	/* igrave */
-    },
-    {
-	 -1, 0x00ed,  278, PSDRV_AGLGlyphNames +  965,
-		{   56,    0,  305,  775 }, NULL	/* iacute */
-    },
-    {
-	 -1, 0x00ee,  278, PSDRV_AGLGlyphNames +  967,
-		{  -47,    0,  306,  770 }, NULL	/* icircumflex */
-    },
-    {
-	 -1, 0x00ef,  278, PSDRV_AGLGlyphNames +  968,
-		{  -22,    0,  301,  759 }, NULL	/* idieresis */
-    },
-    {
-	 -1, 0x00f0,  500, PSDRV_AGLGlyphNames +  906,
-		{   53,  -15,  447,  779 }, NULL	/* eth */
-    },
-    {
-	 -1, 0x00f1,  500, PSDRV_AGLGlyphNames + 1041,
-		{   61,    0,  440,  744 }, NULL	/* ntilde */
-    },
-    {
-	 -1, 0x00f2,  500, PSDRV_AGLGlyphNames + 1051,
-		{   53,  -15,  447,  775 }, NULL	/* ograve */
-    },
-    {
-	 -1, 0x00f3,  500, PSDRV_AGLGlyphNames + 1045,
-		{   53,  -15,  447,  775 }, NULL	/* oacute */
-    },
-    {
-	 -1, 0x00f4,  500, PSDRV_AGLGlyphNames + 1047,
-		{   53,  -15,  447,  770 }, NULL	/* ocircumflex */
-    },
-    {
-	 -1, 0x00f5,  500, PSDRV_AGLGlyphNames + 1077,
-		{   53,  -15,  447,  744 }, NULL	/* otilde */
-    },
-    {
-	 -1, 0x00f6,  500, PSDRV_AGLGlyphNames + 1048,
-		{   53,  -15,  447,  759 }, NULL	/* odieresis */
-    },
-    {
-	 -1, 0x00f7,  500, PSDRV_AGLGlyphNames +  863,
-		{   26,    6,  475,  492 }, NULL	/* divide */
-    },
-    {
-	249, 0x00f8,  500, PSDRV_AGLGlyphNames + 1074,
-		{    7,  -58,  492,  617 }, NULL	/* oslash */
-    },
-    {
-	 -1, 0x00f9,  500, PSDRV_AGLGlyphNames + 1217,
-		{   58,  -15,  431,  775 }, NULL	/* ugrave */
-    },
-    {
-	 -1, 0x00fa,  500, PSDRV_AGLGlyphNames + 1213,
-		{   58,  -15,  431,  775 }, NULL	/* uacute */
-    },
-    {
-	 -1, 0x00fb,  500, PSDRV_AGLGlyphNames + 1215,
-		{   58,  -15,  431,  780 }, NULL	/* ucircumflex */
-    },
-    {
-	 -1, 0x00fc,  500, PSDRV_AGLGlyphNames + 1216,
-		{   58,  -15,  431,  759 }, NULL	/* udieresis */
-    },
-    {
-	 -1, 0x00fd,  444, PSDRV_AGLGlyphNames + 1244,
-		{    5, -195,  429,  775 }, NULL	/* yacute */
-    },
-    {
-	 -1, 0x00fe,  500, PSDRV_AGLGlyphNames + 1187,
-		{   58, -189,  438,  750 }, NULL	/* thorn */
-    },
-    {
-	 -1, 0x00ff,  444, PSDRV_AGLGlyphNames + 1246,
-		{    5, -195,  429,  759 }, NULL	/* ydieresis */
-    },
-    {
-	245, 0x0131,  278, PSDRV_AGLGlyphNames +  873,
-		{   74,    0,  204,  564 }, NULL	/* dotlessi */
-    },
-    {
-	232, 0x0141,  500, PSDRV_AGLGlyphNames +  132,
-		{    0,    0,  474,  750 }, NULL	/* Lslash */
-    },
-    {
-	248, 0x0142,  278, PSDRV_AGLGlyphNames + 1013,
-		{    2,    0,  272,  750 }, NULL	/* lslash */
-    },
-    {
-	234, 0x0152,  833, PSDRV_AGLGlyphNames +  149,
-		{   61,  -18,  792,  768 }, NULL	/* OE */
-    },
-    {
-	250, 0x0153,  722, PSDRV_AGLGlyphNames + 1049,
-		{   46,  -15,  678,  579 }, NULL	/* oe */
-    },
-    {
-	 -1, 0x0160,  556, PSDRV_AGLGlyphNames +  231,
-		{   49,  -18,  508,  946 }, NULL	/* Scaron */
-    },
-    {
-	 -1, 0x0161,  444, PSDRV_AGLGlyphNames + 1147,
-		{   28,  -15,  407,  760 }, NULL	/* scaron */
-    },
-    {
-	 -1, 0x0178,  556, PSDRV_AGLGlyphNames +  284,
-		{   12,    0,  545,  945 }, NULL	/* Ydieresis */
-    },
-    {
-	 -1, 0x017d,  500, PSDRV_AGLGlyphNames +  290,
-		{   33,    0,  468,  946 }, NULL	/* Zcaron */
-    },
-    {
-	 -1, 0x017e,  389, PSDRV_AGLGlyphNames + 1251,
-		{   18,    0,  371,  760 }, NULL	/* zcaron */
-    },
-    {
-	166, 0x0192,  500, PSDRV_AGLGlyphNames +  928,
-		{    9, -185,  492,  763 }, NULL	/* florin */
-    },
-    {
-	195, 0x02c6,  333, PSDRV_AGLGlyphNames +  831,
-		{  -10,  644,  343,  790 }, NULL	/* circumflex */
-    },
-    {
-	207, 0x02c7,  333, PSDRV_AGLGlyphNames +  815,
-		{  -10,  634,  343,  780 }, NULL	/* caron */
-    },
-    {
-	197, 0x02c9,  333, PSDRV_AGLGlyphNames + 1017,
-		{   -6,  666,  340,  740 }, NULL	/* macron */
-    },
-    {
-	198, 0x02d8,  333, PSDRV_AGLGlyphNames +  809,
-		{   -1,  635,  335,  780 }, NULL	/* breve */
-    },
-    {
-	199, 0x02d9,  333, PSDRV_AGLGlyphNames +  871,
-		{  103,  644,  230,  759 }, NULL	/* dotaccent */
-    },
-    {
-	202, 0x02da,  333, PSDRV_AGLGlyphNames + 1141,
-		{   60,  632,  273,  845 }, NULL	/* ring */
-    },
-    {
-	206, 0x02db,  333, PSDRV_AGLGlyphNames + 1050,
-		{   88, -205,  278,    0 }, NULL	/* ogonek */
-    },
-    {
-	196, 0x02dc,  333, PSDRV_AGLGlyphNames + 1195,
-		{  -16,  636,  350,  764 }, NULL	/* tilde */
-    },
-    {
-	205, 0x02dd,  333, PSDRV_AGLGlyphNames +  960,
-		{  -17,  634,  447,  780 }, NULL	/* hungarumlaut */
-    },
-    {
-	 -1, 0x03bc,  500, PSDRV_AGLGlyphNames + 1023,
-		{   58, -189,  431,  564 }, NULL	/* mu */
-    },
-    {
-	177, 0x2013,  500, PSDRV_AGLGlyphNames +  895,
-		{    0,  259,  500,  369 }, NULL	/* endash */
-    },
-    {
-	208, 0x2014, 1000, PSDRV_AGLGlyphNames +  893,
-		{    0,  259, 1000,  369 }, NULL	/* emdash */
-    },
-    {
-	 96, 0x2018,  278, PSDRV_AGLGlyphNames + 1122,
-		{   76,  495,  197,  766 }, NULL	/* quoteleft */
-    },
-    {
-	 39, 0x2019,  278, PSDRV_AGLGlyphNames + 1124,
-		{   81,  479,  202,  750 }, NULL	/* quoteright */
-    },
-    {
-	184, 0x201a,  278, PSDRV_AGLGlyphNames + 1125,
-		{   87, -138,  207,  132 }, NULL	/* quotesinglbase */
-    },
-    {
-	170, 0x201c,  500, PSDRV_AGLGlyphNames + 1120,
-		{   87,  495,  405,  766 }, NULL	/* quotedblleft */
-    },
-    {
-	186, 0x201d,  500, PSDRV_AGLGlyphNames + 1121,
-		{   95,  479,  413,  750 }, NULL	/* quotedblright */
-    },
-    {
-	185, 0x201e,  500, PSDRV_AGLGlyphNames + 1119,
-		{   96, -138,  413,  132 }, NULL	/* quotedblbase */
-    },
-    {
-	178, 0x2020,  500, PSDRV_AGLGlyphNames +  849,
-		{   37, -155,  463,  768 }, NULL	/* dagger */
-    },
-    {
-	179, 0x2021,  500, PSDRV_AGLGlyphNames +  850,
-		{   35, -161,  466,  768 }, NULL	/* daggerdbl */
-    },
-    {
-	183, 0x2022,  420, PSDRV_AGLGlyphNames +  812,
-		{   22,  186,  398,  562 }, NULL	/* bullet */
-    },
-    {
-	188, 0x2026, 1000, PSDRV_AGLGlyphNames +  891,
-		{  101,    0,  899,  132 }, NULL	/* ellipsis */
-    },
-    {
-	189, 0x2030, 1111, PSDRV_AGLGlyphNames + 1100,
-		{   21,  -18, 1091,  748 }, NULL	/* perthousand */
-    },
-    {
-	172, 0x2039,  278, PSDRV_AGLGlyphNames +  952,
-		{   58,   62,  215,  447 }, NULL	/* guilsinglleft */
-    },
-    {
-	173, 0x203a,  278, PSDRV_AGLGlyphNames +  953,
-		{   63,   62,  220,  447 }, NULL	/* guilsinglright */
-    },
-    {
-	 -1, 0x2122,  860, PSDRV_AGLGlyphNames + 1198,
-		{    1,  346,  774,  750 }, NULL	/* trademark */
-    },
-    {
-	 -1, 0x2212,  500, PSDRV_AGLGlyphNames + 1020,
-		{   26,  194,  475,  304 }, NULL	/* minus */
-    },
-    {
-	164, 0x2215,  167, PSDRV_AGLGlyphNames +  934,
-		{ -169,    0,  331,  738 }, NULL	/* fraction */
-    },
-    {
-	174, 0xfb01,  500, PSDRV_AGLGlyphNames +  918,
-		{   10,    0,  446,  750 }, NULL	/* fi */
-    },
-    {
-	175, 0xfb02,  500, PSDRV_AGLGlyphNames +  927,
-		{   10,    0,  443,  750 }, NULL	/* fl */
-    }
-};
-
-
-/*
- *  Font metrics
- */
-
-AFM PSDRV_Helvetica_Condensed_Bold =
-{
-    "Helvetica-Condensed-Bold",			/* FontName */
-    "Helvetica Condensed Bold",			/* FullName */
-    "Helvetica",				/* FamilyName */
-    "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
-    0,						/* ItalicAngle */
-    FALSE,					/* IsFixedPitch */
-    -100,					/* UnderlinePosition */
-    50,						/* UnderlineThickness */
-    { -169, -250, 1091, 991 },			/* FontBBox */
-    750,					/* CapHeight */
-    564,					/* XHeight */
-    750,					/* Ascender */
-    -189,					/* Descender */
-    991,					/* FullAscender */
-    {
-	1000,				/* WinMetrics.usUnitsPerEm */
-	991,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	750,				/* WinMetrics.sTypoAscender */
-	-188,				/* WinMetrics.sTypoDescender */
-	262,				/* WinMetrics.sTypoLineGap */
-	991,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
-    },
-    {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[10] - CharWidths[19] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[20] - CharWidths[29] */
-	0, 0, 250, 333, 333, 500, 500, 	/* CharWidths[30] - CharWidths[36] */
-	833, 667, 250, 333, 333, 500, 	/* CharWidths[37] - CharWidths[42] */
-	500, 333, 333, 333, 278, 500, 	/* CharWidths[43] - CharWidths[48] */
-	500, 500, 500, 500, 500, 500, 	/* CharWidths[49] - CharWidths[54] */
-	500, 500, 500, 278, 278, 500, 	/* CharWidths[55] - CharWidths[60] */
-	500, 500, 500, 833, 556, 556, 	/* CharWidths[61] - CharWidths[66] */
-	556, 611, 500, 500, 611, 611, 	/* CharWidths[67] - CharWidths[72] */
-	278, 444, 556, 500, 778, 611, 	/* CharWidths[73] - CharWidths[78] */
-	611, 556, 611, 611, 556, 500, 	/* CharWidths[79] - CharWidths[84] */
-	611, 556, 833, 556, 556, 500, 	/* CharWidths[85] - CharWidths[90] */
-	333, 250, 333, 500, 500, 333, 	/* CharWidths[91] - CharWidths[96] */
-	500, 500, 444, 500, 500, 278, 	/* CharWidths[97] - CharWidths[102] */
-	500, 500, 278, 278, 444, 278, 	/* CharWidths[103] - CharWidths[108] */
-	778, 500, 500, 500, 500, 333, 	/* CharWidths[109] - CharWidths[114] */
-	444, 278, 500, 444, 667, 444, 	/* CharWidths[115] - CharWidths[120] */
-	444, 389, 274, 250, 274, 500, 	/* CharWidths[121] - CharWidths[126] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[127] - CharWidths[136] */
-	0, 0, 0, 0, 0, 0, 0, 0, 278, 	/* CharWidths[137] - CharWidths[145] */
-	278, 500, 500, 420, 500, 1000, 	/* CharWidths[146] - CharWidths[151] */
-	0, 0, 0, 0, 0, 0, 0, 0, 250, 	/* CharWidths[152] - CharWidths[160] */
-	333, 500, 500, 500, 500, 250, 	/* CharWidths[161] - CharWidths[166] */
-	500, 333, 830, 500, 500, 500, 	/* CharWidths[167] - CharWidths[172] */
-	333, 830, 333, 400, 500, 300, 	/* CharWidths[173] - CharWidths[178] */
-	300, 333, 0, 550, 333, 333, 	/* CharWidths[179] - CharWidths[184] */
-	300, 500, 500, 750, 750, 750, 	/* CharWidths[185] - CharWidths[190] */
-	500, 0, 333, 333, 333, 333, 	/* CharWidths[191] - CharWidths[196] */
-	333, 333, 333, 333, 0, 333, 	/* CharWidths[197] - CharWidths[202] */
-	333, 0, 333, 333, 333, 1000, 	/* CharWidths[203] - CharWidths[208] */
-	0, 0, 0, 0, 0, 0, 500, 0, 0, 	/* CharWidths[209] - CharWidths[217] */
-	0, 0, 0, 0, 0, 0, 0, 778, 0, 	/* CharWidths[218] - CharWidths[226] */
-	300, 0, 0, 0, 0, 500, 611, 	/* CharWidths[227] - CharWidths[233] */
-	833, 300, 0, 0, 0, 0, 0, 722, 	/* CharWidths[234] - CharWidths[241] */
-	0, 0, 0, 278, 0, 500, 278, 	/* CharWidths[242] - CharWidths[248] */
-	500, 722, 500, 0, 0, 0, 0	/* CharWidths[249] - CharWidths[255] */
-    },
-    228,					/* NumofMetrics */
-    met_Helvetica_Condensed_Bold,		/* Metrics */
-    &PSDRV_AdobeGlyphList			/* Encoding */
-};
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed_BoldObl.c ./dlls/wineps/data/Helvetica_Condensed_BoldObl.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed_BoldObl.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Condensed_BoldObl.c	Wed Dec 31 18:00:00 1969
@@ -1,1015 +0,0 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica Condensed Bold Oblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	This data is derived from the Adobe Font Metrics files at
- *
- *	    ftp://ftp.adobe.com/pub/adobe/type/win/all/afmfiles/base35/
- *
- *	which are Copyright 1985-1992 Adobe Systems Incorporated.
- *
- */
-
-#include "psdrv.h"
-
-
-/*
- *  Glyph metrics
- */
-
-static AFMMETRICS met_Helvetica_Condensed_BoldObl[228] = 
-{
-    {
-	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
-		{    0,    0,    0,    0 }, NULL	/* space */
-    },
-    {
-	 33, 0x0021,  333, PSDRV_AGLGlyphNames +  907,
-		{  102,    0,  390,  750 }, NULL	/* exclam */
-    },
-    {
-	 34, 0x0022,  333, PSDRV_AGLGlyphNames + 1118,
-		{  115,  468,  475,  739 }, NULL	/* quotedbl */
-    },
-    {
-	 35, 0x0023,  500, PSDRV_AGLGlyphNames + 1043,
-		{   81,    0,  580,  738 }, NULL	/* numbersign */
-    },
-    {
-	 36, 0x0024,  500, PSDRV_AGLGlyphNames +  866,
-		{   68, -124,  576,  803 }, NULL	/* dollar */
-    },
-    {
-	 37, 0x0025,  833, PSDRV_AGLGlyphNames + 1094,
-		{  138,  -15,  853,  750 }, NULL	/* percent */
-    },
-    {
-	 38, 0x0026,  667, PSDRV_AGLGlyphNames +  755,
-		{  101,  -18,  676,  768 }, NULL	/* ampersand */
-    },
-    {
-	169, 0x0027,  250, PSDRV_AGLGlyphNames + 1126,
-		{  165,  468,  342,  739 }, NULL	/* quotesingle */
-    },
-    {
-	 40, 0x0028,  333, PSDRV_AGLGlyphNames + 1081,
-		{   91, -198,  442,  768 }, NULL	/* parenleft */
-    },
-    {
-	 41, 0x0029,  333, PSDRV_AGLGlyphNames + 1087,
-		{   12, -198,  363,  768 }, NULL	/* parenright */
-    },
-    {
-	 42, 0x002a,  500, PSDRV_AGLGlyphNames +  782,
-		{  203,  412,  546,  738 }, NULL	/* asterisk */
-    },
-    {
-	 43, 0x002b,  500, PSDRV_AGLGlyphNames + 1105,
-		{   67,    0,  540,  492 }, NULL	/* plus */
-    },
-    {
-	 44, 0x002c,  333, PSDRV_AGLGlyphNames +  835,
-		{   70, -145,  261,  132 }, NULL	/* comma */
-    },
-    {
-	 45, 0x002d,  333, PSDRV_AGLGlyphNames +  961,
-		{  102,  255,  365,  370 }, NULL	/* hyphen */
-    },
-    {
-	 46, 0x002e,  333, PSDRV_AGLGlyphNames + 1095,
-		{  101,    0,  261,  132 }, NULL	/* period */
-    },
-    {
-	 47, 0x002f,  278, PSDRV_AGLGlyphNames + 1167,
-		{  -31,  -94,  471,  750 }, NULL	/* slash */
-    },
-    {
-	 48, 0x0030,  500, PSDRV_AGLGlyphNames + 1253,
-		{   82,  -15,  576,  753 }, NULL	/* zero */
-    },
-    {
-	 49, 0x0031,  500, PSDRV_AGLGlyphNames + 1060,
-		{  155,    0,  512,  750 }, NULL	/* one */
-    },
-    {
-	 50, 0x0032,  500, PSDRV_AGLGlyphNames + 1206,
-		{   32,    0,  577,  753 }, NULL	/* two */
-    },
-    {
-	 51, 0x0033,  500, PSDRV_AGLGlyphNames + 1188,
-		{   61,  -15,  563,  753 }, NULL	/* three */
-    },
-    {
-	 52, 0x0034,  500, PSDRV_AGLGlyphNames +  930,
-		{   55,    0,  563,  738 }, NULL	/* four */
-    },
-    {
-	 53, 0x0035,  500, PSDRV_AGLGlyphNames +  922,
-		{   72,  -15,  581,  738 }, NULL	/* five */
-    },
-    {
-	 54, 0x0036,  500, PSDRV_AGLGlyphNames + 1163,
-		{   83,  -15,  575,  753 }, NULL	/* six */
-    },
-    {
-	 55, 0x0037,  500, PSDRV_AGLGlyphNames + 1154,
-		{  126,    0,  611,  738 }, NULL	/* seven */
-    },
-    {
-	 56, 0x0038,  500, PSDRV_AGLGlyphNames +  886,
-		{   76,  -15,  570,  753 }, NULL	/* eight */
-    },
-    {
-	 57, 0x0039,  500, PSDRV_AGLGlyphNames + 1032,
-		{   84,  -15,  575,  753 }, NULL	/* nine */
-    },
-    {
-	 58, 0x003a,  278, PSDRV_AGLGlyphNames +  833,
-		{   73,    0,  323,  556 }, NULL	/* colon */
-    },
-    {
-	 59, 0x003b,  278, PSDRV_AGLGlyphNames + 1153,
-		{   42, -145,  323,  556 }, NULL	/* semicolon */
-    },
-    {
-	 60, 0x003c,  500, PSDRV_AGLGlyphNames + 1003,
-		{   85,  -24,  571,  527 }, NULL	/* less */
-    },
-    {
-	 61, 0x003d,  500, PSDRV_AGLGlyphNames +  900,
-		{   46,   96,  560,  401 }, NULL	/* equal */
-    },
-    {
-	 62, 0x003e,  500, PSDRV_AGLGlyphNames +  948,
-		{   37,  -24,  523,  527 }, NULL	/* greater */
-    },
-    {
-	 63, 0x003f,  500, PSDRV_AGLGlyphNames + 1114,
-		{  147,    0,  569,  768 }, NULL	/* question */
-    },
-    {
-	 64, 0x0040,  833, PSDRV_AGLGlyphNames +  785,
-		{  109,  -18,  897,  768 }, NULL	/* at */
-    },
-    {
-	 65, 0x0041,  556, PSDRV_AGLGlyphNames +    0,
-		{    9,    0,  547,  750 }, NULL	/* A */
-    },
-    {
-	 66, 0x0042,  556, PSDRV_AGLGlyphNames +   25,
-		{   65,    0,  615,  750 }, NULL	/* B */
-    },
-    {
-	 67, 0x0043,  556, PSDRV_AGLGlyphNames +   29,
-		{   99,  -18,  630,  768 }, NULL	/* C */
-    },
-    {
-	 68, 0x0044,  611, PSDRV_AGLGlyphNames +   42,
-		{   72,    0,  662,  750 }, NULL	/* D */
-    },
-    {
-	 69, 0x0045,  500, PSDRV_AGLGlyphNames +   52,
-		{   64,    0,  617,  750 }, NULL	/* E */
-    },
-    {
-	 70, 0x0046,  500, PSDRV_AGLGlyphNames +   75,
-		{   73,    0,  629,  750 }, NULL	/* F */
-    },
-    {
-	 71, 0x0047,  611, PSDRV_AGLGlyphNames +   77,
-		{   99,  -18,  664,  768 }, NULL	/* G */
-    },
-    {
-	 72, 0x0048,  611, PSDRV_AGLGlyphNames +   87,
-		{   68,    0,  703,  750 }, NULL	/* H */
-    },
-    {
-	 73, 0x0049,  278, PSDRV_AGLGlyphNames +   97,
-		{   69,    0,  368,  750 }, NULL	/* I */
-    },
-    {
-	 74, 0x004a,  444, PSDRV_AGLGlyphNames +  118,
-		{   36,  -18,  543,  750 }, NULL	/* J */
-    },
-    {
-	 75, 0x004b,  556, PSDRV_AGLGlyphNames +  121,
-		{   68,    0,  697,  750 }, NULL	/* K */
-    },
-    {
-	 76, 0x004c,  500, PSDRV_AGLGlyphNames +  125,
-		{   68,    0,  491,  750 }, NULL	/* L */
-    },
-    {
-	 77, 0x004d,  778, PSDRV_AGLGlyphNames +  135,
-		{   67,    0,  871,  750 }, NULL	/* M */
-    },
-    {
-	 78, 0x004e,  611, PSDRV_AGLGlyphNames +  140,
-		{   68,    0,  702,  750 }, NULL	/* N */
-    },
-    {
-	 79, 0x004f,  611, PSDRV_AGLGlyphNames +  148,
-		{  105,  -18,  664,  768 }, NULL	/* O */
-    },
-    {
-	 80, 0x0050,  556, PSDRV_AGLGlyphNames +  174,
-		{   68,    0,  651,  750 }, NULL	/* P */
-    },
-    {
-	 81, 0x0051,  611, PSDRV_AGLGlyphNames +  179,
-		{  105,  -71,  664,  768 }, NULL	/* Q */
-    },
-    {
-	 82, 0x0052,  611, PSDRV_AGLGlyphNames +  181,
-		{   66,    0,  671,  750 }, NULL	/* R */
-    },
-    {
-	 83, 0x0053,  556, PSDRV_AGLGlyphNames +  189,
-		{   85,  -18,  613,  768 }, NULL	/* S */
-    },
-    {
-	 84, 0x0054,  500, PSDRV_AGLGlyphNames +  238,
-		{  153,    0,  643,  750 }, NULL	/* T */
-    },
-    {
-	 85, 0x0055,  611, PSDRV_AGLGlyphNames +  248,
-		{  105,  -18,  703,  750 }, NULL	/* U */
-    },
-    {
-	 86, 0x0056,  556, PSDRV_AGLGlyphNames +  269,
-		{  180,    0,  695,  750 }, NULL	/* V */
-    },
-    {
-	 87, 0x0057,  833, PSDRV_AGLGlyphNames +  271,
-		{  167,    0,  969,  750 }, NULL	/* W */
-    },
-    {
-	 88, 0x0058,  556, PSDRV_AGLGlyphNames +  277,
-		{   11,    0,  698,  750 }, NULL	/* X */
-    },
-    {
-	 89, 0x0059,  556, PSDRV_AGLGlyphNames +  280,
-		{  171,    0,  704,  750 }, NULL	/* Y */
-    },
-    {
-	 90, 0x005a,  500, PSDRV_AGLGlyphNames +  288,
-		{   33,    0,  618,  750 }, NULL	/* Z */
-    },
-    {
-	 91, 0x005b,  333, PSDRV_AGLGlyphNames +  801,
-		{   61,  -94,  439,  750 }, NULL	/* bracketleft */
-    },
-    {
-	 92, 0x005c,  250, PSDRV_AGLGlyphNames +  788,
-		{   70,    0,  340,  750 }, NULL	/* backslash */
-    },
-    {
-	 93, 0x005d,  333, PSDRV_AGLGlyphNames +  805,
-		{   33,  -94,  411,  750 }, NULL	/* bracketright */
-    },
-    {
-	 94, 0x005e,  500, PSDRV_AGLGlyphNames +  780,
-		{   89,  326,  569,  750 }, NULL	/* asciicircum */
-    },
-    {
-	 95, 0x005f,  500, PSDRV_AGLGlyphNames + 1221,
-		{  -27, -125,  484,  -75 }, NULL	/* underscore */
-    },
-    {
-	193, 0x0060,  333, PSDRV_AGLGlyphNames +  945,
-		{  166,  629,  384,  775 }, NULL	/* grave */
-    },
-    {
-	 97, 0x0061,  500, PSDRV_AGLGlyphNames +  295,
-		{   68,  -15,  525,  579 }, NULL	/* a */
-    },
-    {
-	 98, 0x0062,  500, PSDRV_AGLGlyphNames +  787,
-		{   64,  -15,  534,  750 }, NULL	/* b */
-    },
-    {
-	 99, 0x0063,  444, PSDRV_AGLGlyphNames +  813,
-		{   79,  -15,  496,  579 }, NULL	/* c */
-    },
-    {
-	100, 0x0064,  500, PSDRV_AGLGlyphNames +  848,
-		{   83,  -15,  592,  750 }, NULL	/* d */
-    },
-    {
-	101, 0x0065,  500, PSDRV_AGLGlyphNames +  878,
-		{   88,  -15,  530,  579 }, NULL	/* e */
-    },
-    {
-	102, 0x0066,  278, PSDRV_AGLGlyphNames +  913,
-		{   71,    0,  416,  750 }, NULL	/* f */
-    },
-    {
-	103, 0x0067,  500, PSDRV_AGLGlyphNames +  936,
-		{   44, -190,  553,  579 }, NULL	/* g */
-    },
-    {
-	104, 0x0068,  500, PSDRV_AGLGlyphNames +  954,
-		{   61,    0,  539,  750 }, NULL	/* h */
-    },
-    {
-	105, 0x0069,  278, PSDRV_AGLGlyphNames +  964,
-		{   74,    0,  363,  750 }, NULL	/* i */
-    },
-    {
-	106, 0x006a,  278, PSDRV_AGLGlyphNames +  989,
-		{   -9, -192,  368,  750 }, NULL	/* j */
-    },
-    {
-	107, 0x006b,  444, PSDRV_AGLGlyphNames +  991,
-		{   48,    0,  563,  750 }, NULL	/* k */
-    },
-    {
-	108, 0x006c,  278, PSDRV_AGLGlyphNames +  995,
-		{   74,    0,  363,  750 }, NULL	/* l */
-    },
-    {
-	109, 0x006d,  778, PSDRV_AGLGlyphNames + 1016,
-		{   66,    0,  812,  579 }, NULL	/* m */
-    },
-    {
-	110, 0x006e,  500, PSDRV_AGLGlyphNames + 1027,
-		{   61,    0,  539,  579 }, NULL	/* n */
-    },
-    {
-	111, 0x006f,  500, PSDRV_AGLGlyphNames + 1044,
-		{   88,  -15,  531,  579 }, NULL	/* o */
-    },
-    {
-	112, 0x0070,  500, PSDRV_AGLGlyphNames + 1079,
-		{   18, -189,  528,  579 }, NULL	/* p */
-    },
-    {
-	113, 0x0071,  500, PSDRV_AGLGlyphNames + 1113,
-		{   80, -188,  550,  579 }, NULL	/* q */
-    },
-    {
-	114, 0x0072,  333, PSDRV_AGLGlyphNames + 1127,
-		{   60,    0,  441,  574 }, NULL	/* r */
-    },
-    {
-	115, 0x0073,  444, PSDRV_AGLGlyphNames + 1145,
-		{   56,  -15,  498,  579 }, NULL	/* s */
-    },
-    {
-	116, 0x0074,  278, PSDRV_AGLGlyphNames + 1178,
-		{   83,   -7,  372,  719 }, NULL	/* t */
-    },
-    {
-	117, 0x0075,  500, PSDRV_AGLGlyphNames + 1212,
-		{   78,  -15,  551,  564 }, NULL	/* u */
-    },
-    {
-	118, 0x0076,  444, PSDRV_AGLGlyphNames + 1234,
-		{  130,    0,  554,  564 }, NULL	/* v */
-    },
-    {
-	119, 0x0077,  667, PSDRV_AGLGlyphNames + 1235,
-		{  127,    0,  765,  564 }, NULL	/* w */
-    },
-    {
-	120, 0x0078,  444, PSDRV_AGLGlyphNames + 1241,
-		{    8,    0,  553,  564 }, NULL	/* x */
-    },
-    {
-	121, 0x0079,  444, PSDRV_AGLGlyphNames + 1243,
-		{   36, -195,  549,  564 }, NULL	/* y */
-    },
-    {
-	122, 0x007a,  389, PSDRV_AGLGlyphNames + 1249,
-		{   23,    0,  487,  564 }, NULL	/* z */
-    },
-    {
-	123, 0x007b,  274, PSDRV_AGLGlyphNames +  793,
-		{   37,  -92,  399,  750 }, NULL	/* braceleft */
-    },
-    {
-	124, 0x007c,  250, PSDRV_AGLGlyphNames +  789,
-		{   22, -250,  334,  750 }, NULL	/* bar */
-    },
-    {
-	125, 0x007d,  274, PSDRV_AGLGlyphNames +  797,
-		{   14,  -94,  375,  750 }, NULL	/* braceright */
-    },
-    {
-	126, 0x007e,  500, PSDRV_AGLGlyphNames +  781,
-		{   74,  153,  536,  359 }, NULL	/* asciitilde */
-    },
-    {
-	161, 0x00a1,  333, PSDRV_AGLGlyphNames +  909,
-		{   66, -170,  355,  579 }, NULL	/* exclamdown */
-    },
-    {
-	162, 0x00a2,  500, PSDRV_AGLGlyphNames +  822,
-		{  103, -122,  521,  671 }, NULL	/* cent */
-    },
-    {
-	163, 0x00a3,  500, PSDRV_AGLGlyphNames + 1173,
-		{   52,  -15,  603,  768 }, NULL	/* sterling */
-    },
-    {
-	168, 0x00a4,  500, PSDRV_AGLGlyphNames +  843,
-		{   38,   58,  594,  560 }, NULL	/* currency */
-    },
-    {
-	165, 0x00a5,  500, PSDRV_AGLGlyphNames + 1247,
-		{   89,    0,  677,  750 }, NULL	/* yen */
-    },
-    {
-	 -1, 0x00a6,  250, PSDRV_AGLGlyphNames +  810,
-		{   38, -175,  318,  675 }, NULL	/* brokenbar */
-    },
-    {
-	167, 0x00a7,  500, PSDRV_AGLGlyphNames + 1152,
-		{   48, -183,  572,  768 }, NULL	/* section */
-    },
-    {
-	200, 0x00a8,  333, PSDRV_AGLGlyphNames +  859,
-		{  142,  644,  489,  759 }, NULL	/* dieresis */
-    },
-    {
-	 -1, 0x00a9,  830, PSDRV_AGLGlyphNames +  840,
-		{   93,  -18,  897,  768 }, NULL	/* copyright */
-    },
-    {
-	227, 0x00aa,  300, PSDRV_AGLGlyphNames + 1071,
-		{  127,  412,  421,  768 }, NULL	/* ordfeminine */
-    },
-    {
-	171, 0x00ab,  500, PSDRV_AGLGlyphNames +  950,
-		{  117,   62,  514,  447 }, NULL	/* guillemotleft */
-    },
-    {
-	 -1, 0x00ac,  500, PSDRV_AGLGlyphNames + 1009,
-		{   88,  105,  560,  401 }, NULL	/* logicalnot */
-    },
-    {
-	 -1, 0x00ae,  830, PSDRV_AGLGlyphNames + 1135,
-		{   93,  -18,  897,  768 }, NULL	/* registered */
-    },
-    {
-	 -1, 0x00b0,  400, PSDRV_AGLGlyphNames +  856,
-		{  174,  450,  481,  750 }, NULL	/* degree */
-    },
-    {
-	 -1, 0x00b1,  500, PSDRV_AGLGlyphNames + 1106,
-		{   23,  -15,  556,  513 }, NULL	/* plusminus */
-    },
-    {
-	 -1, 0x00b2,  300, PSDRV_AGLGlyphNames + 1210,
-		{   77,  300,  425,  752 }, NULL	/* twosuperior */
-    },
-    {
-	 -1, 0x00b3,  300, PSDRV_AGLGlyphNames + 1194,
-		{   96,  290,  416,  751 }, NULL	/* threesuperior */
-    },
-    {
-	194, 0x00b4,  333, PSDRV_AGLGlyphNames +  500,
-		{  217,  629,  497,  775 }, NULL	/* acute */
-    },
-    {
-	182, 0x00b6,  550, PSDRV_AGLGlyphNames + 1080,
-		{  139, -116,  685,  750 }, NULL	/* paragraph */
-    },
-    {
-	180, 0x00b7,  333, PSDRV_AGLGlyphNames + 1096,
-		{  140,  183,  300,  315 }, NULL	/* periodcentered */
-    },
-    {
-	203, 0x00b8,  333, PSDRV_AGLGlyphNames +  821,
-		{   -4, -228,  248,    0 }, NULL	/* cedilla */
-    },
-    {
-	 -1, 0x00b9,  300, PSDRV_AGLGlyphNames + 1068,
-		{  180,  300,  410,  750 }, NULL	/* onesuperior */
-    },
-    {
-	235, 0x00ba,  300, PSDRV_AGLGlyphNames + 1072,
-		{  133,  412,  417,  768 }, NULL	/* ordmasculine */
-    },
-    {
-	187, 0x00bb,  500, PSDRV_AGLGlyphNames +  951,
-		{   94,   62,  491,  447 }, NULL	/* guillemotright */
-    },
-    {
-	 -1, 0x00bc,  750, PSDRV_AGLGlyphNames + 1067,
-		{  131,    0,  788,  750 }, NULL	/* onequarter */
-    },
-    {
-	 -1, 0x00bd,  750, PSDRV_AGLGlyphNames + 1064,
-		{  108,    0,  813,  750 }, NULL	/* onehalf */
-    },
-    {
-	 -1, 0x00be,  750, PSDRV_AGLGlyphNames + 1192,
-		{   96,    0,  816,  751 }, NULL	/* threequarters */
-    },
-    {
-	191, 0x00bf,  500, PSDRV_AGLGlyphNames + 1115,
-		{   54, -190,  476,  579 }, NULL	/* questiondown */
-    },
-    {
-	 -1, 0x00c0,  556, PSDRV_AGLGlyphNames +   13,
-		{    9,    0,  547,  961 }, NULL	/* Agrave */
-    },
-    {
-	 -1, 0x00c1,  556, PSDRV_AGLGlyphNames +    4,
-		{    9,    0,  648,  961 }, NULL	/* Aacute */
-    },
-    {
-	 -1, 0x00c2,  556, PSDRV_AGLGlyphNames +    7,
-		{    9,    0,  617,  956 }, NULL	/* Acircumflex */
-    },
-    {
-	 -1, 0x00c3,  556, PSDRV_AGLGlyphNames +   23,
-		{    9,    0,  660,  930 }, NULL	/* Atilde */
-    },
-    {
-	 -1, 0x00c4,  556, PSDRV_AGLGlyphNames +   11,
-		{    9,    0,  641,  945 }, NULL	/* Adieresis */
-    },
-    {
-	 -1, 0x00c5,  556, PSDRV_AGLGlyphNames +   19,
-		{    9,    0,  575,  991 }, NULL	/* Aring */
-    },
-    {
-	225, 0x00c6,  778, PSDRV_AGLGlyphNames +    1,
-		{  -22,    0,  909,  750 }, NULL	/* AE */
-    },
-    {
-	 -1, 0x00c7,  556, PSDRV_AGLGlyphNames +   34,
-		{   99, -228,  630,  768 }, NULL	/* Ccedilla */
-    },
-    {
-	 -1, 0x00c8,  500, PSDRV_AGLGlyphNames +   62,
-		{   64,    0,  617,  961 }, NULL	/* Egrave */
-    },
-    {
-	 -1, 0x00c9,  500, PSDRV_AGLGlyphNames +   53,
-		{   64,    0,  620,  961 }, NULL	/* Eacute */
-    },
-    {
-	 -1, 0x00ca,  500, PSDRV_AGLGlyphNames +   57,
-		{   64,    0,  617,  956 }, NULL	/* Ecircumflex */
-    },
-    {
-	 -1, 0x00cb,  500, PSDRV_AGLGlyphNames +   59,
-		{   64,    0,  617,  945 }, NULL	/* Edieresis */
-    },
-    {
-	 -1, 0x00cc,  278, PSDRV_AGLGlyphNames +  109,
-		{   69,    0,  396,  961 }, NULL	/* Igrave */
-    },
-    {
-	 -1, 0x00cd,  278, PSDRV_AGLGlyphNames +   99,
-		{   69,    0,  509,  961 }, NULL	/* Iacute */
-    },
-    {
-	 -1, 0x00ce,  278, PSDRV_AGLGlyphNames +  102,
-		{   69,    0,  488,  956 }, NULL	/* Icircumflex */
-    },
-    {
-	 -1, 0x00cf,  278, PSDRV_AGLGlyphNames +  104,
-		{   69,    0,  502,  945 }, NULL	/* Idieresis */
-    },
-    {
-	 -1, 0x00d0,  611, PSDRV_AGLGlyphNames +   72,
-		{   72,    0,  662,  750 }, NULL	/* Eth */
-    },
-    {
-	 -1, 0x00d1,  611, PSDRV_AGLGlyphNames +  145,
-		{   68,    0,  702,  930 }, NULL	/* Ntilde */
-    },
-    {
-	 -1, 0x00d2,  611, PSDRV_AGLGlyphNames +  159,
-		{  105,  -18,  664,  961 }, NULL	/* Ograve */
-    },
-    {
-	 -1, 0x00d3,  611, PSDRV_AGLGlyphNames +  151,
-		{  105,  -18,  675,  961 }, NULL	/* Oacute */
-    },
-    {
-	 -1, 0x00d4,  611, PSDRV_AGLGlyphNames +  154,
-		{  105,  -18,  664,  956 }, NULL	/* Ocircumflex */
-    },
-    {
-	 -1, 0x00d5,  611, PSDRV_AGLGlyphNames +  172,
-		{  105,  -18,  687,  930 }, NULL	/* Otilde */
-    },
-    {
-	 -1, 0x00d6,  611, PSDRV_AGLGlyphNames +  156,
-		{  105,  -18,  668,  945 }, NULL	/* Odieresis */
-    },
-    {
-	 -1, 0x00d7,  500, PSDRV_AGLGlyphNames + 1024,
-		{   48,   22,  560,  476 }, NULL	/* multiply */
-    },
-    {
-	233, 0x00d8,  611, PSDRV_AGLGlyphNames +  168,
-		{   34,  -38,  736,  779 }, NULL	/* Oslash */
-    },
-    {
-	 -1, 0x00d9,  611, PSDRV_AGLGlyphNames +  256,
-		{  105,  -18,  703,  961 }, NULL	/* Ugrave */
-    },
-    {
-	 -1, 0x00da,  611, PSDRV_AGLGlyphNames +  249,
-		{  105,  -18,  703,  961 }, NULL	/* Uacute */
-    },
-    {
-	 -1, 0x00db,  611, PSDRV_AGLGlyphNames +  252,
-		{  105,  -18,  703,  956 }, NULL	/* Ucircumflex */
-    },
-    {
-	 -1, 0x00dc,  611, PSDRV_AGLGlyphNames +  254,
-		{  105,  -18,  703,  945 }, NULL	/* Udieresis */
-    },
-    {
-	 -1, 0x00dd,  556, PSDRV_AGLGlyphNames +  281,
-		{  171,    0,  704,  961 }, NULL	/* Yacute */
-    },
-    {
-	 -1, 0x00de,  556, PSDRV_AGLGlyphNames +  244,
-		{   68,    0,  625,  750 }, NULL	/* Thorn */
-    },
-    {
-	251, 0x00df,  500, PSDRV_AGLGlyphNames +  943,
-		{   60,  -15,  561,  768 }, NULL	/* germandbls */
-    },
-    {
-	 -1, 0x00e0,  500, PSDRV_AGLGlyphNames +  750,
-		{   68,  -15,  525,  775 }, NULL	/* agrave */
-    },
-    {
-	 -1, 0x00e1,  500, PSDRV_AGLGlyphNames +  497,
-		{   68,  -15,  581,  775 }, NULL	/* aacute */
-    },
-    {
-	 -1, 0x00e2,  500, PSDRV_AGLGlyphNames +  499,
-		{   68,  -15,  560,  770 }, NULL	/* acircumflex */
-    },
-    {
-	 -1, 0x00e3,  500, PSDRV_AGLGlyphNames +  786,
-		{   68,  -15,  592,  744 }, NULL	/* atilde */
-    },
-    {
-	 -1, 0x00e4,  500, PSDRV_AGLGlyphNames +  502,
-		{   68,  -15,  573,  759 }, NULL	/* adieresis */
-    },
-    {
-	 -1, 0x00e5,  500, PSDRV_AGLGlyphNames +  764,
-		{   68,  -15,  525,  835 }, NULL	/* aring */
-    },
-    {
-	241, 0x00e6,  722, PSDRV_AGLGlyphNames +  503,
-		{   69,  -15,  762,  579 }, NULL	/* ae */
-    },
-    {
-	 -1, 0x00e7,  444, PSDRV_AGLGlyphNames +  818,
-		{   66, -228,  496,  579 }, NULL	/* ccedilla */
-    },
-    {
-	 -1, 0x00e8,  500, PSDRV_AGLGlyphNames +  885,
-		{   88,  -15,  530,  775 }, NULL	/* egrave */
-    },
-    {
-	 -1, 0x00e9,  500, PSDRV_AGLGlyphNames +  879,
-		{   88,  -15,  581,  775 }, NULL	/* eacute */
-    },
-    {
-	 -1, 0x00ea,  500, PSDRV_AGLGlyphNames +  882,
-		{   88,  -15,  560,  770 }, NULL	/* ecircumflex */
-    },
-    {
-	 -1, 0x00eb,  500, PSDRV_AGLGlyphNames +  883,
-		{   88,  -15,  573,  759 }, NULL	/* edieresis */
-    },
-    {
-	 -1, 0x00ec,  278, PSDRV_AGLGlyphNames +  969,
-		{   74,    0,  357,  775 }, NULL	/* igrave */
-    },
-    {
-	 -1, 0x00ed,  278, PSDRV_AGLGlyphNames +  965,
-		{   74,    0,  470,  775 }, NULL	/* iacute */
-    },
-    {
-	 -1, 0x00ee,  278, PSDRV_AGLGlyphNames +  967,
-		{   74,    0,  439,  770 }, NULL	/* icircumflex */
-    },
-    {
-	 -1, 0x00ef,  278, PSDRV_AGLGlyphNames +  968,
-		{   74,    0,  462,  759 }, NULL	/* idieresis */
-    },
-    {
-	 -1, 0x00f0,  500, PSDRV_AGLGlyphNames +  906,
-		{   88,  -15,  540,  779 }, NULL	/* eth */
-    },
-    {
-	 -1, 0x00f1,  500, PSDRV_AGLGlyphNames + 1041,
-		{   61,    0,  592,  744 }, NULL	/* ntilde */
-    },
-    {
-	 -1, 0x00f2,  500, PSDRV_AGLGlyphNames + 1051,
-		{   88,  -15,  531,  775 }, NULL	/* ograve */
-    },
-    {
-	 -1, 0x00f3,  500, PSDRV_AGLGlyphNames + 1045,
-		{   88,  -15,  581,  775 }, NULL	/* oacute */
-    },
-    {
-	 -1, 0x00f4,  500, PSDRV_AGLGlyphNames + 1047,
-		{   88,  -15,  560,  770 }, NULL	/* ocircumflex */
-    },
-    {
-	 -1, 0x00f5,  500, PSDRV_AGLGlyphNames + 1077,
-		{   88,  -15,  592,  744 }, NULL	/* otilde */
-    },
-    {
-	 -1, 0x00f6,  500, PSDRV_AGLGlyphNames + 1048,
-		{   88,  -15,  573,  759 }, NULL	/* odieresis */
-    },
-    {
-	 -1, 0x00f7,  500, PSDRV_AGLGlyphNames +  863,
-		{   67,    6,  540,  492 }, NULL	/* divide */
-    },
-    {
-	249, 0x00f8,  500, PSDRV_AGLGlyphNames + 1074,
-		{    2,  -58,  616,  617 }, NULL	/* oslash */
-    },
-    {
-	 -1, 0x00f9,  500, PSDRV_AGLGlyphNames + 1217,
-		{   78,  -15,  551,  775 }, NULL	/* ugrave */
-    },
-    {
-	 -1, 0x00fa,  500, PSDRV_AGLGlyphNames + 1213,
-		{   78,  -15,  581,  775 }, NULL	/* uacute */
-    },
-    {
-	 -1, 0x00fb,  500, PSDRV_AGLGlyphNames + 1215,
-		{   78,  -15,  562,  780 }, NULL	/* ucircumflex */
-    },
-    {
-	 -1, 0x00fc,  500, PSDRV_AGLGlyphNames + 1216,
-		{   78,  -15,  573,  759 }, NULL	/* udieresis */
-    },
-    {
-	 -1, 0x00fd,  444, PSDRV_AGLGlyphNames + 1244,
-		{   36, -195,  553,  775 }, NULL	/* yacute */
-    },
-    {
-	 -1, 0x00fe,  500, PSDRV_AGLGlyphNames + 1187,
-		{   18, -189,  529,  750 }, NULL	/* thorn */
-    },
-    {
-	 -1, 0x00ff,  444, PSDRV_AGLGlyphNames + 1246,
-		{   36, -195,  549,  759 }, NULL	/* ydieresis */
-    },
-    {
-	245, 0x0131,  278, PSDRV_AGLGlyphNames +  873,
-		{   74,    0,  324,  564 }, NULL	/* dotlessi */
-    },
-    {
-	232, 0x0141,  500, PSDRV_AGLGlyphNames +  132,
-		{   49,    0,  497,  750 }, NULL	/* Lslash */
-    },
-    {
-	248, 0x0142,  278, PSDRV_AGLGlyphNames + 1013,
-		{   68,    0,  391,  750 }, NULL	/* lslash */
-    },
-    {
-	234, 0x0152,  833, PSDRV_AGLGlyphNames +  149,
-		{  111,  -18,  951,  768 }, NULL	/* OE */
-    },
-    {
-	250, 0x0153,  722, PSDRV_AGLGlyphNames + 1049,
-		{   81,  -15,  763,  579 }, NULL	/* oe */
-    },
-    {
-	 -1, 0x0160,  556, PSDRV_AGLGlyphNames +  231,
-		{   85,  -18,  656,  946 }, NULL	/* Scaron */
-    },
-    {
-	 -1, 0x0161,  444, PSDRV_AGLGlyphNames + 1147,
-		{   56,  -15,  551,  760 }, NULL	/* scaron */
-    },
-    {
-	 -1, 0x0178,  556, PSDRV_AGLGlyphNames +  284,
-		{  171,    0,  704,  945 }, NULL	/* Ydieresis */
-    },
-    {
-	 -1, 0x017d,  500, PSDRV_AGLGlyphNames +  290,
-		{   33,    0,  628,  946 }, NULL	/* Zcaron */
-    },
-    {
-	 -1, 0x017e,  389, PSDRV_AGLGlyphNames + 1251,
-		{   23,    0,  533,  760 }, NULL	/* zcaron */
-    },
-    {
-	166, 0x0192,  500, PSDRV_AGLGlyphNames +  928,
-		{  -28, -185,  651,  763 }, NULL	/* florin */
-    },
-    {
-	195, 0x02c6,  333, PSDRV_AGLGlyphNames +  831,
-		{  127,  644,  480,  790 }, NULL	/* circumflex */
-    },
-    {
-	207, 0x02c7,  333, PSDRV_AGLGlyphNames +  815,
-		{  156,  634,  509,  780 }, NULL	/* caron */
-    },
-    {
-	197, 0x02c9,  333, PSDRV_AGLGlyphNames + 1017,
-		{  136,  666,  497,  740 }, NULL	/* macron */
-    },
-    {
-	198, 0x02d8,  333, PSDRV_AGLGlyphNames +  809,
-		{  161,  635,  501,  780 }, NULL	/* breve */
-    },
-    {
-	199, 0x02d9,  333, PSDRV_AGLGlyphNames +  871,
-		{  240,  644,  391,  759 }, NULL	/* dotaccent */
-    },
-    {
-	202, 0x02da,  333, PSDRV_AGLGlyphNames + 1141,
-		{  215,  632,  432,  845 }, NULL	/* ring */
-    },
-    {
-	206, 0x02db,  333, PSDRV_AGLGlyphNames + 1050,
-		{   63, -205,  256,    0 }, NULL	/* ogonek */
-    },
-    {
-	196, 0x02dc,  333, PSDRV_AGLGlyphNames + 1195,
-		{  119,  636,  512,  764 }, NULL	/* tilde */
-    },
-    {
-	205, 0x02dd,  333, PSDRV_AGLGlyphNames +  960,
-		{  118,  634,  613,  780 }, NULL	/* hungarumlaut */
-    },
-    {
-	 -1, 0x03bc,  500, PSDRV_AGLGlyphNames + 1023,
-		{   18, -189,  551,  564 }, NULL	/* mu */
-    },
-    {
-	177, 0x2013,  500, PSDRV_AGLGlyphNames +  895,
-		{   55,  259,  578,  369 }, NULL	/* endash */
-    },
-    {
-	208, 0x2014, 1000, PSDRV_AGLGlyphNames +  893,
-		{   55,  259, 1078,  369 }, NULL	/* emdash */
-    },
-    {
-	 96, 0x2018,  278, PSDRV_AGLGlyphNames + 1122,
-		{  181,  495,  360,  766 }, NULL	/* quoteleft */
-    },
-    {
-	 39, 0x2019,  278, PSDRV_AGLGlyphNames + 1124,
-		{  183,  479,  361,  750 }, NULL	/* quoteright */
-    },
-    {
-	184, 0x201a,  278, PSDRV_AGLGlyphNames + 1125,
-		{   58, -138,  235,  132 }, NULL	/* quotesinglbase */
-    },
-    {
-	170, 0x201c,  500, PSDRV_AGLGlyphNames + 1120,
-		{  192,  495,  568,  766 }, NULL	/* quotedblleft */
-    },
-    {
-	186, 0x201d,  500, PSDRV_AGLGlyphNames + 1121,
-		{  197,  479,  572,  750 }, NULL	/* quotedblright */
-    },
-    {
-	185, 0x201e,  500, PSDRV_AGLGlyphNames + 1119,
-		{   67, -138,  441,  132 }, NULL	/* quotedblbase */
-    },
-    {
-	178, 0x2020,  500, PSDRV_AGLGlyphNames +  849,
-		{  127, -155,  577,  768 }, NULL	/* dagger */
-    },
-    {
-	179, 0x2021,  500, PSDRV_AGLGlyphNames +  850,
-		{   51, -161,  579,  768 }, NULL	/* daggerdbl */
-    },
-    {
-	183, 0x2022,  420, PSDRV_AGLGlyphNames +  812,
-		{   97,  186,  482,  562 }, NULL	/* bullet */
-    },
-    {
-	188, 0x2026, 1000, PSDRV_AGLGlyphNames +  891,
-		{  101,    0,  927,  132 }, NULL	/* ellipsis */
-    },
-    {
-	189, 0x2030, 1111, PSDRV_AGLGlyphNames + 1100,
-		{  128,  -18, 1141,  748 }, NULL	/* perthousand */
-    },
-    {
-	172, 0x2039,  278, PSDRV_AGLGlyphNames +  952,
-		{  101,   62,  310,  447 }, NULL	/* guilsinglleft */
-    },
-    {
-	173, 0x203a,  278, PSDRV_AGLGlyphNames +  953,
-		{   76,   62,  285,  447 }, NULL	/* guilsinglright */
-    },
-    {
-	 -1, 0x2122,  860, PSDRV_AGLGlyphNames + 1198,
-		{  144,  346,  933,  750 }, NULL	/* trademark */
-    },
-    {
-	 -1, 0x2212,  500, PSDRV_AGLGlyphNames + 1020,
-		{   67,  194,  540,  304 }, NULL	/* minus */
-    },
-    {
-	164, 0x2215,  167, PSDRV_AGLGlyphNames +  934,
-		{ -169,    0,  488,  738 }, NULL	/* fraction */
-    },
-    {
-	174, 0xfb01,  500, PSDRV_AGLGlyphNames +  918,
-		{   60,    0,  605,  750 }, NULL	/* fi */
-    },
-    {
-	175, 0xfb02,  500, PSDRV_AGLGlyphNames +  927,
-		{   60,    0,  602,  750 }, NULL	/* fl */
-    }
-};
-
-
-/*
- *  Font metrics
- */
-
-AFM PSDRV_Helvetica_Condensed_BoldObl =
-{
-    "Helvetica-Condensed-BoldObl",		/* FontName */
-    "Helvetica Condensed Bold Oblique",		/* FullName */
-    "Helvetica",				/* FamilyName */
-    "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
-    -12,					/* ItalicAngle */
-    FALSE,					/* IsFixedPitch */
-    -100,					/* UnderlinePosition */
-    50,						/* UnderlineThickness */
-    { -169, -250, 1141, 991 },			/* FontBBox */
-    750,					/* CapHeight */
-    564,					/* XHeight */
-    750,					/* Ascender */
-    -189,					/* Descender */
-    991,					/* FullAscender */
-    {
-	1000,				/* WinMetrics.usUnitsPerEm */
-	991,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	750,				/* WinMetrics.sTypoAscender */
-	-188,				/* WinMetrics.sTypoDescender */
-	262,				/* WinMetrics.sTypoLineGap */
-	991,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
-    },
-    {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[10] - CharWidths[19] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[20] - CharWidths[29] */
-	0, 0, 250, 333, 333, 500, 500, 	/* CharWidths[30] - CharWidths[36] */
-	833, 667, 250, 333, 333, 500, 	/* CharWidths[37] - CharWidths[42] */
-	500, 333, 333, 333, 278, 500, 	/* CharWidths[43] - CharWidths[48] */
-	500, 500, 500, 500, 500, 500, 	/* CharWidths[49] - CharWidths[54] */
-	500, 500, 500, 278, 278, 500, 	/* CharWidths[55] - CharWidths[60] */
-	500, 500, 500, 833, 556, 556, 	/* CharWidths[61] - CharWidths[66] */
-	556, 611, 500, 500, 611, 611, 	/* CharWidths[67] - CharWidths[72] */
-	278, 444, 556, 500, 778, 611, 	/* CharWidths[73] - CharWidths[78] */
-	611, 556, 611, 611, 556, 500, 	/* CharWidths[79] - CharWidths[84] */
-	611, 556, 833, 556, 556, 500, 	/* CharWidths[85] - CharWidths[90] */
-	333, 250, 333, 500, 500, 333, 	/* CharWidths[91] - CharWidths[96] */
-	500, 500, 444, 500, 500, 278, 	/* CharWidths[97] - CharWidths[102] */
-	500, 500, 278, 278, 444, 278, 	/* CharWidths[103] - CharWidths[108] */
-	778, 500, 500, 500, 500, 333, 	/* CharWidths[109] - CharWidths[114] */
-	444, 278, 500, 444, 667, 444, 	/* CharWidths[115] - CharWidths[120] */
-	444, 389, 274, 250, 274, 500, 	/* CharWidths[121] - CharWidths[126] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[127] - CharWidths[136] */
-	0, 0, 0, 0, 0, 0, 0, 0, 278, 	/* CharWidths[137] - CharWidths[145] */
-	278, 500, 500, 420, 500, 1000, 	/* CharWidths[146] - CharWidths[151] */
-	0, 0, 0, 0, 0, 0, 0, 0, 250, 	/* CharWidths[152] - CharWidths[160] */
-	333, 500, 500, 500, 500, 250, 	/* CharWidths[161] - CharWidths[166] */
-	500, 333, 830, 500, 500, 500, 	/* CharWidths[167] - CharWidths[172] */
-	333, 830, 333, 400, 500, 300, 	/* CharWidths[173] - CharWidths[178] */
-	300, 333, 0, 550, 333, 333, 	/* CharWidths[179] - CharWidths[184] */
-	300, 500, 500, 750, 750, 750, 	/* CharWidths[185] - CharWidths[190] */
-	500, 0, 333, 333, 333, 333, 	/* CharWidths[191] - CharWidths[196] */
-	333, 333, 333, 333, 0, 333, 	/* CharWidths[197] - CharWidths[202] */
-	333, 0, 333, 333, 333, 1000, 	/* CharWidths[203] - CharWidths[208] */
-	0, 0, 0, 0, 0, 0, 500, 0, 0, 	/* CharWidths[209] - CharWidths[217] */
-	0, 0, 0, 0, 0, 0, 0, 778, 0, 	/* CharWidths[218] - CharWidths[226] */
-	300, 0, 0, 0, 0, 500, 611, 	/* CharWidths[227] - CharWidths[233] */
-	833, 300, 0, 0, 0, 0, 0, 722, 	/* CharWidths[234] - CharWidths[241] */
-	0, 0, 0, 278, 0, 500, 278, 	/* CharWidths[242] - CharWidths[248] */
-	500, 722, 500, 0, 0, 0, 0	/* CharWidths[249] - CharWidths[255] */
-    },
-    228,					/* NumofMetrics */
-    met_Helvetica_Condensed_BoldObl,		/* Metrics */
-    &PSDRV_AdobeGlyphList			/* Encoding */
-};
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed_Oblique.c ./dlls/wineps/data/Helvetica_Condensed_Oblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Condensed_Oblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Condensed_Oblique.c	Wed Dec 31 18:00:00 1969
@@ -1,1015 +0,0 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica Condensed Oblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	This data is derived from the Adobe Font Metrics files at
- *
- *	    ftp://ftp.adobe.com/pub/adobe/type/win/all/afmfiles/base35/
- *
- *	which are Copyright 1985-1992 Adobe Systems Incorporated.
- *
- */
-
-#include "psdrv.h"
-
-
-/*
- *  Glyph metrics
- */
-
-static AFMMETRICS met_Helvetica_Condensed_Oblique[228] = 
-{
-    {
-	 32, 0x0020,  250, PSDRV_AGLGlyphNames + 1169,
-		{    0,    0,    0,    0 }, NULL	/* space */
-    },
-    {
-	 33, 0x0021,  333, PSDRV_AGLGlyphNames +  907,
-		{  121,    0,  371,  750 }, NULL	/* exclam */
-    },
-    {
-	 34, 0x0022,  250, PSDRV_AGLGlyphNames + 1118,
-		{  153,  513,  364,  739 }, NULL	/* quotedbl */
-    },
-    {
-	 35, 0x0023,  500, PSDRV_AGLGlyphNames + 1043,
-		{   33,    0,  621,  750 }, NULL	/* numbersign */
-    },
-    {
-	 36, 0x0024,  500, PSDRV_AGLGlyphNames +  866,
-		{   69, -116,  569,  815 }, NULL	/* dollar */
-    },
-    {
-	 37, 0x0025,  833, PSDRV_AGLGlyphNames + 1094,
-		{  164,  -15,  803,  750 }, NULL	/* percent */
-    },
-    {
-	 38, 0x0026,  667, PSDRV_AGLGlyphNames +  755,
-		{  111,  -18,  648,  750 }, NULL	/* ampersand */
-    },
-    {
-	169, 0x0027,  250, PSDRV_AGLGlyphNames + 1126,
-		{  208,  513,  308,  739 }, NULL	/* quotesingle */
-    },
-    {
-	 40, 0x0028,  333, PSDRV_AGLGlyphNames + 1081,
-		{  115, -215,  443,  750 }, NULL	/* parenleft */
-    },
-    {
-	 41, 0x0029,  333, PSDRV_AGLGlyphNames + 1087,
-		{    3, -215,  331,  750 }, NULL	/* parenright */
-    },
-    {
-	 42, 0x002a,  500, PSDRV_AGLGlyphNames +  782,
-		{  229,  455,  537,  750 }, NULL	/* asterisk */
-    },
-    {
-	 43, 0x002b,  500, PSDRV_AGLGlyphNames + 1105,
-		{   91,    0,  518,  505 }, NULL	/* plus */
-    },
-    {
-	 44, 0x002c,  250, PSDRV_AGLGlyphNames +  835,
-		{   49, -146,  192,  100 }, NULL	/* comma */
-    },
-    {
-	 45, 0x002d,  333, PSDRV_AGLGlyphNames +  961,
-		{  103,  275,  364,  358 }, NULL	/* hyphen */
-    },
-    {
-	 46, 0x002e,  250, PSDRV_AGLGlyphNames + 1095,
-		{   80,    0,  192,  100 }, NULL	/* period */
-    },
-    {
-	 47, 0x002f,  278, PSDRV_AGLGlyphNames + 1167,
-		{  -19,  -27,  450,  750 }, NULL	/* slash */
-    },
-    {
-	 48, 0x0030,  500, PSDRV_AGLGlyphNames + 1253,
-		{   98,  -15,  563,  750 }, NULL	/* zero */
-    },
-    {
-	 49, 0x0031,  500, PSDRV_AGLGlyphNames + 1060,
-		{  190,    0,  476,  750 }, NULL	/* one */
-    },
-    {
-	 50, 0x0032,  500, PSDRV_AGLGlyphNames + 1206,
-		{   44,    0,  562,  750 }, NULL	/* two */
-    },
-    {
-	 51, 0x0033,  500, PSDRV_AGLGlyphNames + 1188,
-		{   73,  -15,  552,  750 }, NULL	/* three */
-    },
-    {
-	 52, 0x0034,  500, PSDRV_AGLGlyphNames +  930,
-		{   68,    0,  543,  750 }, NULL	/* four */
-    },
-    {
-	 53, 0x0035,  500, PSDRV_AGLGlyphNames +  922,
-		{   75,  -15,  575,  735 }, NULL	/* five */
-    },
-    {
-	 54, 0x0036,  500, PSDRV_AGLGlyphNames + 1163,
-		{   91,  -15,  566,  750 }, NULL	/* six */
-    },
-    {
-	 55, 0x0037,  500, PSDRV_AGLGlyphNames + 1154,
-		{  116,    0,  612,  735 }, NULL	/* seven */
-    },
-    {
-	 56, 0x0038,  500, PSDRV_AGLGlyphNames +  886,
-		{   83,  -15,  559,  750 }, NULL	/* eight */
-    },
-    {
-	 57, 0x0039,  500, PSDRV_AGLGlyphNames + 1032,
-		{   91,  -15,  566,  750 }, NULL	/* nine */
-    },
-    {
-	 58, 0x003a,  250, PSDRV_AGLGlyphNames +  833,
-		{   80,    0,  287,  547 }, NULL	/* colon */
-    },
-    {
-	 59, 0x003b,  250, PSDRV_AGLGlyphNames + 1153,
-		{   49, -146,  287,  547 }, NULL	/* semicolon */
-    },
-    {
-	 60, 0x003c,  500, PSDRV_AGLGlyphNames + 1003,
-		{   89,  -10,  569,  518 }, NULL	/* less */
-    },
-    {
-	 61, 0x003d,  500, PSDRV_AGLGlyphNames +  900,
-		{   70,  124,  539,  384 }, NULL	/* equal */
-    },
-    {
-	 62, 0x003e,  500, PSDRV_AGLGlyphNames +  948,
-		{   40,  -10,  520,  518 }, NULL	/* greater */
-    },
-    {
-	 63, 0x003f,  500, PSDRV_AGLGlyphNames + 1114,
-		{  169,    0,  586,  750 }, NULL	/* question */
-    },
-    {
-	 64, 0x0040,  800, PSDRV_AGLGlyphNames +  785,
-		{  106,  -15,  863,  750 }, NULL	/* at */
-    },
-    {
-	 65, 0x0041,  556, PSDRV_AGLGlyphNames +    0,
-		{   11,    0,  546,  750 }, NULL	/* A */
-    },
-    {
-	 66, 0x0042,  556, PSDRV_AGLGlyphNames +   25,
-		{   80,    0,  610,  750 }, NULL	/* B */
-    },
-    {
-	 67, 0x0043,  556, PSDRV_AGLGlyphNames +   29,
-		{  106,  -18,  624,  765 }, NULL	/* C */
-    },
-    {
-	 68, 0x0044,  611, PSDRV_AGLGlyphNames +   42,
-		{   82,    0,  653,  750 }, NULL	/* D */
-    },
-    {
-	 69, 0x0045,  500, PSDRV_AGLGlyphNames +   52,
-		{   74,    0,  608,  750 }, NULL	/* E */
-    },
-    {
-	 70, 0x0046,  444, PSDRV_AGLGlyphNames +   75,
-		{   74,    0,  585,  750 }, NULL	/* F */
-    },
-    {
-	 71, 0x0047,  611, PSDRV_AGLGlyphNames +   77,
-		{  109,  -18,  646,  765 }, NULL	/* G */
-    },
-    {
-	 72, 0x0048,  611, PSDRV_AGLGlyphNames +   87,
-		{   79,    0,  691,  750 }, NULL	/* H */
-    },
-    {
-	 73, 0x0049,  278, PSDRV_AGLGlyphNames +   97,
-		{   98,    0,  340,  750 }, NULL	/* I */
-    },
-    {
-	 74, 0x004a,  444, PSDRV_AGLGlyphNames +  118,
-		{   52,  -15,  527,  750 }, NULL	/* J */
-    },
-    {
-	 75, 0x004b,  556, PSDRV_AGLGlyphNames +  121,
-		{   79,    0,  698,  750 }, NULL	/* K */
-    },
-    {
-	 76, 0x004c,  500, PSDRV_AGLGlyphNames +  125,
-		{   83,    0,  488,  750 }, NULL	/* L */
-    },
-    {
-	 77, 0x004d,  778, PSDRV_AGLGlyphNames +  135,
-		{   76,    0,  861,  750 }, NULL	/* M */
-    },
-    {
-	 78, 0x004e,  611, PSDRV_AGLGlyphNames +  140,
-		{   77,    0,  693,  750 }, NULL	/* N */
-    },
-    {
-	 79, 0x004f,  611, PSDRV_AGLGlyphNames +  148,
-		{  116,  -18,  658,  765 }, NULL	/* O */
-    },
-    {
-	 80, 0x0050,  556, PSDRV_AGLGlyphNames +  174,
-		{   86,    0,  641,  750 }, NULL	/* P */
-    },
-    {
-	 81, 0x0051,  611, PSDRV_AGLGlyphNames +  179,
-		{  116,  -34,  659,  765 }, NULL	/* Q */
-    },
-    {
-	 82, 0x0052,  611, PSDRV_AGLGlyphNames +  181,
-		{   86,    0,  655,  750 }, NULL	/* R */
-    },
-    {
-	 83, 0x0053,  556, PSDRV_AGLGlyphNames +  189,
-		{   86,  -18,  611,  765 }, NULL	/* S */
-    },
-    {
-	 84, 0x0054,  500, PSDRV_AGLGlyphNames +  238,
-		{  158,    0,  645,  750 }, NULL	/* T */
-    },
-    {
-	 85, 0x0055,  611, PSDRV_AGLGlyphNames +  248,
-		{  114,  -18,  690,  750 }, NULL	/* U */
-    },
-    {
-	 86, 0x0056,  556, PSDRV_AGLGlyphNames +  269,
-		{  170,    0,  704,  750 }, NULL	/* V */
-    },
-    {
-	 87, 0x0057,  833, PSDRV_AGLGlyphNames +  271,
-		{  176,    0,  975,  750 }, NULL	/* W */
-    },
-    {
-	 88, 0x0058,  556, PSDRV_AGLGlyphNames +  277,
-		{   17,    0,  692,  750 }, NULL	/* X */
-    },
-    {
-	 89, 0x0059,  556, PSDRV_AGLGlyphNames +  280,
-		{  170,    0,  705,  750 }, NULL	/* Y */
-    },
-    {
-	 90, 0x005a,  500, PSDRV_AGLGlyphNames +  288,
-		{   28,    0,  627,  750 }, NULL	/* Z */
-    },
-    {
-	 91, 0x005b,  333, PSDRV_AGLGlyphNames +  801,
-		{   56, -209,  434,  750 }, NULL	/* bracketleft */
-    },
-    {
-	 92, 0x005c,  250, PSDRV_AGLGlyphNames +  788,
-		{  128,    0,  281,  750 }, NULL	/* backslash */
-    },
-    {
-	 93, 0x005d,  333, PSDRV_AGLGlyphNames +  805,
-		{   14, -209,  392,  750 }, NULL	/* bracketright */
-    },
-    {
-	 94, 0x005e,  500, PSDRV_AGLGlyphNames +  780,
-		{  141,  333,  502,  750 }, NULL	/* asciicircum */
-    },
-    {
-	 95, 0x005f,  500, PSDRV_AGLGlyphNames + 1221,
-		{  -27, -125,  484,  -75 }, NULL	/* underscore */
-    },
-    {
-	193, 0x0060,  333, PSDRV_AGLGlyphNames +  945,
-		{  198,  624,  366,  765 }, NULL	/* grave */
-    },
-    {
-	 97, 0x0061,  444, PSDRV_AGLGlyphNames +  295,
-		{   55,  -15,  465,  571 }, NULL	/* a */
-    },
-    {
-	 98, 0x0062,  500, PSDRV_AGLGlyphNames +  787,
-		{   75,  -15,  525,  750 }, NULL	/* b */
-    },
-    {
-	 99, 0x0063,  444, PSDRV_AGLGlyphNames +  813,
-		{   85,  -15,  488,  571 }, NULL	/* c */
-    },
-    {
-	100, 0x0064,  500, PSDRV_AGLGlyphNames +  848,
-		{   88,  -15,  583,  750 }, NULL	/* d */
-    },
-    {
-	101, 0x0065,  444, PSDRV_AGLGlyphNames +  878,
-		{   86,  -15,  476,  571 }, NULL	/* e */
-    },
-    {
-	102, 0x0066,  278, PSDRV_AGLGlyphNames +  913,
-		{   93,    0,  418,  752 }, NULL	/* f */
-    },
-    {
-	103, 0x0067,  500, PSDRV_AGLGlyphNames +  936,
-		{   53, -189,  544,  571 }, NULL	/* g */
-    },
-    {
-	104, 0x0068,  500, PSDRV_AGLGlyphNames +  954,
-		{   73,    0,  524,  750 }, NULL	/* h */
-    },
-    {
-	105, 0x0069,  222, PSDRV_AGLGlyphNames +  964,
-		{   72,    0,  310,  750 }, NULL	/* i */
-    },
-    {
-	106, 0x006a,  222, PSDRV_AGLGlyphNames +  989,
-		{  -27, -190,  313,  750 }, NULL	/* j */
-    },
-    {
-	107, 0x006b,  444, PSDRV_AGLGlyphNames +  991,
-		{   69,    0,  552,  750 }, NULL	/* k */
-    },
-    {
-	108, 0x006c,  222, PSDRV_AGLGlyphNames +  995,
-		{   72,    0,  310,  750 }, NULL	/* l */
-    },
-    {
-	109, 0x006d,  778, PSDRV_AGLGlyphNames + 1016,
-		{   76,    0,  799,  571 }, NULL	/* m */
-    },
-    {
-	110, 0x006e,  500, PSDRV_AGLGlyphNames + 1027,
-		{   73,    0,  524,  571 }, NULL	/* n */
-    },
-    {
-	111, 0x006f,  500, PSDRV_AGLGlyphNames + 1044,
-		{   96,  -15,  524,  571 }, NULL	/* o */
-    },
-    {
-	112, 0x0070,  500, PSDRV_AGLGlyphNames + 1079,
-		{   32, -188,  524,  571 }, NULL	/* p */
-    },
-    {
-	113, 0x0071,  500, PSDRV_AGLGlyphNames + 1113,
-		{  100, -184,  544,  571 }, NULL	/* q */
-    },
-    {
-	114, 0x0072,  333, PSDRV_AGLGlyphNames + 1127,
-		{   81,    0,  441,  563 }, NULL	/* r */
-    },
-    {
-	115, 0x0073,  444, PSDRV_AGLGlyphNames + 1145,
-		{   68,  -15,  473,  571 }, NULL	/* s */
-    },
-    {
-	116, 0x0074,  278, PSDRV_AGLGlyphNames + 1178,
-		{  101,    0,  375,  707 }, NULL	/* t */
-    },
-    {
-	117, 0x0075,  500, PSDRV_AGLGlyphNames + 1212,
-		{   99,  -15,  542,  556 }, NULL	/* u */
-    },
-    {
-	118, 0x0076,  444, PSDRV_AGLGlyphNames + 1234,
-		{  131,    0,  549,  556 }, NULL	/* v */
-    },
-    {
-	119, 0x0077,  667, PSDRV_AGLGlyphNames + 1235,
-		{  137,    0,  767,  556 }, NULL	/* w */
-    },
-    {
-	120, 0x0078,  444, PSDRV_AGLGlyphNames + 1241,
-		{    9,    0,  548,  556 }, NULL	/* x */
-    },
-    {
-	121, 0x0079,  444, PSDRV_AGLGlyphNames + 1243,
-		{  -13, -190,  543,  556 }, NULL	/* y */
-    },
-    {
-	122, 0x007a,  389, PSDRV_AGLGlyphNames + 1249,
-		{   24,    0,  482,  556 }, NULL	/* z */
-    },
-    {
-	123, 0x007b,  274, PSDRV_AGLGlyphNames +  793,
-		{   77,  -95,  425,  750 }, NULL	/* braceleft */
-    },
-    {
-	124, 0x007c,  250, PSDRV_AGLGlyphNames +  789,
-		{   40, -250,  316,  750 }, NULL	/* bar */
-    },
-    {
-	125, 0x007d,  274, PSDRV_AGLGlyphNames +  797,
-		{  -12,  -95,  337,  750 }, NULL	/* braceright */
-    },
-    {
-	126, 0x007e,  500, PSDRV_AGLGlyphNames +  781,
-		{   89,  166,  520,  345 }, NULL	/* asciitilde */
-    },
-    {
-	161, 0x00a1,  333, PSDRV_AGLGlyphNames +  909,
-		{   83, -179,  333,  571 }, NULL	/* exclamdown */
-    },
-    {
-	162, 0x00a2,  500, PSDRV_AGLGlyphNames +  822,
-		{   94, -137,  499,  667 }, NULL	/* cent */
-    },
-    {
-	163, 0x00a3,  500, PSDRV_AGLGlyphNames + 1173,
-		{   40,  -15,  589,  750 }, NULL	/* sterling */
-    },
-    {
-	168, 0x00a4,  500, PSDRV_AGLGlyphNames +  843,
-		{   51,   50,  576,  553 }, NULL	/* currency */
-    },
-    {
-	165, 0x00a5,  500, PSDRV_AGLGlyphNames + 1247,
-		{   88,    0,  677,  750 }, NULL	/* yen */
-    },
-    {
-	 -1, 0x00a6,  250, PSDRV_AGLGlyphNames +  810,
-		{   56, -175,  300,  675 }, NULL	/* brokenbar */
-    },
-    {
-	167, 0x00a7,  500, PSDRV_AGLGlyphNames + 1152,
-		{   51, -208,  552,  750 }, NULL	/* section */
-    },
-    {
-	200, 0x00a8,  333, PSDRV_AGLGlyphNames +  859,
-		{  190,  650,  440,  750 }, NULL	/* dieresis */
-    },
-    {
-	 -1, 0x00a9,  800, PSDRV_AGLGlyphNames +  840,
-		{   79,  -18,  880,  765 }, NULL	/* copyright */
-    },
-    {
-	227, 0x00aa,  300, PSDRV_AGLGlyphNames + 1071,
-		{  129,  413,  392,  765 }, NULL	/* ordfeminine */
-    },
-    {
-	171, 0x00ab,  500, PSDRV_AGLGlyphNames +  950,
-		{  145,  125,  520,  495 }, NULL	/* guillemotleft */
-    },
-    {
-	 -1, 0x00ac,  500, PSDRV_AGLGlyphNames + 1009,
-		{  111,  117,  539,  384 }, NULL	/* logicalnot */
-    },
-    {
-	 -1, 0x00ae,  800, PSDRV_AGLGlyphNames + 1135,
-		{   79,  -18,  881,  765 }, NULL	/* registered */
-    },
-    {
-	 -1, 0x00b0,  400, PSDRV_AGLGlyphNames +  856,
-		{  174,  450,  481,  750 }, NULL	/* degree */
-    },
-    {
-	 -1, 0x00b1,  500, PSDRV_AGLGlyphNames + 1106,
-		{   44,    0,  531,  505 }, NULL	/* plusminus */
-    },
-    {
-	 -1, 0x00b2,  300, PSDRV_AGLGlyphNames + 1210,
-		{   83,  300,  413,  750 }, NULL	/* twosuperior */
-    },
-    {
-	 -1, 0x00b3,  300, PSDRV_AGLGlyphNames + 1194,
-		{  102,  291,  409,  750 }, NULL	/* threesuperior */
-    },
-    {
-	194, 0x00b4,  333, PSDRV_AGLGlyphNames +  500,
-		{  233,  624,  461,  765 }, NULL	/* acute */
-    },
-    {
-	182, 0x00b6,  440, PSDRV_AGLGlyphNames + 1080,
-		{  113, -116,  550,  750 }, NULL	/* paragraph */
-    },
-    {
-	180, 0x00b7,  250, PSDRV_AGLGlyphNames + 1096,
-		{  123,  204,  236,  304 }, NULL	/* periodcentered */
-    },
-    {
-	203, 0x00b8,  333, PSDRV_AGLGlyphNames +  821,
-		{   23, -224,  255,    0 }, NULL	/* cedilla */
-    },
-    {
-	 -1, 0x00b9,  300, PSDRV_AGLGlyphNames + 1068,
-		{  200,  300,  392,  750 }, NULL	/* onesuperior */
-    },
-    {
-	235, 0x00ba,  300, PSDRV_AGLGlyphNames + 1072,
-		{  138,  413,  413,  765 }, NULL	/* ordmasculine */
-    },
-    {
-	187, 0x00bb,  500, PSDRV_AGLGlyphNames +  951,
-		{  112,  125,  487,  495 }, NULL	/* guillemotright */
-    },
-    {
-	 -1, 0x00bc,  750, PSDRV_AGLGlyphNames + 1067,
-		{  143,    0,  817,  750 }, NULL	/* onequarter */
-    },
-    {
-	 -1, 0x00bd,  750, PSDRV_AGLGlyphNames + 1064,
-		{   91,    0,  777,  750 }, NULL	/* onehalf */
-    },
-    {
-	 -1, 0x00be,  750, PSDRV_AGLGlyphNames + 1192,
-		{  106,    0,  831,  750 }, NULL	/* threequarters */
-    },
-    {
-	191, 0x00bf,  500, PSDRV_AGLGlyphNames + 1115,
-		{   33, -190,  450,  559 }, NULL	/* questiondown */
-    },
-    {
-	 -1, 0x00c0,  556, PSDRV_AGLGlyphNames +   13,
-		{   11,    0,  546,  959 }, NULL	/* Agrave */
-    },
-    {
-	 -1, 0x00c1,  556, PSDRV_AGLGlyphNames +    4,
-		{   11,    0,  614,  959 }, NULL	/* Aacute */
-    },
-    {
-	 -1, 0x00c2,  556, PSDRV_AGLGlyphNames +    7,
-		{   11,    0,  599,  959 }, NULL	/* Acircumflex */
-    },
-    {
-	 -1, 0x00c3,  556, PSDRV_AGLGlyphNames +   23,
-		{   11,    0,  649,  943 }, NULL	/* Atilde */
-    },
-    {
-	 -1, 0x00c4,  556, PSDRV_AGLGlyphNames +   11,
-		{   11,    0,  594,  944 }, NULL	/* Adieresis */
-    },
-    {
-	 -1, 0x00c5,  556, PSDRV_AGLGlyphNames +   19,
-		{   11,    0,  571,  990 }, NULL	/* Aring */
-    },
-    {
-	225, 0x00c6,  833, PSDRV_AGLGlyphNames +    1,
-		{    0,    0,  944,  750 }, NULL	/* AE */
-    },
-    {
-	 -1, 0x00c7,  556, PSDRV_AGLGlyphNames +   34,
-		{  106, -224,  624,  765 }, NULL	/* Ccedilla */
-    },
-    {
-	 -1, 0x00c8,  500, PSDRV_AGLGlyphNames +   62,
-		{   74,    0,  608,  959 }, NULL	/* Egrave */
-    },
-    {
-	 -1, 0x00c9,  500, PSDRV_AGLGlyphNames +   53,
-		{   74,    0,  608,  959 }, NULL	/* Eacute */
-    },
-    {
-	 -1, 0x00ca,  500, PSDRV_AGLGlyphNames +   57,
-		{   74,    0,  608,  959 }, NULL	/* Ecircumflex */
-    },
-    {
-	 -1, 0x00cb,  500, PSDRV_AGLGlyphNames +   59,
-		{   74,    0,  608,  944 }, NULL	/* Edieresis */
-    },
-    {
-	 -1, 0x00cc,  278, PSDRV_AGLGlyphNames +  109,
-		{   98,    0,  380,  959 }, NULL	/* Igrave */
-    },
-    {
-	 -1, 0x00cd,  278, PSDRV_AGLGlyphNames +   99,
-		{   98,    0,  475,  959 }, NULL	/* Iacute */
-    },
-    {
-	 -1, 0x00ce,  278, PSDRV_AGLGlyphNames +  102,
-		{   98,    0,  460,  959 }, NULL	/* Icircumflex */
-    },
-    {
-	 -1, 0x00cf,  278, PSDRV_AGLGlyphNames +  104,
-		{   98,    0,  455,  944 }, NULL	/* Idieresis */
-    },
-    {
-	 -1, 0x00d0,  611, PSDRV_AGLGlyphNames +   72,
-		{   82,    0,  650,  750 }, NULL	/* Eth */
-    },
-    {
-	 -1, 0x00d1,  611, PSDRV_AGLGlyphNames +  145,
-		{   77,    0,  693,  943 }, NULL	/* Ntilde */
-    },
-    {
-	 -1, 0x00d2,  611, PSDRV_AGLGlyphNames +  159,
-		{  116,  -18,  658,  959 }, NULL	/* Ograve */
-    },
-    {
-	 -1, 0x00d3,  611, PSDRV_AGLGlyphNames +  151,
-		{  116,  -18,  658,  959 }, NULL	/* Oacute */
-    },
-    {
-	 -1, 0x00d4,  611, PSDRV_AGLGlyphNames +  154,
-		{  116,  -18,  658,  959 }, NULL	/* Ocircumflex */
-    },
-    {
-	 -1, 0x00d5,  611, PSDRV_AGLGlyphNames +  172,
-		{  116,  -18,  676,  943 }, NULL	/* Otilde */
-    },
-    {
-	 -1, 0x00d6,  611, PSDRV_AGLGlyphNames +  156,
-		{  116,  -18,  658,  944 }, NULL	/* Odieresis */
-    },
-    {
-	 -1, 0x00d7,  500, PSDRV_AGLGlyphNames + 1024,
-		{   65,   48,  544,  461 }, NULL	/* multiply */
-    },
-    {
-	233, 0x00d8,  611, PSDRV_AGLGlyphNames +  168,
-		{   25,  -43,  738,  796 }, NULL	/* Oslash */
-    },
-    {
-	 -1, 0x00d9,  611, PSDRV_AGLGlyphNames +  256,
-		{  114,  -18,  690,  959 }, NULL	/* Ugrave */
-    },
-    {
-	 -1, 0x00da,  611, PSDRV_AGLGlyphNames +  249,
-		{  114,  -18,  690,  959 }, NULL	/* Uacute */
-    },
-    {
-	 -1, 0x00db,  611, PSDRV_AGLGlyphNames +  252,
-		{  114,  -18,  690,  959 }, NULL	/* Ucircumflex */
-    },
-    {
-	 -1, 0x00dc,  611, PSDRV_AGLGlyphNames +  254,
-		{  114,  -18,  690,  944 }, NULL	/* Udieresis */
-    },
-    {
-	 -1, 0x00dd,  556, PSDRV_AGLGlyphNames +  281,
-		{  170,    0,  705,  959 }, NULL	/* Yacute */
-    },
-    {
-	 -1, 0x00de,  556, PSDRV_AGLGlyphNames +  244,
-		{   86,    0,  618,  750 }, NULL	/* Thorn */
-    },
-    {
-	251, 0x00df,  500, PSDRV_AGLGlyphNames +  943,
-		{   71,   -5,  548,  765 }, NULL	/* germandbls */
-    },
-    {
-	 -1, 0x00e0,  444, PSDRV_AGLGlyphNames +  750,
-		{   55,  -15,  465,  765 }, NULL	/* agrave */
-    },
-    {
-	 -1, 0x00e1,  444, PSDRV_AGLGlyphNames +  497,
-		{   55,  -15,  517,  765 }, NULL	/* aacute */
-    },
-    {
-	 -1, 0x00e2,  444, PSDRV_AGLGlyphNames +  499,
-		{   55,  -15,  502,  765 }, NULL	/* acircumflex */
-    },
-    {
-	 -1, 0x00e3,  444, PSDRV_AGLGlyphNames +  786,
-		{   55,  -15,  552,  749 }, NULL	/* atilde */
-    },
-    {
-	 -1, 0x00e4,  444, PSDRV_AGLGlyphNames +  502,
-		{   55,  -15,  496,  750 }, NULL	/* adieresis */
-    },
-    {
-	 -1, 0x00e5,  444, PSDRV_AGLGlyphNames +  764,
-		{   55,  -15,  465,  826 }, NULL	/* aring */
-    },
-    {
-	241, 0x00e6,  667, PSDRV_AGLGlyphNames +  503,
-		{   50,  -15,  711,  571 }, NULL	/* ae */
-    },
-    {
-	 -1, 0x00e7,  444, PSDRV_AGLGlyphNames +  818,
-		{   79, -224,  488,  571 }, NULL	/* ccedilla */
-    },
-    {
-	 -1, 0x00e8,  444, PSDRV_AGLGlyphNames +  885,
-		{   86,  -15,  476,  765 }, NULL	/* egrave */
-    },
-    {
-	 -1, 0x00e9,  444, PSDRV_AGLGlyphNames +  879,
-		{   86,  -15,  517,  765 }, NULL	/* eacute */
-    },
-    {
-	 -1, 0x00ea,  444, PSDRV_AGLGlyphNames +  882,
-		{   86,  -15,  502,  765 }, NULL	/* ecircumflex */
-    },
-    {
-	 -1, 0x00eb,  444, PSDRV_AGLGlyphNames +  883,
-		{   86,  -15,  496,  750 }, NULL	/* edieresis */
-    },
-    {
-	 -1, 0x00ec,  222, PSDRV_AGLGlyphNames +  969,
-		{   72,    0,  311,  765 }, NULL	/* igrave */
-    },
-    {
-	 -1, 0x00ed,  222, PSDRV_AGLGlyphNames +  965,
-		{   72,    0,  406,  765 }, NULL	/* iacute */
-    },
-    {
-	 -1, 0x00ee,  222, PSDRV_AGLGlyphNames +  967,
-		{   72,    0,  391,  765 }, NULL	/* icircumflex */
-    },
-    {
-	 -1, 0x00ef,  222, PSDRV_AGLGlyphNames +  968,
-		{   72,    0,  385,  750 }, NULL	/* idieresis */
-    },
-    {
-	 -1, 0x00f0,  500, PSDRV_AGLGlyphNames +  906,
-		{   96,  -15,  525,  831 }, NULL	/* eth */
-    },
-    {
-	 -1, 0x00f1,  500, PSDRV_AGLGlyphNames + 1041,
-		{   73,    0,  580,  749 }, NULL	/* ntilde */
-    },
-    {
-	 -1, 0x00f2,  500, PSDRV_AGLGlyphNames + 1051,
-		{   96,  -15,  524,  765 }, NULL	/* ograve */
-    },
-    {
-	 -1, 0x00f3,  500, PSDRV_AGLGlyphNames + 1045,
-		{   96,  -15,  545,  765 }, NULL	/* oacute */
-    },
-    {
-	 -1, 0x00f4,  500, PSDRV_AGLGlyphNames + 1047,
-		{   96,  -15,  530,  765 }, NULL	/* ocircumflex */
-    },
-    {
-	 -1, 0x00f5,  500, PSDRV_AGLGlyphNames + 1077,
-		{   96,  -15,  580,  749 }, NULL	/* otilde */
-    },
-    {
-	 -1, 0x00f6,  500, PSDRV_AGLGlyphNames + 1048,
-		{   96,  -15,  524,  750 }, NULL	/* odieresis */
-    },
-    {
-	 -1, 0x00f7,  500, PSDRV_AGLGlyphNames +  863,
-		{   91,    3,  518,  505 }, NULL	/* divide */
-    },
-    {
-	249, 0x00f8,  500, PSDRV_AGLGlyphNames + 1074,
-		{   19,  -46,  591,  582 }, NULL	/* oslash */
-    },
-    {
-	 -1, 0x00f9,  500, PSDRV_AGLGlyphNames + 1217,
-		{   99,  -15,  542,  765 }, NULL	/* ugrave */
-    },
-    {
-	 -1, 0x00fa,  500, PSDRV_AGLGlyphNames + 1213,
-		{   99,  -15,  545,  765 }, NULL	/* uacute */
-    },
-    {
-	 -1, 0x00fb,  500, PSDRV_AGLGlyphNames + 1215,
-		{   99,  -15,  542,  765 }, NULL	/* ucircumflex */
-    },
-    {
-	 -1, 0x00fc,  500, PSDRV_AGLGlyphNames + 1216,
-		{   99,  -15,  542,  750 }, NULL	/* udieresis */
-    },
-    {
-	 -1, 0x00fd,  444, PSDRV_AGLGlyphNames + 1244,
-		{  -13, -190,  543,  765 }, NULL	/* yacute */
-    },
-    {
-	 -1, 0x00fe,  500, PSDRV_AGLGlyphNames + 1187,
-		{   32, -188,  523,  750 }, NULL	/* thorn */
-    },
-    {
-	 -1, 0x00ff,  444, PSDRV_AGLGlyphNames + 1246,
-		{  -13, -190,  543,  750 }, NULL	/* ydieresis */
-    },
-    {
-	245, 0x0131,  222, PSDRV_AGLGlyphNames +  873,
-		{   72,    0,  269,  556 }, NULL	/* dotlessi */
-    },
-    {
-	232, 0x0141,  500, PSDRV_AGLGlyphNames +  132,
-		{   39,    0,  488,  750 }, NULL	/* Lslash */
-    },
-    {
-	248, 0x0142,  222, PSDRV_AGLGlyphNames + 1013,
-		{   59,    0,  347,  750 }, NULL	/* lslash */
-    },
-    {
-	234, 0x0152,  833, PSDRV_AGLGlyphNames +  149,
-		{  113,  -18,  946,  765 }, NULL	/* OE */
-    },
-    {
-	250, 0x0153,  722, PSDRV_AGLGlyphNames + 1049,
-		{   81,  -15,  758,  571 }, NULL	/* oe */
-    },
-    {
-	 -1, 0x0160,  556, PSDRV_AGLGlyphNames +  231,
-		{   86,  -18,  629,  959 }, NULL	/* Scaron */
-    },
-    {
-	 -1, 0x0161,  444, PSDRV_AGLGlyphNames + 1147,
-		{   68,  -15,  532,  765 }, NULL	/* scaron */
-    },
-    {
-	 -1, 0x0178,  556, PSDRV_AGLGlyphNames +  284,
-		{  170,    0,  705,  944 }, NULL	/* Ydieresis */
-    },
-    {
-	 -1, 0x017d,  500, PSDRV_AGLGlyphNames +  290,
-		{   28,    0,  627,  959 }, NULL	/* Zcaron */
-    },
-    {
-	 -1, 0x017e,  389, PSDRV_AGLGlyphNames + 1251,
-		{   24,    0,  504,  765 }, NULL	/* zcaron */
-    },
-    {
-	166, 0x0192,  500, PSDRV_AGLGlyphNames +  928,
-		{  -28, -192,  645,  750 }, NULL	/* florin */
-    },
-    {
-	195, 0x02c6,  333, PSDRV_AGLGlyphNames +  831,
-		{  154,  624,  446,  765 }, NULL	/* circumflex */
-    },
-    {
-	207, 0x02c7,  333, PSDRV_AGLGlyphNames +  815,
-		{  184,  624,  476,  765 }, NULL	/* caron */
-    },
-    {
-	197, 0x02c9,  333, PSDRV_AGLGlyphNames + 1017,
-		{  150,  657,  475,  715 }, NULL	/* macron */
-    },
-    {
-	198, 0x02d8,  333, PSDRV_AGLGlyphNames +  809,
-		{  172,  629,  484,  765 }, NULL	/* breve */
-    },
-    {
-	199, 0x02d9,  250, PSDRV_AGLGlyphNames +  871,
-		{  224,  650,  324,  750 }, NULL	/* dotaccent */
-    },
-    {
-	202, 0x02da,  250, PSDRV_AGLGlyphNames + 1141,
-		{  169,  593,  377,  796 }, NULL	/* ring */
-    },
-    {
-	206, 0x02db,  333, PSDRV_AGLGlyphNames + 1050,
-		{  -23, -191,  188,   13 }, NULL	/* ogonek */
-    },
-    {
-	196, 0x02dc,  333, PSDRV_AGLGlyphNames + 1195,
-		{  132,  633,  496,  749 }, NULL	/* tilde */
-    },
-    {
-	205, 0x02dd,  333, PSDRV_AGLGlyphNames +  960,
-		{  194,  624,  603,  765 }, NULL	/* hungarumlaut */
-    },
-    {
-	 -1, 0x03bc,  500, PSDRV_AGLGlyphNames + 1023,
-		{   35, -189,  540,  556 }, NULL	/* mu */
-    },
-    {
-	177, 0x2013,  500, PSDRV_AGLGlyphNames +  895,
-		{   58,  275,  573,  345 }, NULL	/* endash */
-    },
-    {
-	208, 0x2014, 1000, PSDRV_AGLGlyphNames +  893,
-		{   58,  275, 1073,  345 }, NULL	/* emdash */
-    },
-    {
-	 96, 0x2018,  222, PSDRV_AGLGlyphNames + 1122,
-		{  175,  521,  321,  767 }, NULL	/* quoteleft */
-    },
-    {
-	 39, 0x2019,  222, PSDRV_AGLGlyphNames + 1124,
-		{  171,  504,  317,  750 }, NULL	/* quoteright */
-    },
-    {
-	184, 0x201a,  222, PSDRV_AGLGlyphNames + 1125,
-		{   33, -146,  179,  100 }, NULL	/* quotesinglbase */
-    },
-    {
-	170, 0x201c,  389, PSDRV_AGLGlyphNames + 1120,
-		{  173,  521,  490,  767 }, NULL	/* quotedblleft */
-    },
-    {
-	186, 0x201d,  389, PSDRV_AGLGlyphNames + 1121,
-		{  169,  504,  486,  750 }, NULL	/* quotedblright */
-    },
-    {
-	185, 0x201e,  389, PSDRV_AGLGlyphNames + 1119,
-		{   31, -146,  348,  100 }, NULL	/* quotedblbase */
-    },
-    {
-	178, 0x2020,  500, PSDRV_AGLGlyphNames +  849,
-		{  137, -176,  573,  750 }, NULL	/* dagger */
-    },
-    {
-	179, 0x2021,  500, PSDRV_AGLGlyphNames +  850,
-		{   50, -176,  572,  750 }, NULL	/* daggerdbl */
-    },
-    {
-	183, 0x2022,  333, PSDRV_AGLGlyphNames +  812,
-		{   91,  222,  401,  529 }, NULL	/* bullet */
-    },
-    {
-	188, 0x2026, 1000, PSDRV_AGLGlyphNames +  891,
-		{  121,    0,  899,  100 }, NULL	/* ellipsis */
-    },
-    {
-	189, 0x2030, 1111, PSDRV_AGLGlyphNames + 1100,
-		{  157,  -16, 1118,  750 }, NULL	/* perthousand */
-    },
-    {
-	172, 0x2039,  278, PSDRV_AGLGlyphNames +  952,
-		{  124,  125,  320,  495 }, NULL	/* guilsinglleft */
-    },
-    {
-	173, 0x203a,  278, PSDRV_AGLGlyphNames +  953,
-		{   90,  125,  286,  495 }, NULL	/* guilsinglright */
-    },
-    {
-	 -1, 0x2122,  750, PSDRV_AGLGlyphNames + 1198,
-		{  147,  329,  878,  750 }, NULL	/* trademark */
-    },
-    {
-	 -1, 0x2212,  500, PSDRV_AGLGlyphNames + 1020,
-		{   91,  219,  518,  289 }, NULL	/* minus */
-    },
-    {
-	164, 0x2215,  167, PSDRV_AGLGlyphNames +  934,
-		{ -174,    0,  500,  750 }, NULL	/* fraction */
-    },
-    {
-	174, 0xfb01,  500, PSDRV_AGLGlyphNames +  918,
-		{   93,    0,  584,  752 }, NULL	/* fi */
-    },
-    {
-	175, 0xfb02,  500, PSDRV_AGLGlyphNames +  927,
-		{   93,    0,  584,  752 }, NULL	/* fl */
-    }
-};
-
-
-/*
- *  Font metrics
- */
-
-AFM PSDRV_Helvetica_Condensed_Oblique =
-{
-    "Helvetica-Condensed-Oblique",		/* FontName */
-    "Helvetica Condensed Oblique",		/* FullName */
-    "Helvetica",				/* FamilyName */
-    "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
-    -12,					/* ItalicAngle */
-    FALSE,					/* IsFixedPitch */
-    -100,					/* UnderlinePosition */
-    50,						/* UnderlineThickness */
-    { -174, -250, 1118, 990 },			/* FontBBox */
-    750,					/* CapHeight */
-    556,					/* XHeight */
-    750,					/* Ascender */
-    -188,					/* Descender */
-    990,					/* FullAscender */
-    {
-	1000,				/* WinMetrics.usUnitsPerEm */
-	990,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	750,				/* WinMetrics.sTypoAscender */
-	-187,				/* WinMetrics.sTypoDescender */
-	263,				/* WinMetrics.sTypoLineGap */
-	990,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
-    },
-    {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[10] - CharWidths[19] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[20] - CharWidths[29] */
-	0, 0, 250, 333, 250, 500, 500, 	/* CharWidths[30] - CharWidths[36] */
-	833, 667, 250, 333, 333, 500, 	/* CharWidths[37] - CharWidths[42] */
-	500, 250, 333, 250, 278, 500, 	/* CharWidths[43] - CharWidths[48] */
-	500, 500, 500, 500, 500, 500, 	/* CharWidths[49] - CharWidths[54] */
-	500, 500, 500, 250, 250, 500, 	/* CharWidths[55] - CharWidths[60] */
-	500, 500, 500, 800, 556, 556, 	/* CharWidths[61] - CharWidths[66] */
-	556, 611, 500, 444, 611, 611, 	/* CharWidths[67] - CharWidths[72] */
-	278, 444, 556, 500, 778, 611, 	/* CharWidths[73] - CharWidths[78] */
-	611, 556, 611, 611, 556, 500, 	/* CharWidths[79] - CharWidths[84] */
-	611, 556, 833, 556, 556, 500, 	/* CharWidths[85] - CharWidths[90] */
-	333, 250, 333, 500, 500, 333, 	/* CharWidths[91] - CharWidths[96] */
-	444, 500, 444, 500, 444, 278, 	/* CharWidths[97] - CharWidths[102] */
-	500, 500, 222, 222, 444, 222, 	/* CharWidths[103] - CharWidths[108] */
-	778, 500, 500, 500, 500, 333, 	/* CharWidths[109] - CharWidths[114] */
-	444, 278, 500, 444, 667, 444, 	/* CharWidths[115] - CharWidths[120] */
-	444, 389, 274, 250, 274, 500, 	/* CharWidths[121] - CharWidths[126] */
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[127] - CharWidths[136] */
-	0, 0, 0, 0, 0, 0, 0, 0, 222, 	/* CharWidths[137] - CharWidths[145] */
-	222, 389, 389, 333, 500, 1000, 	/* CharWidths[146] - CharWidths[151] */
-	0, 0, 0, 0, 0, 0, 0, 0, 250, 	/* CharWidths[152] - CharWidths[160] */
-	333, 500, 500, 500, 500, 250, 	/* CharWidths[161] - CharWidths[166] */
-	500, 333, 800, 389, 500, 500, 	/* CharWidths[167] - CharWidths[172] */
-	333, 800, 333, 400, 500, 300, 	/* CharWidths[173] - CharWidths[178] */
-	300, 333, 0, 440, 250, 333, 	/* CharWidths[179] - CharWidths[184] */
-	300, 389, 500, 750, 750, 750, 	/* CharWidths[185] - CharWidths[190] */
-	500, 0, 333, 333, 333, 333, 	/* CharWidths[191] - CharWidths[196] */
-	333, 333, 250, 333, 0, 250, 	/* CharWidths[197] - CharWidths[202] */
-	333, 0, 333, 333, 333, 1000, 	/* CharWidths[203] - CharWidths[208] */
-	0, 0, 0, 0, 0, 0, 500, 0, 0, 	/* CharWidths[209] - CharWidths[217] */
-	0, 0, 0, 0, 0, 0, 0, 833, 0, 	/* CharWidths[218] - CharWidths[226] */
-	300, 0, 0, 0, 0, 500, 611, 	/* CharWidths[227] - CharWidths[233] */
-	833, 300, 0, 0, 0, 0, 0, 667, 	/* CharWidths[234] - CharWidths[241] */
-	0, 0, 0, 222, 0, 500, 222, 	/* CharWidths[242] - CharWidths[248] */
-	500, 722, 500, 0, 0, 0, 0	/* CharWidths[249] - CharWidths[255] */
-    },
-    228,					/* NumofMetrics */
-    met_Helvetica_Condensed_Oblique,		/* Metrics */
-    &PSDRV_AdobeGlyphList			/* Encoding */
-};
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow.c ./dlls/wineps/data/Helvetica_Narrow.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Narrow.c	Tue Jun  5 14:02:41 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Narrow, which is Copyright
+ *  	1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Narrow",				/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     931,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	931,				/* WinMetrics.sAscender */
-	-225,				/* WinMetrics.sDescender */
+	936,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	931,				/* WinMetrics.usWinAscent */
-	225				/* WinMetrics.usWinDescent */
+	362,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-210,				/* WinMetrics.sTypoDescender */
+	131,				/* WinMetrics.sTypoLineGap */
+	922,				/* WinMetrics.usWinAscent */
+	210				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow_Bold.c ./dlls/wineps/data/Helvetica_Narrow_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow_Bold.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Narrow_Bold.c	Tue Jun  5 13:59:49 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Narrow Bold, which is Copyright
+ *  	1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Narrow Bold",			/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     962,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	962,				/* WinMetrics.sAscender */
-	-228,				/* WinMetrics.sDescender */
+	936,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	962,				/* WinMetrics.usWinAscent */
-	228				/* WinMetrics.usWinDescent */
+	392,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-210,				/* WinMetrics.sTypoDescender */
+	131,				/* WinMetrics.sTypoLineGap */
+	933,				/* WinMetrics.usWinAscent */
+	210				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c ./dlls/wineps/data/Helvetica_Narrow_BoldOblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow_BoldOblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Narrow_BoldOblique.c	Tue Jun  5 13:51:39 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Narrow Bold Italic, which is
+ *  	Copyright 1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Narrow Bold Oblique",		/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     -12,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     962,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	962,				/* WinMetrics.sAscender */
-	-228,				/* WinMetrics.sDescender */
+	936,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	962,				/* WinMetrics.usWinAscent */
-	228				/* WinMetrics.usWinDescent */
+	392,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-210,				/* WinMetrics.sTypoDescender */
+	131,				/* WinMetrics.sTypoLineGap */
+	936,				/* WinMetrics.usWinAscent */
+	212				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow_Oblique.c ./dlls/wineps/data/Helvetica_Narrow_Oblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Narrow_Oblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Narrow_Oblique.c	Tue Jun  5 13:48:25 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Narrow Italic, which is Copyright
+ *  	1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Narrow Oblique",			/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -12,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     931,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	931,				/* WinMetrics.sAscender */
-	-225,				/* WinMetrics.sDescender */
+	936,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	931,				/* WinMetrics.usWinAscent */
-	225				/* WinMetrics.usWinDescent */
+	362,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-208,				/* WinMetrics.sTypoDescender */
+	134,				/* WinMetrics.sTypoLineGap */
+	915,				/* WinMetrics.usWinAscent */
+	210				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Helvetica_Oblique.c ./dlls/wineps/data/Helvetica_Oblique.c
--- ../wine-20010604cvs/dlls/wineps/data/Helvetica_Oblique.c	Tue May 29 17:06:11 2001
+++ ./dlls/wineps/data/Helvetica_Oblique.c	Tue Jun  5 14:06:42 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Arial Italic, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Helvetica Oblique",			/* FullName */
     "Helvetica",				/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -12,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     931,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	931,				/* WinMetrics.sAscender */
-	-225,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	718,				/* WinMetrics.sTypoAscender */
-	-206,				/* WinMetrics.sTypoDescender */
-	276,				/* WinMetrics.sTypoLineGap */
-	931,				/* WinMetrics.usWinAscent */
-	225				/* WinMetrics.usWinDescent */
+	905,				/* WinMetrics.sAscender */
+	-212,				/* WinMetrics.sDescender */
+	33,				/* WinMetrics.sLineGap */
+	441,				/* WinMetrics.sAvgCharWidth */
+	728,				/* WinMetrics.sTypoAscender */
+	-208,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	905,				/* WinMetrics.usWinAscent */
+	212				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_Bold.c ./dlls/wineps/data/NewCenturySchlbk_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_Bold.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_Bold.c	Tue Jun  5 13:43:27 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Schoolbook Bold, which is
+ *  	Copyright 1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "New Century Schoolbook Bold",		/* FullName */
     "New Century Schoolbook",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     988,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	988,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
+	986,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	737,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	259,				/* WinMetrics.sTypoLineGap */
-	988,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	524,				/* WinMetrics.sAvgCharWidth */
+	741,				/* WinMetrics.sTypoAscender */
+	-195,				/* WinMetrics.sTypoDescender */
+	134,				/* WinMetrics.sTypoLineGap */
+	966,				/* WinMetrics.usWinAscent */
+	215				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c ./dlls/wineps/data/NewCenturySchlbk_BoldItalic.c
--- ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_BoldItalic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_BoldItalic.c	Tue Jun  5 13:40:58 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Schoolbook Bold Italic, which is
+ *  	Copyright 1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "New Century Schoolbook Bold Italic",	/* FullName */
     "New Century Schoolbook",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     -16,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     991,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	991,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
+	986,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	737,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	259,				/* WinMetrics.sTypoLineGap */
-	991,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	515,				/* WinMetrics.sAvgCharWidth */
+	739,				/* WinMetrics.sTypoAscender */
+	-192,				/* WinMetrics.sTypoDescender */
+	138,				/* WinMetrics.sTypoLineGap */
+	985,				/* WinMetrics.usWinAscent */
+	216				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_Italic.c ./dlls/wineps/data/NewCenturySchlbk_Italic.c
--- ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_Italic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_Italic.c	Tue Jun  5 13:37:49 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Schoolbook Italic, which is
+ *  	Copyright 1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "New Century Schoolbook Italic",		/* FullName */
     "New Century Schoolbook",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -16,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     958,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	958,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
+	986,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	737,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	259,				/* WinMetrics.sTypoLineGap */
-	958,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	458,				/* WinMetrics.sAvgCharWidth */
+	740,				/* WinMetrics.sTypoAscender */
+	-195,				/* WinMetrics.sTypoDescender */
+	135,				/* WinMetrics.sTypoLineGap */
+	969,				/* WinMetrics.usWinAscent */
+	215				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_Roman.c ./dlls/wineps/data/NewCenturySchlbk_Roman.c
--- ../wine-20010604cvs/dlls/wineps/data/NewCenturySchlbk_Roman.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/NewCenturySchlbk_Roman.c	Tue Jun  5 13:34:53 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Century Schoolbook, which is Copyright
+ *  	1990-1991 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "New Century Schoolbook Roman",		/* FullName */
     "New Century Schoolbook",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     965,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	965,				/* WinMetrics.sAscender */
-	-250,				/* WinMetrics.sDescender */
+	986,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	737,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	259,				/* WinMetrics.sTypoLineGap */
-	965,				/* WinMetrics.usWinAscent */
-	250				/* WinMetrics.usWinDescent */
+	464,				/* WinMetrics.sAvgCharWidth */
+	740,				/* WinMetrics.sTypoAscender */
+	-195,				/* WinMetrics.sTypoDescender */
+	135,				/* WinMetrics.sTypoLineGap */
+	986,				/* WinMetrics.usWinAscent */
+	216				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Palatino_Bold.c ./dlls/wineps/data/Palatino_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/Palatino_Bold.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Palatino_Bold.c	Tue Jun  5 13:31:38 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Book Antiqua Bold, which is Copyright
+ *  	1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Palatino Bold",				/* FullName */
     "Palatino",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     924,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	924,				/* WinMetrics.sAscender */
-	-266,				/* WinMetrics.sDescender */
+	923,				/* WinMetrics.sAscender */
+	-282,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	720,				/* WinMetrics.sTypoAscender */
-	-257,				/* WinMetrics.sTypoDescender */
-	223,				/* WinMetrics.sTypoLineGap */
-	924,				/* WinMetrics.usWinAscent */
-	266				/* WinMetrics.usWinDescent */
+	459,				/* WinMetrics.sAvgCharWidth */
+	726,				/* WinMetrics.sTypoAscender */
+	-265,				/* WinMetrics.sTypoDescender */
+	79,				/* WinMetrics.sTypoLineGap */
+	923,				/* WinMetrics.usWinAscent */
+	265				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Palatino_BoldItalic.c ./dlls/wineps/data/Palatino_BoldItalic.c
--- ../wine-20010604cvs/dlls/wineps/data/Palatino_BoldItalic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Palatino_BoldItalic.c	Tue Jun  5 13:28:40 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Book Antiqua Bold Italic, which is
+ *  	Copyright 1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Palatino Bold Italic",			/* FullName */
     "Palatino",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     -10,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     926,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	926,				/* WinMetrics.sAscender */
-	-271,				/* WinMetrics.sDescender */
+	923,				/* WinMetrics.sAscender */
+	-282,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	726,				/* WinMetrics.sTypoAscender */
-	-270,				/* WinMetrics.sTypoDescender */
-	204,				/* WinMetrics.sTypoLineGap */
-	926,				/* WinMetrics.usWinAscent */
-	271				/* WinMetrics.usWinDescent */
+	447,				/* WinMetrics.sAvgCharWidth */
+	730,				/* WinMetrics.sTypoAscender */
+	-275,				/* WinMetrics.sTypoDescender */
+	65,				/* WinMetrics.sTypoLineGap */
+	922,				/* WinMetrics.usWinAscent */
+	281				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Palatino_Italic.c ./dlls/wineps/data/Palatino_Italic.c
--- ../wine-20010604cvs/dlls/wineps/data/Palatino_Italic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Palatino_Italic.c	Tue Jun  5 13:26:09 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Book Antiqua Italic, which is Copyright
+ *  	1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Palatino Italic",				/* FullName */
     "Palatino",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -10,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     918,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	918,				/* WinMetrics.sAscender */
-	-276,				/* WinMetrics.sDescender */
+	923,				/* WinMetrics.sAscender */
+	-282,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	733,				/* WinMetrics.sTypoAscender */
-	-275,				/* WinMetrics.sTypoDescender */
-	192,				/* WinMetrics.sTypoLineGap */
-	918,				/* WinMetrics.usWinAscent */
-	276				/* WinMetrics.usWinDescent */
+	401,				/* WinMetrics.sAvgCharWidth */
+	725,				/* WinMetrics.sTypoAscender */
+	-280,				/* WinMetrics.sTypoDescender */
+	65,				/* WinMetrics.sTypoLineGap */
+	922,				/* WinMetrics.usWinAscent */
+	280				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Palatino_Roman.c ./dlls/wineps/data/Palatino_Roman.c
--- ../wine-20010604cvs/dlls/wineps/data/Palatino_Roman.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Palatino_Roman.c	Tue Jun  5 13:23:23 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Book Antiqua, which is Copyright 1991-1995
+ *  	The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Palatino Roman",				/* FullName */
     "Palatino",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     927,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	927,				/* WinMetrics.sAscender */
-	-283,				/* WinMetrics.sDescender */
+	923,				/* WinMetrics.sAscender */
+	-282,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	726,				/* WinMetrics.sTypoAscender */
-	-280,				/* WinMetrics.sTypoDescender */
-	194,				/* WinMetrics.sTypoLineGap */
-	927,				/* WinMetrics.usWinAscent */
-	283				/* WinMetrics.usWinDescent */
+	445,				/* WinMetrics.sAvgCharWidth */
+	727,				/* WinMetrics.sTypoAscender */
+	-282,				/* WinMetrics.sTypoDescender */
+	61,				/* WinMetrics.sTypoLineGap */
+	960,				/* WinMetrics.usWinAscent */
+	282				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Symbol.c ./dlls/wineps/data/Symbol.c
--- ../wine-20010604cvs/dlls/wineps/data/Symbol.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Symbol.c	Tue Jun  5 13:19:20 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Symbol, which is Copyright 1990-1992 The
+ *  	Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -986,7 +989,7 @@
     "Symbol",					/* FullName */
     "Symbol",					/* FamilyName */
     "FontSpecific",				/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -98,					/* UnderlinePosition */
@@ -999,15 +1002,15 @@
     1010,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	1010,				/* WinMetrics.sAscender */
-	-293,				/* WinMetrics.sDescender */
+	1005,				/* WinMetrics.sAscender */
+	-220,				/* WinMetrics.sDescender */
 	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	1010,				/* WinMetrics.sTypoAscender */
-	-292,				/* WinMetrics.sTypoDescender */
-	0,				/* WinMetrics.sTypoLineGap */
-	1010,				/* WinMetrics.usWinAscent */
-	293				/* WinMetrics.usWinDescent */
+	600,				/* WinMetrics.sAvgCharWidth */
+	693,				/* WinMetrics.sTypoAscender */
+	-216,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	1005,				/* WinMetrics.usWinAscent */
+	220				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Times_Bold.c ./dlls/wineps/data/Times_Bold.c
--- ../wine-20010604cvs/dlls/wineps/data/Times_Bold.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Times_Bold.c	Tue Jun  5 13:15:43 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Times New Roman Bold, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Times Bold",				/* FullName */
     "Times",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     935,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	935,				/* WinMetrics.sAscender */
-	-218,				/* WinMetrics.sDescender */
-	0,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	676,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	320,				/* WinMetrics.sTypoLineGap */
-	935,				/* WinMetrics.usWinAscent */
-	218				/* WinMetrics.usWinDescent */
+	891,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
+	42,				/* WinMetrics.sLineGap */
+	427,				/* WinMetrics.sAvgCharWidth */
+	677,				/* WinMetrics.sTypoAscender */
+	-216,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	891,				/* WinMetrics.usWinAscent */
+	216				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Times_BoldItalic.c ./dlls/wineps/data/Times_BoldItalic.c
--- ../wine-20010604cvs/dlls/wineps/data/Times_BoldItalic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Times_BoldItalic.c	Tue Jun  5 13:11:13 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Times New Roman Bold Italic, which is
+ *  	Copyright 1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Times Bold Italic",			/* FullName */
     "Times",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    700,					/* Weight */
+    FW_BOLD,					/* Weight */
     -15,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     921,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	921,				/* WinMetrics.sAscender */
-	-218,				/* WinMetrics.sDescender */
-	11,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	699,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	297,				/* WinMetrics.sTypoLineGap */
-	921,				/* WinMetrics.usWinAscent */
-	218				/* WinMetrics.usWinDescent */
+	891,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
+	42,				/* WinMetrics.sLineGap */
+	412,				/* WinMetrics.sAvgCharWidth */
+	677,				/* WinMetrics.sTypoAscender */
+	-216,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	891,				/* WinMetrics.usWinAscent */
+	216				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Times_Italic.c ./dlls/wineps/data/Times_Italic.c
--- ../wine-20010604cvs/dlls/wineps/data/Times_Italic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Times_Italic.c	Tue Jun  5 13:08:08 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Times New Roman Italic, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Times Italic",				/* FullName */
     "Times",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -15.5,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     883,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	883,				/* WinMetrics.sAscender */
-	-217,				/* WinMetrics.sDescender */
-	50,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	683,				/* WinMetrics.sTypoAscender */
-	-204,				/* WinMetrics.sTypoDescender */
-	313,				/* WinMetrics.sTypoLineGap */
-	883,				/* WinMetrics.usWinAscent */
-	217				/* WinMetrics.usWinDescent */
+	891,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
+	42,				/* WinMetrics.sLineGap */
+	402,				/* WinMetrics.sAvgCharWidth */
+	694,				/* WinMetrics.sTypoAscender */
+	-216,				/* WinMetrics.sTypoDescender */
+	150,				/* WinMetrics.sTypoLineGap */
+	891,				/* WinMetrics.usWinAscent */
+	216				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/Times_Roman.c ./dlls/wineps/data/Times_Roman.c
--- ../wine-20010604cvs/dlls/wineps/data/Times_Roman.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/Times_Roman.c	Tue Jun  5 13:03:38 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Times New Roman, which is Copyright
+ *  	1990-1992 The Monotype Corporation plc/Type Solutions Inc.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "Times Roman",				/* FullName */
     "Times",					/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     898,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	898,				/* WinMetrics.sAscender */
-	-218,				/* WinMetrics.sDescender */
-	34,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	683,				/* WinMetrics.sTypoAscender */
+	891,				/* WinMetrics.sAscender */
+	-216,				/* WinMetrics.sDescender */
+	42,				/* WinMetrics.sLineGap */
+	401,				/* WinMetrics.sAvgCharWidth */
+	693,				/* WinMetrics.sTypoAscender */
 	-216,				/* WinMetrics.sTypoDescender */
-	301,				/* WinMetrics.sTypoLineGap */
-	898,				/* WinMetrics.usWinAscent */
-	218				/* WinMetrics.usWinDescent */
+	150,				/* WinMetrics.sTypoLineGap */
+	891,				/* WinMetrics.usWinAscent */
+	216				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/ZapfChancery_MediumItalic.c ./dlls/wineps/data/ZapfChancery_MediumItalic.c
--- ../wine-20010604cvs/dlls/wineps/data/ZapfChancery_MediumItalic.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/ZapfChancery_MediumItalic.c	Tue Jun  5 12:57:33 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Monotype Corsiva, which is Copyright
+ *  	1991-1995 The Monotype Corporation.
+ *
  */
 
 #include "psdrv.h"
@@ -947,7 +950,7 @@
     "ITC Zapf Chancery Medium Italic",		/* FullName */
     "ITC Zapf Chancery",			/* FamilyName */
     "AdobeStandardEncoding",			/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     -14,					/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -100,					/* UnderlinePosition */
@@ -960,15 +963,15 @@
     831,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	831,				/* WinMetrics.sAscender */
-	-314,				/* WinMetrics.sDescender */
-	5,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	714,				/* WinMetrics.sTypoAscender */
-	-313,				/* WinMetrics.sTypoDescender */
-	173,				/* WinMetrics.sTypoLineGap */
-	831,				/* WinMetrics.usWinAscent */
-	314				/* WinMetrics.usWinDescent */
+	790,				/* WinMetrics.sAscender */
+	-303,				/* WinMetrics.sDescender */
+	29,				/* WinMetrics.sLineGap */
+	350,				/* WinMetrics.sAvgCharWidth */
+	689,				/* WinMetrics.sTypoAscender */
+	-259,				/* WinMetrics.sTypoDescender */
+	122,				/* WinMetrics.sTypoLineGap */
+	790,				/* WinMetrics.usWinAscent */
+	303				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/ZapfDingbats.c ./dlls/wineps/data/ZapfDingbats.c
--- ../wine-20010604cvs/dlls/wineps/data/ZapfDingbats.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/ZapfDingbats.c	Tue Jun  5 12:43:35 2001
@@ -11,6 +11,9 @@
  *
  *	which are Copyright 1985-1992 Adobe Systems Incorporated.
  *
+ *  	Windows metrics derived from Monotype Sorts, which is Copyright
+ *  	1991-1995 Monotype Typography, Ltd.
+ *
  */
 
 #include "psdrv.h"
@@ -986,7 +989,7 @@
     "ITC Zapf Dingbats",			/* FullName */
     "ITC Zapf Dingbats",			/* FamilyName */
     "FontSpecific",				/* EncodingScheme */
-    400,					/* Weight */
+    FW_NORMAL,					/* Weight */
     0,						/* ItalicAngle */
     FALSE,					/* IsFixedPitch */
     -98,					/* UnderlinePosition */
@@ -999,15 +1002,15 @@
     820,					/* FullAscender */
     {
 	1000,				/* WinMetrics.usUnitsPerEm */
-	820,				/* WinMetrics.sAscender */
-	-143,				/* WinMetrics.sDescender */
-	187,				/* WinMetrics.sLineGap */
-	-10172,				/* WinMetrics.sAvgCharWidth */
-	820,				/* WinMetrics.sTypoAscender */
-	-142,				/* WinMetrics.sTypoDescender */
-	238,				/* WinMetrics.sTypoLineGap */
-	820,				/* WinMetrics.usWinAscent */
-	143				/* WinMetrics.usWinDescent */
+	801,				/* WinMetrics.sAscender */
+	-201,				/* WinMetrics.sDescender */
+	0,				/* WinMetrics.sLineGap */
+	740,				/* WinMetrics.sAvgCharWidth */
+	801,				/* WinMetrics.sTypoAscender */
+	-201,				/* WinMetrics.sTypoDescender */
+	68,				/* WinMetrics.sTypoLineGap */
+	801,				/* WinMetrics.usWinAscent */
+	201				/* WinMetrics.usWinDescent */
     },
     {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 	/* CharWidths[0] - CharWidths[9] */
diff -urN ../wine-20010604cvs/dlls/wineps/data/agl.c ./dlls/wineps/data/agl.c
--- ../wine-20010604cvs/dlls/wineps/data/agl.c	Tue May 29 17:06:12 2001
+++ ./dlls/wineps/data/agl.c	Tue Jun  5 12:00:33 2001
@@ -2381,10 +2381,6 @@
 extern AFM PSDRV_Helvetica;
 extern AFM PSDRV_Helvetica_Bold;
 extern AFM PSDRV_Helvetica_BoldOblique;
-extern AFM PSDRV_Helvetica_Condensed;
-extern AFM PSDRV_Helvetica_Condensed_Bold;
-extern AFM PSDRV_Helvetica_Condensed_BoldObl;
-extern AFM PSDRV_Helvetica_Condensed_Oblique;
 extern AFM PSDRV_Helvetica_Narrow;
 extern AFM PSDRV_Helvetica_Narrow_Bold;
 extern AFM PSDRV_Helvetica_Narrow_BoldOblique;
@@ -2406,7 +2402,7 @@
 extern AFM PSDRV_ZapfChancery_MediumItalic;
 extern AFM PSDRV_ZapfDingbats;
 
-AFM *const PSDRV_BuiltinAFMs[40] =
+AFM *const PSDRV_BuiltinAFMs[36] =
 {
     &PSDRV_AvantGarde_Book,
     &PSDRV_AvantGarde_BookOblique,
@@ -2423,10 +2419,6 @@
     &PSDRV_Helvetica,
     &PSDRV_Helvetica_Bold,
     &PSDRV_Helvetica_BoldOblique,
-    &PSDRV_Helvetica_Condensed,
-    &PSDRV_Helvetica_Condensed_Bold,
-    &PSDRV_Helvetica_Condensed_BoldObl,
-    &PSDRV_Helvetica_Condensed_Oblique,
     &PSDRV_Helvetica_Narrow,
     &PSDRV_Helvetica_Narrow_Bold,
     &PSDRV_Helvetica_Narrow_BoldOblique,


More information about the wine-patches mailing list