[PATCH 1/1] make_unicode: Generate the PostScript builtin font metrics.

[Alexandre Julliard]

From: Alexandre Julliard

---
 dlls/wineps.drv/data/AvantGarde_Book.c        |  52 ++--
 dlls/wineps.drv/data/AvantGarde_BookOblique.c |  52 ++--
 dlls/wineps.drv/data/AvantGarde_Demi.c        |  52 ++--
 dlls/wineps.drv/data/AvantGarde_DemiOblique.c |  52 ++--
 dlls/wineps.drv/data/Bookman_Demi.c           |  52 ++--
 dlls/wineps.drv/data/Bookman_DemiItalic.c     |  52 ++--
 dlls/wineps.drv/data/Bookman_Light.c          |  52 ++--
 dlls/wineps.drv/data/Bookman_LightItalic.c    |  52 ++--
 dlls/wineps.drv/data/Courier.c                |  67 ++--
 dlls/wineps.drv/data/Courier_Bold.c           |  67 ++--
 dlls/wineps.drv/data/Courier_BoldOblique.c    |  67 ++--
 dlls/wineps.drv/data/Courier_Oblique.c        |  67 ++--
 dlls/wineps.drv/data/Helvetica.c              |  52 ++--
 dlls/wineps.drv/data/Helvetica_Bold.c         |  52 ++--
 dlls/wineps.drv/data/Helvetica_BoldOblique.c  |  52 ++--
 dlls/wineps.drv/data/Helvetica_Narrow.c       |  52 ++--
 dlls/wineps.drv/data/Helvetica_Narrow_Bold.c  |  52 ++--
 .../data/Helvetica_Narrow_BoldOblique.c       |  52 ++--
 .../data/Helvetica_Narrow_Oblique.c           |  52 ++--
 dlls/wineps.drv/data/Helvetica_Oblique.c      |  52 ++--
 dlls/wineps.drv/data/NewCenturySchlbk_Bold.c  |  52 ++--
 .../data/NewCenturySchlbk_BoldItalic.c        |  52 ++--
 .../wineps.drv/data/NewCenturySchlbk_Italic.c |  52 ++--
 dlls/wineps.drv/data/NewCenturySchlbk_Roman.c |  52 ++--
 dlls/wineps.drv/data/Palatino_Bold.c          |  52 ++--
 dlls/wineps.drv/data/Palatino_BoldItalic.c    |  52 ++--
 dlls/wineps.drv/data/Palatino_Italic.c        |  52 ++--
 dlls/wineps.drv/data/Palatino_Roman.c         |  52 ++--
 dlls/wineps.drv/data/Symbol.c                 |  46 ++-
 dlls/wineps.drv/data/Times_Bold.c             |  52 ++--
 dlls/wineps.drv/data/Times_BoldItalic.c       |  52 ++--
 dlls/wineps.drv/data/Times_Italic.c           |  52 ++--
 dlls/wineps.drv/data/Times_Roman.c            |  52 ++--
 .../data/ZapfChancery_MediumItalic.c          |  52 ++--
 dlls/wineps.drv/data/ZapfDingbats.c           |  59 ++--
 dlls/wineps.drv/data/agl.c                    |  65 ++--
 dlls/wineps.drv/data/agl.h                    |  35 ---
 tools/make_unicode                            | 291 ++++++++++++++++++
 38 files changed, 1107 insertions(+), 1165 deletions(-)
 delete mode 100644 dlls/wineps.drv/data/agl.h

diff --git a/dlls/wineps.drv/data/AvantGarde_Book.c b/dlls/wineps.drv/data/AvantGarde_Book.c
index 8d7f3cbcefd..e948b68a96c 100644
--- a/dlls/wineps.drv/data/AvantGarde_Book.c
+++ b/dlls/wineps.drv/data/AvantGarde_Book.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for AvantGarde-Book
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  277 },
     { 0x0021,  295 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  425 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  485 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  332 },
     { 0x00b3,  332 },
     { 0x00b4,  375 },
+    { 0x00b5,  608 },
     { 0x00b6,  564 },
     { 0x00b7,  277 },
     { 0x00b8,  324 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  554 },
     { 0x02c6,  502 },
     { 0x02c7,  502 },
-    { 0x02c9,  485 },
     { 0x02d8,  453 },
     { 0x02d9,  222 },
     { 0x02da,  332 },
     { 0x02db,  302 },
     { 0x02dc,  439 },
     { 0x02dd,  552 },
-    { 0x03bc,  608 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  351 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1174 },
     { 0x2039,  251 },
     { 0x203a,  251 },
+    { 0x2044,  166 },
+    { 0x20ac,  554 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  166 },
     { 0xfb01,  487 },
     { 0xfb02,  485 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_AvantGarde_Book =
 {
-    "AvantGarde-Book",			    /* FontName */
-    L"ITC Avant Garde Gothic",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -113, -222, 1148, 955 },		    /* FontBBox */
+    "AvantGarde-Book", /* FontName */
+    L"ITC Avant Garde Gothic", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -113, -222, 1148, 955 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	1006,				    /* WinMetrics.sAscender */
-	-220,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	486,				    /* WinMetrics.sAvgCharWidth */
-	971,				    /* WinMetrics.usWinAscent */
-	220				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        819,  /* WinMetrics.sAscender */
+        -222,  /* WinMetrics.sDescender */
+        109,  /* WinMetrics.sLineGap */
+        486,  /* WinMetrics.sAvgCharWidth */
+        819,  /* WinMetrics.usWinAscent */
+        222,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/AvantGarde_BookOblique.c b/dlls/wineps.drv/data/AvantGarde_BookOblique.c
index 8b9b91b272e..f139d3ec53b 100644
--- a/dlls/wineps.drv/data/AvantGarde_BookOblique.c
+++ b/dlls/wineps.drv/data/AvantGarde_BookOblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for AvantGarde-BookOblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  277 },
     { 0x0021,  295 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  425 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  485 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  332 },
     { 0x00b3,  332 },
     { 0x00b4,  375 },
+    { 0x00b5,  608 },
     { 0x00b6,  564 },
     { 0x00b7,  277 },
     { 0x00b8,  324 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  554 },
     { 0x02c6,  502 },
     { 0x02c7,  502 },
-    { 0x02c9,  485 },
     { 0x02d8,  453 },
     { 0x02d9,  222 },
     { 0x02da,  332 },
     { 0x02db,  302 },
     { 0x02dc,  439 },
     { 0x02dd,  552 },
-    { 0x03bc,  608 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  351 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1174 },
     { 0x2039,  251 },
     { 0x203a,  251 },
+    { 0x2044,  166 },
+    { 0x20ac,  554 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  166 },
     { 0xfb01,  487 },
     { 0xfb02,  485 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_AvantGarde_BookOblique =
 {
-    "AvantGarde-BookOblique",		    /* FontName */
-    L"ITC Avant Garde Gothic",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -10.5,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -113, -222, 1279, 955 },		    /* FontBBox */
+    "AvantGarde-BookOblique", /* FontName */
+    L"ITC Avant Garde Gothic", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -10.5, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -113, -222, 1280, 955 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	1006,				    /* WinMetrics.sAscender */
-	-220,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	486,				    /* WinMetrics.sAvgCharWidth */
-	971,				    /* WinMetrics.usWinAscent */
-	220				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        819,  /* WinMetrics.sAscender */
+        -222,  /* WinMetrics.sDescender */
+        109,  /* WinMetrics.sLineGap */
+        486,  /* WinMetrics.sAvgCharWidth */
+        819,  /* WinMetrics.usWinAscent */
+        222,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/AvantGarde_Demi.c b/dlls/wineps.drv/data/AvantGarde_Demi.c
index ef499ad8a14..927fa88f8b4 100644
--- a/dlls/wineps.drv/data/AvantGarde_Demi.c
+++ b/dlls/wineps.drv/data/AvantGarde_Demi.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for AvantGarde-Demi
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  280 },
     { 0x0021,  280 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  460 },
     { 0x00ac,  600 },
     { 0x00ae,  740 },
+    { 0x00af,  420 },
     { 0x00b0,  400 },
     { 0x00b1,  600 },
     { 0x00b2,  336 },
     { 0x00b3,  336 },
     { 0x00b4,  420 },
+    { 0x00b5,  600 },
     { 0x00b6,  600 },
     { 0x00b7,  280 },
     { 0x00b8,  340 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  560 },
     { 0x02c6,  540 },
     { 0x02c7,  540 },
-    { 0x02c9,  420 },
     { 0x02d8,  480 },
     { 0x02d9,  280 },
     { 0x02da,  360 },
     { 0x02db,  340 },
     { 0x02dc,  480 },
     { 0x02dd,  700 },
-    { 0x03bc,  576 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  280 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1280 },
     { 0x2039,  240 },
     { 0x203a,  240 },
+    { 0x2044,  160 },
+    { 0x20ac,  560 },
     { 0x2122, 1000 },
     { 0x2212,  600 },
-    { 0x2215,  160 },
     { 0xfb01,  520 },
     { 0xfb02,  520 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_AvantGarde_Demi =
 {
-    "AvantGarde-Demi",			    /* FontName */
-    L"ITC Avant Garde Gothic",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -123, -251, 1222, 1021 },		    /* FontBBox */
+    "AvantGarde-Demi", /* FontName */
+    L"ITC Avant Garde Gothic", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -123, -251, 1222, 1021 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	1006,				    /* WinMetrics.sAscender */
-	-220,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	486,				    /* WinMetrics.sAvgCharWidth */
-	971,				    /* WinMetrics.usWinAscent */
-	220				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        857,  /* WinMetrics.sAscender */
+        -251,  /* WinMetrics.sDescender */
+        42,  /* WinMetrics.sLineGap */
+        486,  /* WinMetrics.sAvgCharWidth */
+        857,  /* WinMetrics.usWinAscent */
+        251,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/AvantGarde_DemiOblique.c b/dlls/wineps.drv/data/AvantGarde_DemiOblique.c
index d09e2b9b641..aa8dbe3d55d 100644
--- a/dlls/wineps.drv/data/AvantGarde_DemiOblique.c
+++ b/dlls/wineps.drv/data/AvantGarde_DemiOblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for AvantGarde-DemiOblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  280 },
     { 0x0021,  280 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  460 },
     { 0x00ac,  600 },
     { 0x00ae,  740 },
+    { 0x00af,  420 },
     { 0x00b0,  400 },
     { 0x00b1,  600 },
     { 0x00b2,  336 },
     { 0x00b3,  336 },
     { 0x00b4,  420 },
+    { 0x00b5,  600 },
     { 0x00b6,  600 },
     { 0x00b7,  280 },
     { 0x00b8,  340 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  560 },
     { 0x02c6,  540 },
     { 0x02c7,  540 },
-    { 0x02c9,  420 },
     { 0x02d8,  480 },
     { 0x02d9,  280 },
     { 0x02da,  360 },
     { 0x02db,  340 },
     { 0x02dc,  480 },
     { 0x02dd,  700 },
-    { 0x03bc,  576 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  280 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1280 },
     { 0x2039,  240 },
     { 0x203a,  240 },
+    { 0x2044,  160 },
+    { 0x20ac,  560 },
     { 0x2122, 1000 },
     { 0x2212,  600 },
-    { 0x2215,  160 },
     { 0xfb01,  520 },
     { 0xfb02,  520 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_AvantGarde_DemiOblique =
 {
-    "AvantGarde-DemiOblique",		    /* FontName */
-    L"ITC Avant Garde Gothic",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -10.5,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -123, -251, 1256, 1021 },		    /* FontBBox */
+    "AvantGarde-DemiOblique", /* FontName */
+    L"ITC Avant Garde Gothic", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -10.5, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -123, -251, 1256, 1021 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	1006,				    /* WinMetrics.sAscender */
-	-220,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	485,				    /* WinMetrics.sAvgCharWidth */
-	1006,				    /* WinMetrics.usWinAscent */
-	220				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        857,  /* WinMetrics.sAscender */
+        -251,  /* WinMetrics.sDescender */
+        42,  /* WinMetrics.sLineGap */
+        486,  /* WinMetrics.sAvgCharWidth */
+        857,  /* WinMetrics.usWinAscent */
+        251,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Bookman_Demi.c b/dlls/wineps.drv/data/Bookman_Demi.c
index a63015385ea..7caa8beaba9 100644
--- a/dlls/wineps.drv/data/Bookman_Demi.c
+++ b/dlls/wineps.drv/data/Bookman_Demi.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Bookman-Demi
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  340 },
     { 0x0021,  360 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  400 },
     { 0x00ac,  600 },
     { 0x00ae,  740 },
