--- old/contrib/ttf2pk/texenc.c	2002-11-11 09:34:23.000000000 +0100
+++ new/contrib/ttf2pk/texenc.c	2002-11-11 09:33:58.000000000 +0100
@@ -184,19 +184,6 @@
   "=:", "|=:", "|=:>", "=:|", "=:|>", "|=:|", "|=:|>", "|=:|>>", 0
 };
 
-
-/*
- *   For TeX we want to compute a character height that works properly
- *   with accents.  The following list of accents doesn't need to be
- *   complete.
- */
-
-/*
- *   We only do this if the xheight has a reasonable value (>50).
- */
-
-char *accents[] = {"acute", "tilde", "caron", "dieresis", NULL};
-
 char default_codingscheme[] = "Unspecified";
 
 
--- old/contrib/ttf2pk/texenc.h	2002-11-11 09:34:23.000000000 +0100
+++ new/contrib/ttf2pk/texenc.h	2002-11-11 09:33:55.000000000 +0100
@@ -18,7 +18,6 @@
 extern char *staticligkern[];
 extern char *vplligops[];
 extern char *encligops[];
-extern char *accents[];
 
 extern char default_codingscheme[];
 
--- old/contrib/ttf2pk/vplaux.c	2002-11-11 09:34:23.000000000 +0100
+++ new/contrib/ttf2pk/vplaux.c	2002-11-11 09:28:42.000000000 +0100
@@ -104,32 +104,6 @@
 }
 
 
-static int
-texheight(register ttfinfo *ti,
-          ttfinfo *ac,
-          int xh)
-{
-  register char **p;
-  register ttfinfo *aci, *acci;
-  char buffer[200];
-
-
-  if (xh <= 50 || *(ti->adobename + 1))
-    return ti->ury;                     /* that was the simple case */
-
-  for (p = accents; *p; p++)    /* otherwise we look for accented letters.  */
-                                /* We even check glyphs not in any encoding */
-    if (NULL != (aci = findadobe(*p, ac)))
-    {
-      strcpy(buffer, ti->adobename);
-      strcat(buffer, *p);
-      if (NULL != (acci = findadobe(buffer, ac)))
-        return acci->ury - aci->ury + xh;
-    }
-  return ti->ury;
-}
-
-
 /*
  *   Compute uppercase mapping, when making a small caps font.
  */
@@ -508,8 +482,8 @@
       {
         ti = fnt->uppercase[i];
         voutln2("(CHARWD R %.1f)", fnt->capheight * (ti->width));
-        if (0 != (ht = texheight(ti, fnt->charlist, fnt->xheight)))
-          voutln2("(CHARHT R %.1f)", fnt->capheight * ht);
+	if (ti->ury)
+          voutln2("(CHARHT R %.1f)", fnt->capheight * ti->ury);
         if (ti->lly)
           voutln2("(CHARDP R %.1f)", -fnt->capheight * ti->lly);
         if (ti->urx > ti->width)
@@ -518,8 +492,8 @@
       else
       {
         voutln2("(CHARWD R %d)", ti->width);
-        if (0 != (ht = texheight(ti, fnt->charlist, fnt->xheight)))
-          voutln2("(CHARHT R %d)", ht);
+        if (ti->ury)
+	  voutln2("(CHARHT R %d)", ti->ury);
         if (ti->lly)
           voutln2("(CHARDP R %d)", -ti->lly);
         if (ti->urx > ti->width)