diff -u -r freetype/freetype1-contrib/ttf2pk/ttf2tfm.c freetype.old/freetype1-contrib/ttf2pk/ttf2tfm.c
--- freetype/freetype1-contrib/ttf2pk/ttf2tfm.c	Fri Jun 21 17:02:17 2002
+++ freetype.old/freetype1-contrib/ttf2pk/ttf2tfm.c	Thu Jun 20 19:34:37 2002
@@ -51,7 +51,7 @@
 static Boolean pedantic;
 static Boolean quiet;
 static Boolean forceoctal;
-static unsigned long int userxheight=0;
+
 
 /*
  *   Re-encode the TTF font.
@@ -286,7 +286,6 @@
 -V SCFILE[.vpl]     like -v, but synthesize smallcaps as lowercase\n\
 -w                  generate subfont enc. vectors containing glyph indices\n\
 -x                  rotate subfont glyphs by 90 degrees\n\
--X INT              Define INT (not 0) as x-height for the vpl file\n\
 -y REAL             move rotated glyphs down by a factor of REAL [0.25]\n\
 --help              print this message and exit\n\
 --version           print version number and exit\n\
@@ -529,13 +528,6 @@
       arginc = 1;
       break;
 
-    case 'X':
-      if (argc <= 3)
-        oops("Missing parameter for -X option.");
-      if (sscanf(argv[3], "%lu", &userxheight) == 0)
-        oops("Invalid x-height parameter.");
-      break;
-
     default:
       if (argc <= 3 || argv[3][0] == '-')
       {
@@ -881,12 +873,6 @@
           font.xheight = ti->ury;
         else
           font.xheight = 400;
-      }
-      
-      /* Anyway, try to get a user-defined xheight value */
-      if (userxheight) {
-	warning("As requested, using %lu as x-height value (instead of %lu).",userxheight,font.xheight);
-	font.xheight=userxheight;
       }
 
       if (NULL != (ti = findadobe("space", font.charlist)))
diff -u -r freetype/freetype1-contrib/ttf2pk/vplaux.c freetype.old/freetype1-contrib/ttf2pk/vplaux.c
--- freetype/freetype1-contrib/ttf2pk/vplaux.c	Fri Jun 21 16:57:22 2002
+++ freetype.old/freetype1-contrib/ttf2pk/vplaux.c	Tue Jan  8 13:48:27 2002
@@ -1,4 +1,4 @@
- /*
+/*
  *   vplaux.c
  *
  *   This file is part of the ttf2pk package.
@@ -103,9 +103,6 @@
   return buf;
 }
 
-/* This function is kept for reference. It was derived from afmtotfm, but if */
-/* the x-height parameter is correctly set for the font, it is not useful. */
-/* The trouble with the /accent macro exists only for badly set x-heights. */
 
 static int
 texheight(register ttfinfo *ti,
@@ -225,7 +222,7 @@
   register pcc *npcc;
   ttfinfo *asucc, *asub, *api;
   ttfptr *kern_eq;
-  int xoff, yoff;
+  int xoff, yoff, ht;
   int bc, ec;
   char buf[200];
   char header[256];
@@ -511,8 +508,8 @@
       {
         ti = fnt->uppercase[i];
         voutln2("(CHARWD R %.1f)", fnt->capheight * (ti->width));
-        if (ti->ury)
-          voutln2("(CHARHT R %.1f)", fnt->capheight * ti->ury);
+        if (0 != (ht = texheight(ti, fnt->charlist, fnt->xheight)))
+          voutln2("(CHARHT R %.1f)", fnt->capheight * ht);
         if (ti->lly)
           voutln2("(CHARDP R %.1f)", -fnt->capheight * ti->lly);
         if (ti->urx > ti->width)
@@ -521,8 +518,8 @@
       else
       {
         voutln2("(CHARWD R %d)", ti->width);
-        if (ti->ury)
-          voutln2("(CHARHT R %d)", ti->ury);
+        if (0 != (ht = texheight(ti, fnt->charlist, fnt->xheight)))
+          voutln2("(CHARHT R %d)", ht);
         if (ti->lly)
           voutln2("(CHARDP R %d)", -ti->lly);
         if (ti->urx > ti->width)