+    { 0x00af,  460 },
     { 0x00b0,  400 },
     { 0x00b1,  600 },
     { 0x00b2,  396 },
     { 0x00b3,  396 },
     { 0x00b4,  400 },
+    { 0x00b5,  679 },
     { 0x00b6,  800 },
     { 0x00b7,  340 },
     { 0x00b8,  360 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  660 },
     { 0x02c6,  500 },
     { 0x02c7,  500 },
-    { 0x02c9,  460 },
     { 0x02d8,  500 },
     { 0x02d9,  320 },
     { 0x02da,  340 },
     { 0x02db,  320 },
     { 0x02dc,  480 },
     { 0x02dd,  440 },
-    { 0x03bc,  660 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  320 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1360 },
     { 0x2039,  220 },
     { 0x203a,  220 },
+    { 0x2044,  120 },
+    { 0x20ac,  660 },
     { 0x2122,  980 },
     { 0x2212,  600 },
-    { 0x2215,  120 },
     { 0xfb01,  740 },
     { 0xfb02,  740 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Bookman_Demi =
 {
-    "Bookman-Demi",			    /* FontName */
-    L"ITC Bookman",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -194, -250, 1346, 934 },		    /* FontBBox */
+    "Bookman-Demi", /* FontName */
+    L"ITC Bookman", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -194, -250, 1346, 934 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	942,				    /* WinMetrics.sAscender */
-	-232,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	527,				    /* WinMetrics.sAvgCharWidth */
-	941,				    /* WinMetrics.usWinAscent */
-	231				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        805,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        95,  /* WinMetrics.sLineGap */
+        527,  /* WinMetrics.sAvgCharWidth */
+        805,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Bookman_DemiItalic.c b/dlls/wineps.drv/data/Bookman_DemiItalic.c
index 919f6c73769..ec48f7d1630 100644
--- a/dlls/wineps.drv/data/Bookman_DemiItalic.c
+++ b/dlls/wineps.drv/data/Bookman_DemiItalic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Bookman-DemiItalic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  340 },
     { 0x0021,  320 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  380 },
     { 0x00ac,  620 },
     { 0x00ae,  780 },
+    { 0x00af,  480 },
     { 0x00b0,  400 },
     { 0x00b1,  600 },
     { 0x00b2,  408 },
     { 0x00b3,  408 },
     { 0x00b4,  340 },
+    { 0x00b5,  679 },
     { 0x00b6,  680 },
     { 0x00b7,  340 },
     { 0x00b8,  360 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  680 },
     { 0x02c6,  480 },
     { 0x02c7,  480 },
-    { 0x02c9,  480 },
     { 0x02d8,  460 },
     { 0x02d9,  380 },
     { 0x02da,  360 },
     { 0x02db,  320 },
     { 0x02dc,  480 },
     { 0x02dd,  560 },
-    { 0x03bc,  680 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  320 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1360 },
     { 0x2039,  220 },
     { 0x203a,  220 },
+    { 0x2044,  120 },
+    { 0x20ac,  680 },
     { 0x2122,  940 },
     { 0x2212,  600 },
-    { 0x2215,  120 },
     { 0xfb01,  820 },
     { 0xfb02,  820 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Bookman_DemiItalic =
 {
-    "Bookman-DemiItalic",		    /* FontName */
-    L"ITC Bookman",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -10,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -231, -250, 1333, 941 },		    /* FontBBox */
+    "Bookman-DemiItalic", /* FontName */
+    L"ITC Bookman", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -10, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -231, -250, 1333, 941 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	942,				    /* WinMetrics.sAscender */
-	-232,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	538,				    /* WinMetrics.sAvgCharWidth */
-	942,				    /* WinMetrics.usWinAscent */
-	231				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        790,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        110,  /* WinMetrics.sLineGap */
+        538,  /* WinMetrics.sAvgCharWidth */
+        790,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Bookman_Light.c b/dlls/wineps.drv/data/Bookman_Light.c
index c7dbd3f1d05..0aa080214ee 100644
--- a/dlls/wineps.drv/data/Bookman_Light.c
+++ b/dlls/wineps.drv/data/Bookman_Light.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Bookman-Light
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  320 },
     { 0x0021,  300 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  360 },
     { 0x00ac,  600 },
     { 0x00ae,  740 },
+    { 0x00af,  440 },
     { 0x00b0,  400 },
     { 0x00b1,  600 },
     { 0x00b2,  372 },
     { 0x00b3,  372 },
     { 0x00b4,  340 },
+    { 0x00b5,  627 },
     { 0x00b6,  600 },
     { 0x00b7,  320 },
     { 0x00b8,  320 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  620 },
     { 0x02c6,  420 },
     { 0x02c7,  420 },
-    { 0x02c9,  440 },
     { 0x02d8,  460 },
     { 0x02d9,  260 },
     { 0x02da,  320 },
     { 0x02db,  320 },
     { 0x02dc,  440 },
     { 0x02dd,  380 },
-    { 0x03bc,  680 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  220 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1280 },
     { 0x2039,  240 },
     { 0x203a,  240 },
+    { 0x2044,  140 },
+    { 0x20ac,  620 },
     { 0x2122,  980 },
     { 0x2212,  600 },
-    { 0x2215,  140 },
     { 0xfb01,  620 },
     { 0xfb02,  620 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Bookman_Light =
 {
-    "Bookman-Light",			    /* FontName */
-    L"ITC Bookman",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -188, -251, 1266, 908 },		    /* FontBBox */
+    "Bookman-Light", /* FontName */
+    L"ITC Bookman", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -188, -251, 1266, 908 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	942,				    /* WinMetrics.sAscender */
-	-232,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	492,				    /* WinMetrics.sAvgCharWidth */
-	894,				    /* WinMetrics.usWinAscent */
-	231				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        791,  /* WinMetrics.sAscender */
+        -251,  /* WinMetrics.sDescender */
+        108,  /* WinMetrics.sLineGap */
+        493,  /* WinMetrics.sAvgCharWidth */
+        791,  /* WinMetrics.usWinAscent */
+        251,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Bookman_LightItalic.c b/dlls/wineps.drv/data/Bookman_LightItalic.c
index 08a1ac4110f..6b15a0a6d0a 100644
--- a/dlls/wineps.drv/data/Bookman_LightItalic.c
+++ b/dlls/wineps.drv/data/Bookman_LightItalic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Bookman-LightItalic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  300 },
     { 0x0021,  320 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  300 },
     { 0x00ac,  600 },
     { 0x00ae,  740 },
+    { 0x00af,  440 },
     { 0x00b0,  400 },
     { 0x00b1,  600 },
     { 0x00b2,  372 },
     { 0x00b3,  372 },
     { 0x00b4,  320 },
+    { 0x00b5,  640 },
     { 0x00b6,  620 },
     { 0x00b7,  300 },
     { 0x00b8,  320 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  620 },
     { 0x02c6,  440 },
     { 0x02c7,  440 },
-    { 0x02c9,  440 },
     { 0x02d8,  440 },
     { 0x02d9,  260 },
     { 0x02da,  300 },
     { 0x02db,  260 },
     { 0x02dc,  440 },
     { 0x02dd,  340 },
-    { 0x03bc,  620 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  280 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1180 },
     { 0x2039,  180 },
     { 0x203a,  180 },
+    { 0x2044,   20 },
+    { 0x20ac,  620 },
     { 0x2122,  980 },
     { 0x2212,  600 },
-    { 0x2215,   20 },
     { 0xfb01,  640 },
     { 0xfb02,  660 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Bookman_LightItalic =
 {
-    "Bookman-LightItalic",		    /* FontName */
-    L"ITC Bookman",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -10,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -228, -250, 1269, 883 },		    /* FontBBox */
+    "Bookman-LightItalic", /* FontName */
+    L"ITC Bookman", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -10, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -228, -250, 1269, 883 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	942,				    /* WinMetrics.sAscender */
-	-232,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	482,				    /* WinMetrics.sAvgCharWidth */
-	875,				    /* WinMetrics.usWinAscent */
-	232				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        777,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        123,  /* WinMetrics.sLineGap */
+        483,  /* WinMetrics.sAvgCharWidth */
+        777,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Courier.c b/dlls/wineps.drv/data/Courier.c
index a0b3d2f5c7b..41200e92d25 100644
--- a/dlls/wineps.drv/data/Courier.c
+++ b/dlls/wineps.drv/data/Courier.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Courier
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[243] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  600 },
     { 0x0021,  600 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[243] =
     { 0x00ab,  600 },
     { 0x00ac,  600 },
     { 0x00ae,  600 },
+    { 0x00af,  600 },
     { 0x00b0,  600 },
     { 0x00b1,  600 },
     { 0x00b2,  600 },
     { 0x00b3,  600 },
     { 0x00b4,  600 },
+    { 0x00b5,  600 },
     { 0x00b6,  600 },
     { 0x00b7,  600 },
     { 0x00b8,  600 },
@@ -206,31 +199,24 @@ static const AFMMETRICS metrics[243] =
     { 0x00fe,  600 },
     { 0x00ff,  600 },
     { 0x0131,  600 },
-    { 0x0132,  600 },
-    { 0x0133,  600 },
     { 0x0141,  600 },
     { 0x0142,  600 },
     { 0x0152,  600 },
     { 0x0153,  600 },
-    { 0x015e,  600 },
     { 0x0160,  600 },
     { 0x0161,  600 },
     { 0x0178,  600 },
     { 0x017d,  600 },
     { 0x017e,  600 },
     { 0x0192,  600 },
-    { 0x01e6,  600 },
-    { 0x01e7,  600 },
     { 0x02c6,  600 },
     { 0x02c7,  600 },
-    { 0x02c9,  600 },
     { 0x02d8,  600 },
     { 0x02d9,  600 },
     { 0x02da,  600 },
     { 0x02db,  600 },
     { 0x02dc,  600 },
     { 0x02dd,  600 },
-    { 0x03bc,  600 },
     { 0x2013,  600 },
     { 0x2014,  600 },
     { 0x2018,  600 },
@@ -246,19 +232,10 @@ static const AFMMETRICS metrics[243] =
     { 0x2030,  600 },
     { 0x2039,  600 },
     { 0x203a,  600 },
-    { 0x20a4,  600 },
-    { 0x211e,  600 },
+    { 0x2044,  600 },
+    { 0x20ac,  600 },
     { 0x2122,  600 },
-    { 0x2190,  600 },
-    { 0x2191,  600 },
-    { 0x2192,  600 },
-    { 0x2193,  600 },
-    { 0x2194,  600 },
     { 0x2212,  600 },
-    { 0x2215,  600 },
-    { 0xf6bf,  600 },
-    { 0xf6c0,  600 },
-    { 0xf6c2,  600 },
     { 0xfb01,  600 },
     { 0xfb02,  600 },
 };
@@ -270,22 +247,22 @@ static const AFMMETRICS metrics[243] =

const AFM PSDRV_Courier =
 {
-    "Courier",				    /* FontName */
-    L"Courier",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    TRUE,				    /* IsFixedPitch */
-    { -28, -250, 628, 805 },		    /* FontBBox */
+    "Courier", /* FontName */
+    L"Courier", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    TRUE, /* IsFixedPitch */
+    { -6, -249, 639, 803 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	833,				    /* WinMetrics.sAscender */
-	-300,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	600,				    /* WinMetrics.sAvgCharWidth */
-	833,				    /* WinMetrics.usWinAscent */
-	300				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        764,  /* WinMetrics.sAscender */
+        -249,  /* WinMetrics.sDescender */
+        137,  /* WinMetrics.sLineGap */
+        600,  /* WinMetrics.sAvgCharWidth */
+        764,  /* WinMetrics.usWinAscent */
+        249,  /* WinMetrics.usWinDescent */
     },
-    243,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Courier_Bold.c b/dlls/wineps.drv/data/Courier_Bold.c
index 4c64b840722..1960154a613 100644
--- a/dlls/wineps.drv/data/Courier_Bold.c
+++ b/dlls/wineps.drv/data/Courier_Bold.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Courier-Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[243] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  600 },
     { 0x0021,  600 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[243] =
     { 0x00ab,  600 },
     { 0x00ac,  600 },
     { 0x00ae,  600 },
+    { 0x00af,  600 },
     { 0x00b0,  600 },
     { 0x00b1,  600 },
     { 0x00b2,  600 },
     { 0x00b3,  600 },
     { 0x00b4,  600 },
+    { 0x00b5,  600 },
     { 0x00b6,  600 },
     { 0x00b7,  600 },
     { 0x00b8,  600 },
@@ -206,31 +199,24 @@ static const AFMMETRICS metrics[243] =
     { 0x00fe,  600 },
     { 0x00ff,  600 },
     { 0x0131,  600 },
-    { 0x0132,  600 },
-    { 0x0133,  600 },
     { 0x0141,  600 },
     { 0x0142,  600 },
     { 0x0152,  600 },
     { 0x0153,  600 },
-    { 0x015e,  600 },
     { 0x0160,  600 },
     { 0x0161,  600 },
     { 0x0178,  600 },
     { 0x017d,  600 },
     { 0x017e,  600 },
     { 0x0192,  600 },
-    { 0x01e6,  600 },
-    { 0x01e7,  600 },
     { 0x02c6,  600 },
     { 0x02c7,  600 },
-    { 0x02c9,  600 },
     { 0x02d8,  600 },
     { 0x02d9,  600 },
     { 0x02da,  600 },
     { 0x02db,  600 },
     { 0x02dc,  600 },
     { 0x02dd,  600 },
-    { 0x03bc,  600 },
     { 0x2013,  600 },
     { 0x2014,  600 },
     { 0x2018,  600 },
@@ -246,19 +232,10 @@ static const AFMMETRICS metrics[243] =
     { 0x2030,  600 },
     { 0x2039,  600 },
     { 0x203a,  600 },
-    { 0x20a4,  600 },
-    { 0x211e,  600 },
+    { 0x2044,  600 },
+    { 0x20ac,  600 },
     { 0x2122,  600 },
-    { 0x2190,  600 },
-    { 0x2191,  600 },
-    { 0x2192,  600 },
-    { 0x2193,  600 },
-    { 0x2194,  600 },
     { 0x2212,  600 },
-    { 0x2215,  600 },
-    { 0xf6bf,  600 },
-    { 0xf6c0,  600 },
-    { 0xf6c2,  600 },
     { 0xfb01,  600 },
     { 0xfb02,  600 },
 };
@@ -270,22 +247,22 @@ static const AFMMETRICS metrics[243] =

const AFM PSDRV_Courier_Bold =
 {
-    "Courier-Bold",			    /* FontName */
-    L"Courier",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    TRUE,				    /* IsFixedPitch */
-    { -113, -250, 749, 801 },		    /* FontBBox */
+    "Courier-Bold", /* FontName */
+    L"Courier", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    TRUE, /* IsFixedPitch */
+    { -88, -249, 697, 811 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	833,				    /* WinMetrics.sAscender */
-	-300,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	600,				    /* WinMetrics.sAvgCharWidth */
-	833,				    /* WinMetrics.usWinAscent */
-	300				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        764,  /* WinMetrics.sAscender */
+        -249,  /* WinMetrics.sDescender */
+        137,  /* WinMetrics.sLineGap */
+        600,  /* WinMetrics.sAvgCharWidth */
+        764,  /* WinMetrics.usWinAscent */
+        249,  /* WinMetrics.usWinDescent */
     },
-    243,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Courier_BoldOblique.c b/dlls/wineps.drv/data/Courier_BoldOblique.c
index b1f4da097ee..f5837d4d977 100644
--- a/dlls/wineps.drv/data/Courier_BoldOblique.c
+++ b/dlls/wineps.drv/data/Courier_BoldOblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Courier-BoldOblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[243] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  600 },
     { 0x0021,  600 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[243] =
     { 0x00ab,  600 },
     { 0x00ac,  600 },
     { 0x00ae,  600 },
+    { 0x00af,  600 },
     { 0x00b0,  600 },
     { 0x00b1,  600 },
     { 0x00b2,  600 },
     { 0x00b3,  600 },
     { 0x00b4,  600 },
+    { 0x00b5,  600 },
     { 0x00b6,  600 },
     { 0x00b7,  600 },
     { 0x00b8,  600 },
@@ -206,31 +199,24 @@ static const AFMMETRICS metrics[243] =
     { 0x00fe,  600 },
     { 0x00ff,  600 },
     { 0x0131,  600 },
-    { 0x0132,  600 },
-    { 0x0133,  600 },
     { 0x0141,  600 },
     { 0x0142,  600 },
     { 0x0152,  600 },
     { 0x0153,  600 },
-    { 0x015e,  600 },
     { 0x0160,  600 },
     { 0x0161,  600 },
     { 0x0178,  600 },
     { 0x017d,  600 },
     { 0x017e,  600 },
     { 0x0192,  600 },
-    { 0x01e6,  600 },
-    { 0x01e7,  600 },
     { 0x02c6,  600 },
     { 0x02c7,  600 },
-    { 0x02c9,  600 },
     { 0x02d8,  600 },
     { 0x02d9,  600 },
     { 0x02da,  600 },
     { 0x02db,  600 },
     { 0x02dc,  600 },
     { 0x02dd,  600 },
-    { 0x03bc,  600 },
     { 0x2013,  600 },
     { 0x2014,  600 },
     { 0x2018,  600 },
@@ -246,19 +232,10 @@ static const AFMMETRICS metrics[243] =
     { 0x2030,  600 },
     { 0x2039,  600 },
     { 0x203a,  600 },
-    { 0x20a4,  600 },
-    { 0x211e,  600 },
+    { 0x2044,  600 },
+    { 0x20ac,  600 },
     { 0x2122,  600 },
-    { 0x2190,  600 },
-    { 0x2191,  600 },
-    { 0x2192,  600 },
-    { 0x2193,  600 },
-    { 0x2194,  600 },
     { 0x2212,  600 },
-    { 0x2215,  600 },
-    { 0xf6bf,  600 },
-    { 0xf6c0,  600 },
-    { 0xf6c2,  600 },
     { 0xfb01,  600 },
     { 0xfb02,  600 },
 };
@@ -270,22 +247,22 @@ static const AFMMETRICS metrics[243] =

const AFM PSDRV_Courier_BoldOblique =
 {
-    "Courier-BoldOblique",		    /* FontName */
-    L"Courier",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -12,				    /* ItalicAngle */
-    TRUE,				    /* IsFixedPitch */
-    { -56, -250, 868, 801 },		    /* FontBBox */
+    "Courier-BoldOblique", /* FontName */
+    L"Courier", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -11, /* ItalicAngle */
+    TRUE, /* IsFixedPitch */
+    { -49, -249, 758, 811 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	833,				    /* WinMetrics.sAscender */
-	-300,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	600,				    /* WinMetrics.sAvgCharWidth */
-	833,				    /* WinMetrics.usWinAscent */
-	300				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        764,  /* WinMetrics.sAscender */
+        -249,  /* WinMetrics.sDescender */
+        137,  /* WinMetrics.sLineGap */
+        600,  /* WinMetrics.sAvgCharWidth */
+        764,  /* WinMetrics.usWinAscent */
+        249,  /* WinMetrics.usWinDescent */
     },
-    243,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Courier_Oblique.c b/dlls/wineps.drv/data/Courier_Oblique.c
index 0e8f9480923..1a68e69afb2 100644
--- a/dlls/wineps.drv/data/Courier_Oblique.c
+++ b/dlls/wineps.drv/data/Courier_Oblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Courier-Oblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[243] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  600 },
     { 0x0021,  600 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[243] =
     { 0x00ab,  600 },
     { 0x00ac,  600 },
     { 0x00ae,  600 },
+    { 0x00af,  600 },
     { 0x00b0,  600 },
     { 0x00b1,  600 },
     { 0x00b2,  600 },
     { 0x00b3,  600 },
     { 0x00b4,  600 },
+    { 0x00b5,  600 },
     { 0x00b6,  600 },
     { 0x00b7,  600 },
     { 0x00b8,  600 },
@@ -206,31 +199,24 @@ static const AFMMETRICS metrics[243] =
     { 0x00fe,  600 },
     { 0x00ff,  600 },
     { 0x0131,  600 },
-    { 0x0132,  600 },
-    { 0x0133,  600 },
     { 0x0141,  600 },
     { 0x0142,  600 },
     { 0x0152,  600 },
     { 0x0153,  600 },
-    { 0x015e,  600 },
     { 0x0160,  600 },
     { 0x0161,  600 },
     { 0x0178,  600 },
     { 0x017d,  600 },
     { 0x017e,  600 },
     { 0x0192,  600 },
-    { 0x01e6,  600 },
-    { 0x01e7,  600 },
     { 0x02c6,  600 },
     { 0x02c7,  600 },
-    { 0x02c9,  600 },
     { 0x02d8,  600 },
     { 0x02d9,  600 },
     { 0x02da,  600 },
     { 0x02db,  600 },
     { 0x02dc,  600 },
     { 0x02dd,  600 },
-    { 0x03bc,  600 },
     { 0x2013,  600 },
     { 0x2014,  600 },
     { 0x2018,  600 },
@@ -246,19 +232,10 @@ static const AFMMETRICS metrics[243] =
     { 0x2030,  600 },
     { 0x2039,  600 },
     { 0x203a,  600 },
-    { 0x20a4,  600 },
-    { 0x211e,  600 },
+    { 0x2044,  600 },
+    { 0x20ac,  600 },
     { 0x2122,  600 },
-    { 0x2190,  600 },
-    { 0x2191,  600 },
-    { 0x2192,  600 },
-    { 0x2193,  600 },
-    { 0x2194,  600 },
     { 0x2212,  600 },
-    { 0x2215,  600 },
-    { 0xf6bf,  600 },
-    { 0xf6c0,  600 },
-    { 0xf6c2,  600 },
     { 0xfb01,  600 },
     { 0xfb02,  600 },
 };
@@ -270,22 +247,22 @@ static const AFMMETRICS metrics[243] =

const AFM PSDRV_Courier_Oblique =
 {
-    "Courier-Oblique",			    /* FontName */
-    L"Courier",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -12,				    /* ItalicAngle */
-    TRUE,				    /* IsFixedPitch */
-    { -28, -250, 742, 805 },		    /* FontBBox */
+    "Courier-Oblique", /* FontName */
+    L"Courier", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -11, /* ItalicAngle */
+    TRUE, /* IsFixedPitch */
+    { -49, -249, 749, 803 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	833,				    /* WinMetrics.sAscender */
-	-300,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	600,				    /* WinMetrics.sAvgCharWidth */
-	833,				    /* WinMetrics.usWinAscent */
-	300				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        764,  /* WinMetrics.sAscender */
+        -249,  /* WinMetrics.sDescender */
+        137,  /* WinMetrics.sLineGap */
+        600,  /* WinMetrics.sAvgCharWidth */
+        764,  /* WinMetrics.usWinAscent */
+        249,  /* WinMetrics.usWinDescent */
     },
-    243,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica.c b/dlls/wineps.drv/data/Helvetica.c
index 7294382884f..a9162a67b07 100644
--- a/dlls/wineps.drv/data/Helvetica.c
+++ b/dlls/wineps.drv/data/Helvetica.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  278 },
     { 0x0021,  278 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  556 },
     { 0x00ac,  584 },
     { 0x00ae,  737 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  584 },
     { 0x00b2,  333 },
     { 0x00b3,  333 },
     { 0x00b4,  333 },
+    { 0x00b5,  578 },
     { 0x00b6,  537 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  556 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  556 },
     { 0x2013,  556 },
     { 0x2014, 1000 },
     { 0x2018,  222 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  556 },
     { 0x2122, 1000 },
     { 0x2212,  584 },
-    { 0x2215,  167 },
     { 0xfb01,  500 },
     { 0xfb02,  500 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica =
 {
-    "Helvetica",			    /* FontName */
-    L"Helvetica",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -166, -225, 1000, 931 },		    /* FontBBox */
+    "Helvetica", /* FontName */
+    L"Helvetica", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -166, -225, 1000, 931 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	905,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	33,				    /* WinMetrics.sLineGap */
-	441,				    /* WinMetrics.sAvgCharWidth */
-	905,				    /* WinMetrics.usWinAscent */
-	212				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        775,  /* WinMetrics.sAscender */
+        -225,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        442,  /* WinMetrics.sAvgCharWidth */
+        775,  /* WinMetrics.usWinAscent */
+        225,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_Bold.c b/dlls/wineps.drv/data/Helvetica_Bold.c
index fd2aaee9e00..076626a745b 100644
--- a/dlls/wineps.drv/data/Helvetica_Bold.c
+++ b/dlls/wineps.drv/data/Helvetica_Bold.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  278 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  556 },
     { 0x00ac,  584 },
     { 0x00ae,  737 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  584 },
     { 0x00b2,  333 },
     { 0x00b3,  333 },
     { 0x00b4,  333 },
+    { 0x00b5,  611 },
     { 0x00b6,  556 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  556 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  611 },
     { 0x2013,  556 },
     { 0x2014, 1000 },
     { 0x2018,  278 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  556 },
     { 0x2122, 1000 },
     { 0x2212,  584 },
-    { 0x2215,  167 },
     { 0xfb01,  611 },
     { 0xfb02,  611 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_Bold =
 {
-    "Helvetica-Bold",			    /* FontName */
-    L"Helvetica",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -170, -228, 1003, 962 },		    /* FontBBox */
+    "Helvetica-Bold", /* FontName */
+    L"Helvetica", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -170, -228, 1003, 962 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	905,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	33,				    /* WinMetrics.sLineGap */
-	479,				    /* WinMetrics.sAvgCharWidth */
-	905,				    /* WinMetrics.usWinAscent */
-	212				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        776,  /* WinMetrics.sAscender */
+        -228,  /* WinMetrics.sDescender */
+        146,  /* WinMetrics.sLineGap */
+        479,  /* WinMetrics.sAvgCharWidth */
+        776,  /* WinMetrics.usWinAscent */
+        228,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_BoldOblique.c b/dlls/wineps.drv/data/Helvetica_BoldOblique.c
index a48abfba912..1e10a2786a6 100644
--- a/dlls/wineps.drv/data/Helvetica_BoldOblique.c
+++ b/dlls/wineps.drv/data/Helvetica_BoldOblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-BoldOblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  278 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  556 },
     { 0x00ac,  584 },
     { 0x00ae,  737 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  584 },
     { 0x00b2,  333 },
     { 0x00b3,  333 },
     { 0x00b4,  333 },
+    { 0x00b5,  611 },
     { 0x00b6,  556 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  556 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  611 },
     { 0x2013,  556 },
     { 0x2014, 1000 },
     { 0x2018,  278 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  556 },
     { 0x2122, 1000 },
     { 0x2212,  584 },
-    { 0x2215,  167 },
     { 0xfb01,  611 },
     { 0xfb02,  611 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_BoldOblique =
 {
-    "Helvetica-BoldOblique",		    /* FontName */
-    L"Helvetica",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -12,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -174, -228, 1114, 962 },		    /* FontBBox */
+    "Helvetica-BoldOblique", /* FontName */
+    L"Helvetica", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -12, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -175, -228, 1114, 962 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	905,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	33,				    /* WinMetrics.sLineGap */
-	479,				    /* WinMetrics.sAvgCharWidth */
-	905,				    /* WinMetrics.usWinAscent */
-	212				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        776,  /* WinMetrics.sAscender */
+        -228,  /* WinMetrics.sDescender */
+        146,  /* WinMetrics.sLineGap */
+        479,  /* WinMetrics.sAvgCharWidth */
+        776,  /* WinMetrics.usWinAscent */
+        228,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_Narrow.c b/dlls/wineps.drv/data/Helvetica_Narrow.c
index bcd2a577742..b72a67a5156 100644
--- a/dlls/wineps.drv/data/Helvetica_Narrow.c
+++ b/dlls/wineps.drv/data/Helvetica_Narrow.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-Narrow
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  228 },
     { 0x0021,  228 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  456 },
     { 0x00ac,  479 },
     { 0x00ae,  604 },
+    { 0x00af,  273 },
     { 0x00b0,  328 },
     { 0x00b1,  479 },
     { 0x00b2,  273 },
     { 0x00b3,  273 },
     { 0x00b4,  273 },
+    { 0x00b5,  474 },
     { 0x00b6,  440 },
     { 0x00b7,  228 },
     { 0x00b8,  273 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  456 },
     { 0x02c6,  273 },
     { 0x02c7,  273 },
-    { 0x02c9,  273 },
     { 0x02d8,  273 },
     { 0x02d9,  273 },
     { 0x02da,  273 },
     { 0x02db,  273 },
     { 0x02dc,  273 },
     { 0x02dd,  273 },
-    { 0x03bc,  456 },
     { 0x2013,  456 },
     { 0x2014,  820 },
     { 0x2018,  182 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030,  820 },
     { 0x2039,  273 },
     { 0x203a,  273 },
+    { 0x2044,  137 },
+    { 0x20ac,  456 },
     { 0x2122,  820 },
     { 0x2212,  479 },
-    { 0x2215,  137 },
     { 0xfb01,  410 },
     { 0xfb02,  410 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_Narrow =
 {
-    "Helvetica-Narrow",			    /* FontName */
-    L"Helvetica Narrow",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -136, -225, 820, 931 },		    /* FontBBox */
+    "Helvetica-Narrow", /* FontName */
+    L"Helvetica Narrow", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -137, -225, 821, 931 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	936,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	362,				    /* WinMetrics.sAvgCharWidth */
-	922,				    /* WinMetrics.usWinAscent */
-	210				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        775,  /* WinMetrics.sAscender */
+        -225,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        362,  /* WinMetrics.sAvgCharWidth */
+        775,  /* WinMetrics.usWinAscent */
+        225,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_Narrow_Bold.c b/dlls/wineps.drv/data/Helvetica_Narrow_Bold.c
index 55ae1fde97f..5eaa8cbb3e6 100644
--- a/dlls/wineps.drv/data/Helvetica_Narrow_Bold.c
+++ b/dlls/wineps.drv/data/Helvetica_Narrow_Bold.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-Narrow-Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  228 },
     { 0x0021,  273 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  456 },
     { 0x00ac,  479 },
     { 0x00ae,  604 },
+    { 0x00af,  273 },
     { 0x00b0,  328 },
     { 0x00b1,  479 },
     { 0x00b2,  273 },
     { 0x00b3,  273 },
     { 0x00b4,  273 },
+    { 0x00b5,  501 },
     { 0x00b6,  456 },
     { 0x00b7,  228 },
     { 0x00b8,  273 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  456 },
     { 0x02c6,  273 },
     { 0x02c7,  273 },
-    { 0x02c9,  273 },
     { 0x02d8,  273 },
     { 0x02d9,  273 },
     { 0x02da,  273 },
     { 0x02db,  273 },
     { 0x02dc,  273 },
     { 0x02dd,  273 },
-    { 0x03bc,  501 },
     { 0x2013,  456 },
     { 0x2014,  820 },
     { 0x2018,  228 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030,  820 },
     { 0x2039,  273 },
     { 0x203a,  273 },
+    { 0x2044,  137 },
+    { 0x20ac,  456 },
     { 0x2122,  820 },
     { 0x2212,  479 },
-    { 0x2215,  137 },
     { 0xfb01,  501 },
     { 0xfb02,  501 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_Narrow_Bold =
 {
-    "Helvetica-Narrow-Bold",		    /* FontName */
-    L"Helvetica Narrow",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -139, -228, 822, 962 },		    /* FontBBox */
+    "Helvetica-Narrow-Bold", /* FontName */
+    L"Helvetica Narrow", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -140, -228, 823, 962 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	936,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	392,				    /* WinMetrics.sAvgCharWidth */
-	933,				    /* WinMetrics.usWinAscent */
-	210				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        776,  /* WinMetrics.sAscender */
+        -228,  /* WinMetrics.sDescender */
+        146,  /* WinMetrics.sLineGap */
+        393,  /* WinMetrics.sAvgCharWidth */
+        776,  /* WinMetrics.usWinAscent */
+        228,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_Narrow_BoldOblique.c b/dlls/wineps.drv/data/Helvetica_Narrow_BoldOblique.c
index 294af13b53d..13b54b08a08 100644
--- a/dlls/wineps.drv/data/Helvetica_Narrow_BoldOblique.c
+++ b/dlls/wineps.drv/data/Helvetica_Narrow_BoldOblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-Narrow-BoldOblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  228 },
     { 0x0021,  273 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  456 },
     { 0x00ac,  479 },
     { 0x00ae,  604 },
+    { 0x00af,  273 },
     { 0x00b0,  328 },
     { 0x00b1,  479 },
     { 0x00b2,  273 },
     { 0x00b3,  273 },
     { 0x00b4,  273 },
+    { 0x00b5,  501 },
     { 0x00b6,  456 },
     { 0x00b7,  228 },
     { 0x00b8,  273 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  456 },
     { 0x02c6,  273 },
     { 0x02c7,  273 },
-    { 0x02c9,  273 },
     { 0x02d8,  273 },
     { 0x02d9,  273 },
     { 0x02da,  273 },
     { 0x02db,  273 },
     { 0x02dc,  273 },
     { 0x02dd,  273 },
-    { 0x03bc,  501 },
     { 0x2013,  456 },
     { 0x2014,  820 },
     { 0x2018,  228 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030,  820 },
     { 0x2039,  273 },
     { 0x203a,  273 },
+    { 0x2044,  137 },
+    { 0x20ac,  456 },
     { 0x2122,  820 },
     { 0x2212,  479 },
-    { 0x2215,  137 },
     { 0xfb01,  501 },
     { 0xfb02,  501 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_Narrow_BoldOblique =
 {
-    "Helvetica-Narrow-BoldOblique",	    /* FontName */
-    L"Helvetica Narrow",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -12,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -143, -228, 913, 962 },		    /* FontBBox */
+    "Helvetica-Narrow-BoldOblique", /* FontName */
+    L"Helvetica Narrow", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -12, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -143, -228, 914, 962 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	936,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	392,				    /* WinMetrics.sAvgCharWidth */
-	936,				    /* WinMetrics.usWinAscent */
-	212				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        776,  /* WinMetrics.sAscender */
+        -228,  /* WinMetrics.sDescender */
+        146,  /* WinMetrics.sLineGap */
+        393,  /* WinMetrics.sAvgCharWidth */
+        776,  /* WinMetrics.usWinAscent */
+        228,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c b/dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c
index 571bdf353cc..5065e203c26 100644
--- a/dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c
+++ b/dlls/wineps.drv/data/Helvetica_Narrow_Oblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-Narrow-Oblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  228 },
     { 0x0021,  228 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  456 },
     { 0x00ac,  479 },
     { 0x00ae,  604 },
+    { 0x00af,  273 },
     { 0x00b0,  328 },
     { 0x00b1,  479 },
     { 0x00b2,  273 },
     { 0x00b3,  273 },
     { 0x00b4,  273 },
+    { 0x00b5,  474 },
     { 0x00b6,  440 },
     { 0x00b7,  228 },
     { 0x00b8,  273 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  456 },
     { 0x02c6,  273 },
     { 0x02c7,  273 },
-    { 0x02c9,  273 },
     { 0x02d8,  273 },
     { 0x02d9,  273 },
     { 0x02da,  273 },
     { 0x02db,  273 },
     { 0x02dc,  273 },
     { 0x02dd,  273 },
-    { 0x03bc,  456 },
     { 0x2013,  456 },
     { 0x2014,  820 },
     { 0x2018,  182 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030,  820 },
     { 0x2039,  273 },
     { 0x203a,  273 },
+    { 0x2044,  137 },
+    { 0x20ac,  456 },
     { 0x2122,  820 },
     { 0x2212,  479 },
-    { 0x2215,  137 },
     { 0xfb01,  410 },
     { 0xfb02,  410 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_Narrow_Oblique =
 {
-    "Helvetica-Narrow-Oblique",		    /* FontName */
-    L"Helvetica Narrow",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -12,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -139, -225, 915, 931 },		    /* FontBBox */
+    "Helvetica-Narrow-Oblique", /* FontName */
+    L"Helvetica Narrow", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -12, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -140, -225, 915, 931 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	936,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	362,				    /* WinMetrics.sAvgCharWidth */
-	915,				    /* WinMetrics.usWinAscent */
-	210				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        775,  /* WinMetrics.sAscender */
+        -225,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        362,  /* WinMetrics.sAvgCharWidth */
+        775,  /* WinMetrics.usWinAscent */
+        225,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Helvetica_Oblique.c b/dlls/wineps.drv/data/Helvetica_Oblique.c
index d5cbd46996d..f8dd3c3c638 100644
--- a/dlls/wineps.drv/data/Helvetica_Oblique.c
+++ b/dlls/wineps.drv/data/Helvetica_Oblique.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Helvetica-Oblique
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  278 },
     { 0x0021,  278 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  556 },
     { 0x00ac,  584 },
     { 0x00ae,  737 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  584 },
     { 0x00b2,  333 },
     { 0x00b3,  333 },
     { 0x00b4,  333 },
+    { 0x00b5,  578 },
     { 0x00b6,  537 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  556 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  556 },
     { 0x2013,  556 },
     { 0x2014, 1000 },
     { 0x2018,  222 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  556 },
     { 0x2122, 1000 },
     { 0x2212,  584 },
-    { 0x2215,  167 },
     { 0xfb01,  500 },
     { 0xfb02,  500 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Helvetica_Oblique =
 {
-    "Helvetica-Oblique",		    /* FontName */
-    L"Helvetica",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -12,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -170, -225, 1116, 931 },		    /* FontBBox */
+    "Helvetica-Oblique", /* FontName */
+    L"Helvetica", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -12, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -171, -225, 1116, 931 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	905,				    /* WinMetrics.sAscender */
-	-212,				    /* WinMetrics.sDescender */
-	33,				    /* WinMetrics.sLineGap */
-	441,				    /* WinMetrics.sAvgCharWidth */
-	905,				    /* WinMetrics.usWinAscent */
-	212				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        775,  /* WinMetrics.sAscender */
+        -225,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        442,  /* WinMetrics.sAvgCharWidth */
+        775,  /* WinMetrics.usWinAscent */
+        225,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/NewCenturySchlbk_Bold.c b/dlls/wineps.drv/data/NewCenturySchlbk_Bold.c
index 0ce90ea2818..03da6ae34fe 100644
--- a/dlls/wineps.drv/data/NewCenturySchlbk_Bold.c
+++ b/dlls/wineps.drv/data/NewCenturySchlbk_Bold.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for NewCenturySchlbk-Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  287 },
     { 0x0021,  296 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  344 },
     { 0x00b3,  344 },
     { 0x00b4,  333 },
+    { 0x00b5,  685 },
     { 0x00b6,  747 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  574 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  685 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  241 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  574 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  685 },
     { 0xfb02,  685 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_NewCenturySchlbk_Bold =
 {
-    "NewCenturySchlbk-Bold",		    /* FontName */
-    L"New Century Schoolbook",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -165, -250, 1000, 988 },		    /* FontBBox */
+    "NewCenturySchlbk-Bold", /* FontName */
+    L"New Century Schoolbook", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -165, -250, 1000, 988 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	986,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	524,				    /* WinMetrics.sAvgCharWidth */
-	966,				    /* WinMetrics.usWinAscent */
-	215				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        810,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        90,  /* WinMetrics.sLineGap */
+        524,  /* WinMetrics.sAvgCharWidth */
+        810,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c b/dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c
index 197c07705cb..068e1d61a41 100644
--- a/dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c
+++ b/dlls/wineps.drv/data/NewCenturySchlbk_BoldItalic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for NewCenturySchlbk-BoldItalic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  287 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  481 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  344 },
     { 0x00b3,  344 },
     { 0x00b4,  333 },
+    { 0x00b5,  685 },
     { 0x00b6,  650 },
     { 0x00b7,  287 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  574 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  685 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  259 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1167 },
     { 0x2039,  278 },
     { 0x203a,  278 },
+    { 0x2044,  167 },
+    { 0x20ac,  574 },
     { 0x2122,  950 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  685 },
     { 0xfb02,  685 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_NewCenturySchlbk_BoldItalic =
 {
-    "NewCenturySchlbk-BoldItalic",	    /* FontName */
-    L"New Century Schoolbook",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -16,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -205, -250, 1147, 991 },		    /* FontBBox */
+    "NewCenturySchlbk-BoldItalic", /* FontName */
+    L"New Century Schoolbook", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -16, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -205, -250, 1147, 991 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	986,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	515,				    /* WinMetrics.sAvgCharWidth */
-	985,				    /* WinMetrics.usWinAscent */
-	216				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        810,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        90,  /* WinMetrics.sLineGap */
+        515,  /* WinMetrics.sAvgCharWidth */
+        810,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/NewCenturySchlbk_Italic.c b/dlls/wineps.drv/data/NewCenturySchlbk_Italic.c
index 86d7c5035b9..67d4ddc6eb7 100644
--- a/dlls/wineps.drv/data/NewCenturySchlbk_Italic.c
+++ b/dlls/wineps.drv/data/NewCenturySchlbk_Italic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for NewCenturySchlbk-Italic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  278 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  426 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  333 },
     { 0x00b3,  333 },
     { 0x00b4,  333 },
+    { 0x00b5,  611 },
     { 0x00b6,  650 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  556 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  611 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  204 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  556 },
     { 0x2122,  950 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  611 },
     { 0xfb02,  611 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_NewCenturySchlbk_Italic =
 {
-    "NewCenturySchlbk-Italic",		    /* FontName */
-    L"New Century Schoolbook",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -16,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -166, -250, 994, 958 },		    /* FontBBox */
+    "NewCenturySchlbk-Italic", /* FontName */
+    L"New Century Schoolbook", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -16, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -166, -250, 994, 958 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	986,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	458,				    /* WinMetrics.sAvgCharWidth */
-	969,				    /* WinMetrics.usWinAscent */
-	215				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        808,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        92,  /* WinMetrics.sLineGap */
+        458,  /* WinMetrics.sAvgCharWidth */
+        808,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/NewCenturySchlbk_Roman.c b/dlls/wineps.drv/data/NewCenturySchlbk_Roman.c
index 380757e3194..1db0b747ac3 100644
--- a/dlls/wineps.drv/data/NewCenturySchlbk_Roman.c
+++ b/dlls/wineps.drv/data/NewCenturySchlbk_Roman.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for NewCenturySchlbk-Roman
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  278 },
     { 0x0021,  296 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  426 },
     { 0x00ac,  606 },
     { 0x00ae,  737 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  333 },
     { 0x00b3,  333 },
     { 0x00b4,  333 },
+    { 0x00b5,  611 },
     { 0x00b6,  606 },
     { 0x00b7,  278 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  556 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  611 },
     { 0x2013,  556 },
     { 0x2014, 1000 },
     { 0x2018,  204 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  259 },
     { 0x203a,  259 },
+    { 0x2044,  167 },
+    { 0x20ac,  556 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  611 },
     { 0xfb02,  611 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_NewCenturySchlbk_Roman =
 {
-    "NewCenturySchlbk-Roman",		    /* FontName */
-    L"New Century Schoolbook",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -195, -250, 1000, 965 },		    /* FontBBox */
+    "NewCenturySchlbk-Roman", /* FontName */
+    L"New Century Schoolbook", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -195, -250, 1000, 965 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	986,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	464,				    /* WinMetrics.sAvgCharWidth */
-	986,				    /* WinMetrics.usWinAscent */
-	216				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        813,  /* WinMetrics.sAscender */
+        -250,  /* WinMetrics.sDescender */
+        87,  /* WinMetrics.sLineGap */
+        465,  /* WinMetrics.sAvgCharWidth */
+        813,  /* WinMetrics.usWinAscent */
+        250,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Palatino_Bold.c b/dlls/wineps.drv/data/Palatino_Bold.c
index f8ca329a8e7..5925d87d6e5 100644
--- a/dlls/wineps.drv/data/Palatino_Bold.c
+++ b/dlls/wineps.drv/data/Palatino_Bold.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Palatino-Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  278 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  611 },
     { 0x00b6,  641 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  611 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  278 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  389 },
     { 0x203a,  389 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122,  998 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  611 },
     { 0xfb02,  611 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Palatino_Bold =
 {
-    "Palatino-Bold",			    /* FontName */
-    L"Palatino",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -152, -266, 1000, 924 },		    /* FontBBox */
+    "Palatino-Bold", /* FontName */
+    L"Palatino", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -152, -266, 1000, 924 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	923,				    /* WinMetrics.sAscender */
-	-282,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	459,				    /* WinMetrics.sAvgCharWidth */
-	923,				    /* WinMetrics.usWinAscent */
-	265				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        750,  /* WinMetrics.sAscender */
+        -266,  /* WinMetrics.sDescender */
+        134,  /* WinMetrics.sLineGap */
+        459,  /* WinMetrics.sAvgCharWidth */
+        750,  /* WinMetrics.usWinAscent */
+        266,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Palatino_BoldItalic.c b/dlls/wineps.drv/data/Palatino_BoldItalic.c
index d5d217abe0f..2092b300ba0 100644
--- a/dlls/wineps.drv/data/Palatino_BoldItalic.c
+++ b/dlls/wineps.drv/data/Palatino_BoldItalic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Palatino-BoldItalic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  541 },
     { 0x00b6,  556 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  556 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  556 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  278 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  611 },
     { 0xfb02,  611 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Palatino_BoldItalic =
 {
-    "Palatino-BoldItalic",		    /* FontName */
-    L"Palatino",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -10,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -170, -271, 1073, 926 },		    /* FontBBox */
+    "Palatino-BoldItalic", /* FontName */
+    L"Palatino", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -10, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -170, -271, 1073, 926 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	923,				    /* WinMetrics.sAscender */
-	-282,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	447,				    /* WinMetrics.sAvgCharWidth */
-	922,				    /* WinMetrics.usWinAscent */
-	281				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        750,  /* WinMetrics.sAscender */
+        -271,  /* WinMetrics.sDescender */
+        129,  /* WinMetrics.sLineGap */
+        447,  /* WinMetrics.sAvgCharWidth */
+        750,  /* WinMetrics.usWinAscent */
+        271,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Palatino_Italic.c b/dlls/wineps.drv/data/Palatino_Italic.c
index 3ef375fda47..da052518ca4 100644
--- a/dlls/wineps.drv/data/Palatino_Italic.c
+++ b/dlls/wineps.drv/data/Palatino_Italic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Palatino-Italic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  504 },
     { 0x00b6,  500 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  556 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  278 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  528 },
     { 0xfb02,  545 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Palatino_Italic =
 {
-    "Palatino-Italic",			    /* FontName */
-    L"Palatino",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -10,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -170, -276, 1010, 918 },		    /* FontBBox */
+    "Palatino-Italic", /* FontName */
+    L"Palatino", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -10, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -170, -276, 1010, 918 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	923,				    /* WinMetrics.sAscender */
-	-282,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	401,				    /* WinMetrics.sAvgCharWidth */
-	922,				    /* WinMetrics.usWinAscent */
-	280				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        750,  /* WinMetrics.sAscender */
+        -276,  /* WinMetrics.sDescender */
+        124,  /* WinMetrics.sLineGap */
+        401,  /* WinMetrics.sAvgCharWidth */
+        750,  /* WinMetrics.usWinAscent */
+        276,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Palatino_Roman.c b/dlls/wineps.drv/data/Palatino_Roman.c
index f8a5f0e0f74..6235dbe7471 100644
--- a/dlls/wineps.drv/data/Palatino_Roman.c
+++ b/dlls/wineps.drv/data/Palatino_Roman.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Palatino-Roman
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  278 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  606 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  574 },
     { 0x00b6,  628 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  250 },
     { 0x02da,  333 },
     { 0x02db,  313 },
     { 0x02dc,  333 },
     { 0x02dd,  380 },
-    { 0x03bc,  603 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  278 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1144 },
     { 0x2039,  331 },
     { 0x203a,  331 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122,  979 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  605 },
     { 0xfb02,  608 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Palatino_Roman =
 {
-    "Palatino-Roman",			    /* FontName */
-    L"Palatino",			    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -166, -283, 1021, 927 },		    /* FontBBox */
+    "Palatino-Roman", /* FontName */
+    L"Palatino", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -166, -283, 1021, 927 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	923,				    /* WinMetrics.sAscender */
-	-282,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	445,				    /* WinMetrics.sAvgCharWidth */
-	960,				    /* WinMetrics.usWinAscent */
-	282				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        750,  /* WinMetrics.sAscender */
+        -283,  /* WinMetrics.sDescender */
+        117,  /* WinMetrics.sLineGap */
+        445,  /* WinMetrics.sAvgCharWidth */
+        750,  /* WinMetrics.usWinAscent */
+        283,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Symbol.c b/dlls/wineps.drv/data/Symbol.c
index ea50ad8510d..c5cbfbb8890 100644
--- a/dlls/wineps.drv/data/Symbol.c
+++ b/dlls/wineps.drv/data/Symbol.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Symbol
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[188] =
+static const AFMMETRICS metrics[189] =
 {
     { 0xf020,  250 },
     { 0xf021,  333 },
@@ -113,6 +104,7 @@ static const AFMMETRICS metrics[188] =
     { 0xf07c,  200 },
     { 0xf07d,  480 },
     { 0xf07e,  549 },
+    { 0xf0a0,  750 },
     { 0xf0a1,  620 },
     { 0xf0a2,  247 },
     { 0xf0a3,  549 },
@@ -215,22 +207,22 @@ static const AFMMETRICS metrics[188] =

const AFM PSDRV_Symbol =
 {
-    "Symbol",				    /* FontName */
-    L"Symbol",				    /* FamilyName */
-    L"FontSpecific",			    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -180, -293, 1090, 1010 },		    /* FontBBox */
+    "Symbol", /* FontName */
+    L"Symbol", /* FamilyName */
+    L"FontSpecific", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -180, -293, 1090, 1010 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	1005,				    /* WinMetrics.sAscender */
-	-220,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	600,				    /* WinMetrics.sAvgCharWidth */
-	1005,				    /* WinMetrics.usWinAscent */
-	220				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        1010,  /* WinMetrics.sAscender */
+        -293,  /* WinMetrics.sDescender */
+        0,  /* WinMetrics.sLineGap */
+        586,  /* WinMetrics.sAvgCharWidth */
+        1010,  /* WinMetrics.usWinAscent */
+        293,  /* WinMetrics.usWinDescent */
     },
-    188,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    189, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Times_Bold.c b/dlls/wineps.drv/data/Times_Bold.c
index 5c91e4c2d70..84173de7c06 100644
--- a/dlls/wineps.drv/data/Times_Bold.c
+++ b/dlls/wineps.drv/data/Times_Bold.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Times-Bold
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  570 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  570 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  601 },
     { 0x00b6,  540 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  556 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  333 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122, 1000 },
     { 0x2212,  570 },
-    { 0x2215,  167 },
     { 0xfb01,  556 },
     { 0xfb02,  556 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Times_Bold =
 {
-    "Times-Bold",			    /* FontName */
-    L"Times",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -168, -218, 1000, 935 },		    /* FontBBox */
+    "Times-Bold", /* FontName */
+    L"Times", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -168, -218, 1000, 935 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	891,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	42,				    /* WinMetrics.sLineGap */
-	427,				    /* WinMetrics.sAvgCharWidth */
-	891,				    /* WinMetrics.usWinAscent */
-	216				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        782,  /* WinMetrics.sAscender */
+        -218,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        427,  /* WinMetrics.sAvgCharWidth */
+        782,  /* WinMetrics.usWinAscent */
+        218,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Times_BoldItalic.c b/dlls/wineps.drv/data/Times_BoldItalic.c
index c62ef9915df..d5ca0110351 100644
--- a/dlls/wineps.drv/data/Times_BoldItalic.c
+++ b/dlls/wineps.drv/data/Times_BoldItalic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Times-BoldItalic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  389 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  606 },
     { 0x00ae,  747 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  570 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  532 },
     { 0x00b6,  500 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  576 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  333 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122, 1000 },
     { 0x2212,  606 },
-    { 0x2215,  167 },
     { 0xfb01,  556 },
     { 0xfb02,  556 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Times_BoldItalic =
 {
-    "Times-BoldItalic",			    /* FontName */
-    L"Times",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_BOLD,				    /* Weight */
-    -15,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -200, -218, 996, 921 },		    /* FontBBox */
+    "Times-BoldItalic", /* FontName */
+    L"Times", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_BOLD, /* Weight */
+    -15, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -200, -218, 996, 921 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	891,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	42,				    /* WinMetrics.sLineGap */
-	412,				    /* WinMetrics.sAvgCharWidth */
-	891,				    /* WinMetrics.usWinAscent */
-	216				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        782,  /* WinMetrics.sAscender */
+        -218,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        412,  /* WinMetrics.sAvgCharWidth */
+        782,  /* WinMetrics.usWinAscent */
+        218,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Times_Italic.c b/dlls/wineps.drv/data/Times_Italic.c
index b583ef696c5..76c0e080777 100644
--- a/dlls/wineps.drv/data/Times_Italic.c
+++ b/dlls/wineps.drv/data/Times_Italic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Times-Italic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  675 },
     { 0x00ae,  760 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  675 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  514 },
     { 0x00b6,  523 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  500 },
     { 0x2013,  500 },
     { 0x2014,  889 },
     { 0x2018,  333 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122,  980 },
     { 0x2212,  675 },
-    { 0x2215,  167 },
     { 0xfb01,  500 },
     { 0xfb02,  500 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Times_Italic =
 {
-    "Times-Italic",			    /* FontName */
-    L"Times",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -15.5,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -169, -217, 1010, 883 },		    /* FontBBox */
+    "Times-Italic", /* FontName */
+    L"Times", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -15.5, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -169, -217, 1010, 883 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	891,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	42,				    /* WinMetrics.sLineGap */
-	402,				    /* WinMetrics.sAvgCharWidth */
-	891,				    /* WinMetrics.usWinAscent */
-	216				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        783,  /* WinMetrics.sAscender */
+        -217,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        402,  /* WinMetrics.sAvgCharWidth */
+        783,  /* WinMetrics.usWinAscent */
+        217,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/Times_Roman.c b/dlls/wineps.drv/data/Times_Roman.c
index 30f17443ed6..e8d47ac1d05 100644
--- a/dlls/wineps.drv/data/Times_Roman.c
+++ b/dlls/wineps.drv/data/Times_Roman.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for Times-Roman
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  250 },
     { 0x0021,  333 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  500 },
     { 0x00ac,  564 },
     { 0x00ae,  760 },
+    { 0x00af,  333 },
     { 0x00b0,  400 },
     { 0x00b1,  564 },
     { 0x00b2,  300 },
     { 0x00b3,  300 },
     { 0x00b4,  333 },
+    { 0x00b5,  510 },
     { 0x00b6,  453 },
     { 0x00b7,  250 },
     { 0x00b8,  333 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  500 },
     { 0x02c6,  333 },
     { 0x02c7,  333 },
-    { 0x02c9,  333 },
     { 0x02d8,  333 },
     { 0x02d9,  333 },
     { 0x02da,  333 },
     { 0x02db,  333 },
     { 0x02dc,  333 },
     { 0x02dd,  333 },
-    { 0x03bc,  500 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  333 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030, 1000 },
     { 0x2039,  333 },
     { 0x203a,  333 },
+    { 0x2044,  167 },
+    { 0x20ac,  500 },
     { 0x2122,  980 },
     { 0x2212,  564 },
-    { 0x2215,  167 },
     { 0xfb01,  556 },
     { 0xfb02,  556 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_Times_Roman =
 {
-    "Times-Roman",			    /* FontName */
-    L"Times",				    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -168, -218, 1000, 898 },		    /* FontBBox */
+    "Times-Roman", /* FontName */
+    L"Times", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -168, -218, 1000, 898 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	891,				    /* WinMetrics.sAscender */
-	-216,				    /* WinMetrics.sDescender */
-	42,				    /* WinMetrics.sLineGap */
-	401,				    /* WinMetrics.sAvgCharWidth */
-	891,				    /* WinMetrics.usWinAscent */
-	216				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        782,  /* WinMetrics.sAscender */
+        -218,  /* WinMetrics.sDescender */
+        150,  /* WinMetrics.sLineGap */
+        401,  /* WinMetrics.sAvgCharWidth */
+        782,  /* WinMetrics.usWinAscent */
+        218,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/ZapfChancery_MediumItalic.c b/dlls/wineps.drv/data/ZapfChancery_MediumItalic.c
index 95a87f5b8f1..daa3ff10a98 100644
--- a/dlls/wineps.drv/data/ZapfChancery_MediumItalic.c
+++ b/dlls/wineps.drv/data/ZapfChancery_MediumItalic.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for ZapfChancery-MediumItalic
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[228] =
+static const AFMMETRICS metrics[229] =
 {
     { 0x0020,  220 },
     { 0x0021,  280 },
@@ -126,11 +117,13 @@ static const AFMMETRICS metrics[228] =
     { 0x00ab,  340 },
     { 0x00ac,  520 },
     { 0x00ae,  740 },
+    { 0x00af,  440 },
     { 0x00b0,  400 },
     { 0x00b1,  520 },
     { 0x00b2,  264 },
     { 0x00b3,  264 },
     { 0x00b4,  300 },
+    { 0x00b5,  458 },
     { 0x00b6,  500 },
     { 0x00b7,  220 },
     { 0x00b8,  300 },
@@ -218,14 +211,12 @@ static const AFMMETRICS metrics[228] =
     { 0x0192,  440 },
     { 0x02c6,  340 },
     { 0x02c7,  340 },
-    { 0x02c9,  440 },
     { 0x02d8,  440 },
     { 0x02d9,  220 },
     { 0x02da,  300 },
     { 0x02db,  280 },
     { 0x02dc,  440 },
     { 0x02dd,  400 },
-    { 0x03bc,  460 },
     { 0x2013,  500 },
     { 0x2014, 1000 },
     { 0x2018,  240 },
@@ -241,9 +232,10 @@ static const AFMMETRICS metrics[228] =
     { 0x2030,  960 },
     { 0x2039,  240 },
     { 0x203a,  260 },
+    { 0x2044,   60 },
+    { 0x20ac,  440 },
     { 0x2122, 1000 },
     { 0x2212,  520 },
-    { 0x2215,   60 },
     { 0xfb01,  520 },
     { 0xfb02,  520 },
 };
@@ -255,22 +247,22 @@ static const AFMMETRICS metrics[228] =

const AFM PSDRV_ZapfChancery_MediumItalic =
 {
-    "ZapfChancery-MediumItalic",	    /* FontName */
-    L"ITC Zapf Chancery",		    /* FamilyName */
-    L"AdobeStandardEncoding",		    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    -14,				    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -181, -314, 1065, 831 },		    /* FontBBox */
+    "ZapfChancery-MediumItalic", /* FontName */
+    L"ITC Zapf Chancery", /* FamilyName */
+    L"AdobeStandardEncoding", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    -14, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -181, -314, 1065, 831 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	790,				    /* WinMetrics.sAscender */
-	-303,				    /* WinMetrics.sDescender */
-	29,				    /* WinMetrics.sLineGap */
-	350,				    /* WinMetrics.sAvgCharWidth */
-	790,				    /* WinMetrics.usWinAscent */
-	303				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        750,  /* WinMetrics.sAscender */
+        -314,  /* WinMetrics.sDescender */
+        86,  /* WinMetrics.sLineGap */
+        350,  /* WinMetrics.sAvgCharWidth */
+        750,  /* WinMetrics.usWinAscent */
+        314,  /* WinMetrics.usWinDescent */
     },
-    228,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    229, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/ZapfDingbats.c b/dlls/wineps.drv/data/ZapfDingbats.c
index 4fe0dc11822..80399993577 100644
--- a/dlls/wineps.drv/data/ZapfDingbats.c
+++ b/dlls/wineps.drv/data/ZapfDingbats.c
@@ -1,13 +1,4 @@
-/*******************************************************************************
- *
- *	Font metric data for ZapfDingbats
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	See dlls/wineps/data/COPYRIGHTS for font copyright information.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"

@@ -16,7 +7,7 @@
  *  Glyph metrics
  */

-static const AFMMETRICS metrics[188] =
+static const AFMMETRICS metrics[202] =
 {
     { 0xf020,  278 },
     { 0xf021,  974 },
@@ -113,6 +104,20 @@ static const AFMMETRICS metrics[188] =
     { 0xf07c,  392 },
     { 0xf07d,  668 },
     { 0xf07e,  668 },
+    { 0xf080,  390 },
+    { 0xf081,  390 },
+    { 0xf082,  317 },
+    { 0xf083,  317 },
+    { 0xf084,  276 },
+    { 0xf085,  276 },
+    { 0xf086,  509 },
+    { 0xf087,  509 },
+    { 0xf088,  410 },
+    { 0xf089,  410 },
+    { 0xf08a,  234 },
+    { 0xf08b,  234 },
+    { 0xf08c,  334 },
+    { 0xf08d,  334 },
     { 0xf0a1,  732 },
     { 0xf0a2,  544 },
     { 0xf0a3,  544 },
@@ -215,22 +220,22 @@ static const AFMMETRICS metrics[188] =

const AFM PSDRV_ZapfDingbats =
 {
-    "ZapfDingbats",			    /* FontName */
-    L"ITC Zapf Dingbats",		    /* FamilyName */
-    L"FontSpecific",			    /* EncodingScheme */
-    FW_NORMAL,				    /* Weight */
-    0,					    /* ItalicAngle */
-    FALSE,				    /* IsFixedPitch */
-    { -1, -143, 981, 820 },		    /* FontBBox */
+    "ZapfDingbats", /* FontName */
+    L"ITC Zapf Dingbats", /* FamilyName */
+    L"FontSpecific", /* EncodingScheme */
+    FW_NORMAL, /* Weight */
+    0, /* ItalicAngle */
+    FALSE, /* IsFixedPitch */
+    { -1, -143, 981, 820 }, /* FontBBox */
     {
-	1000,				    /* WinMetrics.usUnitsPerEm */
-	801,				    /* WinMetrics.sAscender */
-	-201,				    /* WinMetrics.sDescender */
-	0,				    /* WinMetrics.sLineGap */
-	740,				    /* WinMetrics.sAvgCharWidth */
-	801,				    /* WinMetrics.usWinAscent */
-	201				    /* WinMetrics.usWinDescent */
+        1000,  /* WinMetrics.usUnitsPerEm */
+        820,  /* WinMetrics.sAscender */
+        -143,  /* WinMetrics.sDescender */
+        187,  /* WinMetrics.sLineGap */
+        746,  /* WinMetrics.sAvgCharWidth */
+        820,  /* WinMetrics.usWinAscent */
+        143,  /* WinMetrics.usWinDescent */
     },
-    188,				    /* NumofMetrics */
-    metrics				    /* Metrics */
+    202, /* NumofMetrics */
+    metrics /* Metrics */
 };
diff --git a/dlls/wineps.drv/data/agl.c b/dlls/wineps.drv/data/agl.c
index 0b384936c6d..b22eb19604a 100644
--- a/dlls/wineps.drv/data/agl.c
+++ b/dlls/wineps.drv/data/agl.c
@@ -1,43 +1,56 @@
-/*******************************************************************************
- *
- *	Font and glyph data for the Wine PostScript driver
- *
- *	Copyright 2001 Ian Pilcher
- *
- *
- *	This data is derived from the Adobe Glyph list at
- *
- *	    http://partners.adobe.com/asn/developer/type/glyphlist.txt
- *
- *	and the Adobe Font Metrics files at
- *
- *	    ftp://ftp.adobe.com/pub/adobe/type/win/all/afmfiles/base35/
- *
- *	which are Copyright 1985-1998 Adobe Systems Incorporated.
- *
- */
+/* Automatically generated; DO NOT EDIT!! */

#include "psdrv.h"
-#include "data/agl.h"

-
-/*
- *  Built-in font metrics
- */
+extern const AFM PSDRV_AvantGarde_Book;
+extern const AFM PSDRV_AvantGarde_BookOblique;
+extern const AFM PSDRV_AvantGarde_Demi;
+extern const AFM PSDRV_AvantGarde_DemiOblique;
+extern const AFM PSDRV_Bookman_Demi;
+extern const AFM PSDRV_Bookman_DemiItalic;
+extern const AFM PSDRV_Bookman_Light;
+extern const AFM PSDRV_Bookman_LightItalic;
+extern const AFM PSDRV_Courier;
+extern const AFM PSDRV_Courier_Bold;
+extern const AFM PSDRV_Courier_BoldOblique;
+extern const AFM PSDRV_Courier_Oblique;
+extern const AFM PSDRV_Helvetica;
+extern const AFM PSDRV_Helvetica_Bold;
+extern const AFM PSDRV_Helvetica_BoldOblique;
+extern const AFM PSDRV_Helvetica_Narrow;
+extern const AFM PSDRV_Helvetica_Narrow_Bold;
+extern const AFM PSDRV_Helvetica_Narrow_BoldOblique;
+extern const AFM PSDRV_Helvetica_Narrow_Oblique;
+extern const AFM PSDRV_Helvetica_Oblique;
+extern const AFM PSDRV_NewCenturySchlbk_Bold;
+extern const AFM PSDRV_NewCenturySchlbk_BoldItalic;
+extern const AFM PSDRV_NewCenturySchlbk_Italic;
+extern const AFM PSDRV_NewCenturySchlbk_Roman;
+extern const AFM PSDRV_Palatino_Bold;
+extern const AFM PSDRV_Palatino_BoldItalic;
+extern const AFM PSDRV_Palatino_Italic;
+extern const AFM PSDRV_Palatino_Roman;
+extern const AFM PSDRV_Symbol;
+extern const AFM PSDRV_Times_Bold;
+extern const AFM PSDRV_Times_BoldItalic;
+extern const AFM PSDRV_Times_Italic;
+extern const AFM PSDRV_Times_Roman;
+extern const AFM PSDRV_ZapfChancery_MediumItalic;
+extern const AFM PSDRV_ZapfDingbats;

const AFM *const PSDRV_BuiltinAFMs[] =
 {
-    &PSDRV_AvantGarde_Demi,
-    &PSDRV_AvantGarde_DemiOblique,
     &PSDRV_AvantGarde_Book,
     &PSDRV_AvantGarde_BookOblique,
+    &PSDRV_AvantGarde_Demi,
+    &PSDRV_AvantGarde_DemiOblique,
     &PSDRV_Bookman_Demi,
     &PSDRV_Bookman_DemiItalic,
     &PSDRV_Bookman_Light,
     &PSDRV_Bookman_LightItalic,
+    &PSDRV_Courier,
     &PSDRV_Courier_Bold,
     &PSDRV_Courier_BoldOblique,
-    &PSDRV_Courier,
     &PSDRV_Courier_Oblique,
     &PSDRV_Helvetica,
     &PSDRV_Helvetica_Bold,
diff --git a/dlls/wineps.drv/data/agl.h b/dlls/wineps.drv/data/agl.h
deleted file mode 100644
index 355a93211f3..00000000000
--- a/dlls/wineps.drv/data/agl.h
+++ /dev/null
@@ -1,35 +0,0 @@
-extern const AFM PSDRV_AvantGarde_Demi;
-extern const AFM PSDRV_AvantGarde_DemiOblique;
-extern const AFM PSDRV_AvantGarde_Book;
-extern const AFM PSDRV_AvantGarde_BookOblique;
-extern const AFM PSDRV_Bookman_Demi;
-extern const AFM PSDRV_Bookman_DemiItalic;
-extern const AFM PSDRV_Bookman_Light;
-extern const AFM PSDRV_Bookman_LightItalic;
-extern const AFM PSDRV_Courier_Bold;
-extern const AFM PSDRV_Courier_BoldOblique;
-extern const AFM PSDRV_Courier;
-extern const AFM PSDRV_Courier_Oblique;
-extern const AFM PSDRV_Helvetica;
-extern const AFM PSDRV_Helvetica_Bold;
-extern const AFM PSDRV_Helvetica_BoldOblique;
-extern const AFM PSDRV_Helvetica_Narrow;
-extern const AFM PSDRV_Helvetica_Narrow_Bold;
-extern const AFM PSDRV_Helvetica_Narrow_BoldOblique;
-extern const AFM PSDRV_Helvetica_Narrow_Oblique;
-extern const AFM PSDRV_Helvetica_Oblique;
-extern const AFM PSDRV_NewCenturySchlbk_Bold;
-extern const AFM PSDRV_NewCenturySchlbk_BoldItalic;
-extern const AFM PSDRV_NewCenturySchlbk_Italic;
-extern const AFM PSDRV_NewCenturySchlbk_Roman;
-extern const AFM PSDRV_Palatino_Bold;
-extern const AFM PSDRV_Palatino_BoldItalic;
-extern const AFM PSDRV_Palatino_Italic;
-extern const AFM PSDRV_Palatino_Roman;
-extern const AFM PSDRV_Symbol;
-extern const AFM PSDRV_Times_Bold;
-extern const AFM PSDRV_Times_BoldItalic;
-extern const AFM PSDRV_Times_Italic;
-extern const AFM PSDRV_Times_Roman;
-extern const AFM PSDRV_ZapfChancery_MediumItalic;
-extern const AFM PSDRV_ZapfDingbats;
diff --git a/tools/make_unicode b/tools/make_unicode
index abf7414d793..956461be36e 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -56,6 +56,10 @@ my %data_files =
                 sha  => "477820bb3055bbcc90880d788cd95607d221dc94457bae249231adecf13c12e6" },
  tzdata    => { url  => "https://data.iana.org/time-zones/releases/tzdata$TZVERSION.tar.gz",
                 sha  => "4d5fcbc72c7c450ebfe0b659bd0f1c02fbf52fd7f517a9ea13fe71c21eb5f0d0" },
+ glyphs    => { url  => "https://web.archive.org/web/20021206051753id_/http://partners.adobe.com:80/a...",
+                sha  => "4d071537493190678e51bc43ab5d5e016cfeb7b8b0c14c0a92382d2beba92312" },
+ psfonts   => { url  => "https://mirrors.ctan.org/fonts/adobe/afm/Adobe-Core35_AFMs-229.tar.gz",
+                sha  => "034ed3025cff4c48bbefae90f9eff7dc6237dd384443c594c017b571e49d0649" },
 );

@@ -5849,6 +5853,292 @@ sub dump_registry_script($%)
 }

+sub is_win_ansi($)
+{
+    my $c = shift;
+    return 1 if $c >= 0x0020 && $c <= 0x007e;
+    return 1 if $c >= 0x00a0 && $c <= 0x00ff;
+    return 1 if $c >= 0x0152 && $c <= 0x0153;
+    return 1 if $c >= 0x0160 && $c <= 0x0161;
+    return 1 if $c >= 0x017d && $c <= 0x017e;
+    return 1 if $c >= 0x2013 && $c <= 0x2014;
+    return 1 if $c >= 0x2018 && $c <= 0x201a;
+    return 1 if $c >= 0x201c && $c <= 0x201e;
+    return 1 if $c >= 0x2020 && $c <= 0x2022;
+    return 1 if $c >= 0x2039 && $c <= 0x203a;
+    return 1 if $c == 0x0178;
+    return 1 if $c == 0x0192;
+    return 1 if $c == 0x02c6;
+    return 1 if $c == 0x02c9;
+    return 1 if $c == 0x02dc;
+    return 1 if $c == 0x03bc;
+    return 1 if $c == 0x2026;
+    return 1 if $c == 0x2030;
+    return 1 if $c == 0x20ac;
+    return 1 if $c == 0x2122;
+    return 1 if $c == 0x2219;
+    return 0;
+}
+
+################################################################
+# build the PostScript font metrics
+sub dump_psfonts($)
+{
+    my $dir = shift;
+
+    my @psfonts =
+    (
+     "Courier",
+     "Courier-Bold",
+     "Courier-BoldOblique",
+     "Courier-Oblique",
+     "Helvetica",
+     "Helvetica-Bold",
+     "Helvetica-BoldOblique",
+     "Helvetica-Narrow",
+     "Helvetica-NarrowBold",
+     "Helvetica-NarrowBoldOblique",
+     "Helvetica-NarrowOblique",
+     "Helvetica-Oblique",
+     "ITCAvantGarde-Book",
+     "ITCAvantGarde-BookOblique",
+     "ITCAvantGarde-Demi",
+     "ITCAvantGarde-DemiOblique",
+     "ITCBookman-Demi",
+     "ITCBookman-DemiItalic",
+     "ITCBookman-Light",
+     "ITCBookman-LightItalic",
+     "ITCZapfChancery-MediumItalic",
+     "NewCenturySchlbk-Bold",
+     "NewCenturySchlbk-BoldItalic",
+     "NewCenturySchlbk-Italic",
+     "NewCenturySchlbk-Roman",
+     "Palatino-Bold",
+     "Palatino-BoldItalic",
+     "Palatino-Italic",
+     "Palatino-Roman",
+     "Symbol",
+     "Times-Bold",
+     "Times-BoldItalic",
+     "Times-Italic",
+     "Times-Roman",
+     "ZapfDingbats",
+    );
+
+    my %fonts;
+    my %glyphs;
+    my %glyph_values;
+
+    my $FILE = open_data_file( "glyphs" );
+    while (<$FILE>)
+    {
+        chomp;
+        s/\r$//;
+        next if /^$/;
+        next if /^#/;
+        if (/([0-9A-F]+);([A-Za-z0-9_]+);/)
+        {
+            $glyph_values{$1} ||= $2;
+            $glyphs{$2} ||= hex $1;
+            next;
+        }
+        die "unrecognized line $_";
+    }
+
+    foreach my $file (@psfonts)
+    {
+        my $FILE = open_data_file( "psfonts", "Adobe-Core35_AFMs-229/$file.afm" );
+        my %font;
+        while (<$FILE>)
+        {
+            chomp;
+            last if /^StartFontMetrics\s/;
+            die "unrecognized line $_";
+        }
+        while (<$FILE>)
+        {
+            chomp;
+            last if /^StartCharMetrics\s/;
+            next if /^Comment\s/;
+            if (/^([A-Za-z]+)\s+(.*)/)
+            {
+                $font{$1} = $2;
+                next;
+            }
+            die "unrecognized line $_";
+        }
+        $font{chars} = [ ];
+        my $ascender = 0;
+        my $descender = 0;
+        while (<$FILE>)
+        {
+            chomp;
+            last if /^EndCharMetrics$/;
+            my @fields = split /\s*;\s*/;
+            my %char;
+            foreach my $f (@fields)
+            {
+                if ($f =~ /^C\s+(-?\d+)/)
+                {
+                    $char{C} = $1;
+                }
+                elsif ($f =~ /^WX\s+(\d+)/)
+                {
+                    $char{WX} = $1;
+                }
+                elsif ($f =~ /^N\s+([A-Za-z0-9_]+)/)
+                {
+                    $char{N} = $1;
+                    if ($font{EncodingScheme} eq "FontSpecific")
+                    {
+                        if ($char{C} == -1)
+                        {
+                            %char = ();
+                            last;
+                        }
+                        $char{UV} = 0xf000 + $char{C};
+                    }
+                    elsif (defined $glyphs{$1})
+                    {
+                        $char{UV} = $glyphs{$1};
+                    }
+                    else
+                    {
+                        %char = ();
+                        last;
+                    }
+                }
+                elsif ($f =~ /^B\s+(.*)/)
+                {
+                    next if $font{EncodingScheme} eq "FontSpecific";
+                    next unless is_win_ansi( $char{C} );
+                    my @bbox = split /\s+/, $1;
+                    $ascender = $bbox[3] if $bbox[3] > $ascender;
+                    $descender = $bbox[1] if $bbox[1] < $descender;
+                }
+                elsif ($f =~ /^L\s+/)
+                {
+                    next;
+                }
+                else { die "unrecognized field $f"; }
+            }
+            push @{$font{chars}}, %char if %char;
+        }
+        close $FILE;
+
+        $font{FamilyName} .= " Narrow" if $font{FullName} =~ / Narrow/;
+        my @bbox = split /\s+/, $font{FontBBox};
+        $ascender ||= $bbox[3];
+        $descender ||= $bbox[1];
+        my $linegap = 1150 - ($ascender - $descender);
+        $font{FontBBox} = @bbox;
+        $font{usUnitsPerEm} = 1000;
+        $font{sAscender} = $ascender;
+        $font{sDescender} = $descender;
+        $font{sLineGap} = $linegap > 0 ? $linegap : 0;
+        $font{usWinAscent} = $ascender;
+        $font{usWinDescent} = -$descender;
+
+        if ($font{EncodingScheme} eq "FontSpecific")
+        {
+            my $width = 0;
+            foreach my $m (@{$font{chars}})
+            {
+                $width += $m->{WX};
+            }
+            $font{sAvgCharWidth} = $width / scalar @{$font{chars}};
+        }
+        else
+        {
+            my @weights;
+            $weights[ord(' ')] = 166;
+            @weights[ord('a')..ord('z')] = ( 64, 14, 27,  35, 100, 20, 14, 42, 63, 3, 6, 35, 20, 56, 56, 17, 4, 49, 56, 71, 31, 10, 18, 3, 18, 2 );
+            my $width = 0;
+            foreach my $m (@{$font{chars}})
+            {
+                next unless defined $weights[$m->{UV}];
+                $width += $weights[$m->{UV}] * $m->{WX};
+            }
+            $font{sAvgCharWidth} = ($width + 500) / 1000;
+        }
+        (my $varname = $font{FontName}) =~ s/-/_/g;
+        $fonts{$varname} = %font;
+    }
+
+    foreach my $name (sort keys %fonts)
+    {
+        my $count = scalar @{$fonts{$name}->{chars}};
+        my $filename = sprintf "%s/%s.c", $dir, $name;
+        printf "Building %s\n", $filename;
+        open OUTPUT, ">$filename.new" or die "Cannot create $filename";
+        print OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n";
+        print OUTPUT "#include "psdrv.h"\n\n";
+        print OUTPUT "\n/*\n *  Glyph metrics\n */\n\n";
+        printf OUTPUT "static const AFMMETRICS metrics[%u] =\n{\n", $count;
+        foreach my $m (sort { $a->{UV} <=> $b->{UV} } @{$fonts{$name}->{chars}})
+        {
+            printf OUTPUT "    { 0x%04x, %4u },\n", $m->{UV}, $m->{WX};
+        }
+        print OUTPUT  "};\n";
+        my %weights = ( Bold => "FW_BOLD",
+                        Book => "FW_NORMAL",
+                        Demi => "FW_BOLD",
+                        Light => "FW_NORMAL",
+                        Roman => "FW_NORMAL",
+                        Medium => "FW_NORMAL",
+            );
+        printf OUTPUT "\n\n/*\n *  Font metrics\n */\n\nconst AFM PSDRV_%s =\n{\n", $name;
+        printf OUTPUT "    "%s", /* FontName */\n", $fonts{$name}->{FontName};
+        printf OUTPUT "    L"%s", /* FamilyName */\n", $fonts{$name}->{FamilyName};
+        printf OUTPUT "    L"%s", /* EncodingScheme */\n", $fonts{$name}->{EncodingScheme};
+        printf OUTPUT "    %s, /* Weight */\n", $weights{$fonts{$name}->{Weight}};
+        printf OUTPUT "    %s, /* ItalicAngle */\n", $fonts{$name}->{ItalicAngle};
+        printf OUTPUT "    %s, /* IsFixedPitch */\n", uc $fonts{$name}->{IsFixedPitch};
+        printf OUTPUT "    { %d, %d, %d, %d }, /* FontBBox */\n", @{$fonts{$name}->{FontBBox}}[0..3];
+        print OUTPUT  "    {\n";
+        printf OUTPUT "        %d,  /* WinMetrics.usUnitsPerEm */\n", $fonts{$name}->{usUnitsPerEm};
+        printf OUTPUT "        %d,  /* WinMetrics.sAscender */\n", $fonts{$name}->{sAscender};
+        printf OUTPUT "        %d,  /* WinMetrics.sDescender */\n", $fonts{$name}->{sDescender};
+        printf OUTPUT "        %d,  /* WinMetrics.sLineGap */\n", $fonts{$name}->{sLineGap};
+        printf OUTPUT "        %d,  /* WinMetrics.sAvgCharWidth */\n", $fonts{$name}->{sAvgCharWidth};
+        printf OUTPUT "        %d,  /* WinMetrics.usWinAscent */\n", $fonts{$name}->{usWinAscent};
+        printf OUTPUT "        %d,  /* WinMetrics.usWinDescent */\n", $fonts{$name}->{usWinDescent};
+        print OUTPUT  "    },\n";
+        printf OUTPUT "    %s, /* NumofMetrics */\n", $count;
+        print OUTPUT "    metrics /* Metrics */\n";
+        print OUTPUT  "};\n";
+        close OUTPUT;
+        save_file($filename);
+    }
+
+    my $filename = "$dir/agl.c";
+    printf "Building %s\n", $filename;
+    open OUTPUT, ">$filename.new" or die "Cannot create $filename";
+    print OUTPUT "/* Automatically generated; DO NOT EDIT!! */\n\n";
+    print OUTPUT "#include "psdrv.h"\n\n";
+    map { print OUTPUT  "extern const AFM PSDRV_$_;\n"; } sort keys %fonts;
+    print OUTPUT "\nconst AFM *const PSDRV_BuiltinAFMs[] =\n{\n";
+    map { print OUTPUT  "    &PSDRV_$_,\n"; } sort keys %fonts;
+    print OUTPUT  "    NULL\n};\n\n";
+
+    my $count = scalar keys %glyphs;
+    print OUTPUT "\n/*\n *  The AGL encoding vector, sorted by glyph name - duplicates omitted\n */\n\n";
+    print OUTPUT "const INT PSDRV_AGLbyNameSize = $count;\n\n";
+    print OUTPUT "const UNICODEGLYPH PSDRV_AGLbyName[$count] =\n{\n";
+    map { printf OUTPUT "    { 0x%04x, "$_" },\n", $glyphs{$_}; } sort keys %glyphs;
+    print OUTPUT "};\n\n";
+
+    $count = scalar keys %glyph_values;
+    print OUTPUT "\n/*\n *  The AGL encoding vector, sorted by Unicode value - duplicates included\n */\n\n";
+    print OUTPUT "const INT PSDRV_AGLbyUVSize = $count;\n\n";
+    print OUTPUT "const UNICODEGLYPH PSDRV_AGLbyUV[$count] =\n{\n";
+    map { printf OUTPUT "    { 0x%04x, "%s" },\n", hex $_, $glyph_values{$_}; } sort keys %glyph_values;
+    print OUTPUT "};\n";
+    close OUTPUT;
+    save_file($filename);
+}
+
+
 ################################################################
 # save a file if modified
 sub save_file($)
@@ -5886,6 +6176,7 @@ dump_scripts( "dlls/dwrite/scripts" );
 dump_indic( "dlls/gdi32/uniscribe/indicsyllable.c" );
 dump_vertical( "dlls/win32u/vertical.c", 1 );
 dump_vertical( "dlls/wineps.drv/vertical.c", 0 );
+dump_psfonts( "dlls/wineps.drv/data" );
 dump_intl_nls("nls/l_intl.nls");
 dump_norm_table( "nls/normnfc.nls" );
 dump_norm_table( "nls/normnfd.nls" );