--- freetype-2.1.2~/src/truetype/ttgload.c	Mon Sep 16 17:22:03 2002
+++ freetype-2.1.2/src/truetype/ttgload.c	Mon Sep 16 18:06:02 2002
@@ -116,19 +116,19 @@
   /*************************************************************************/
   /*                                                                       */
   /* Returns the horizontal metrics in font units for a given glyph.  If   */
-  /* `check' is true, take care of monospaced fonts by returning the       */
-  /* advance width maximum.                                                */
+  /* `force_check' is true, take care of monospaced fonts by returning     */
+  /* the advance width maximum.                                            */
   /*                                                                       */
   static void
   Get_HMetrics( TT_Face     face,
                 FT_UInt     idx,
-                FT_Bool     check,
+                FT_Bool     force_check,
                 FT_Short*   lsb,
                 FT_UShort*  aw )
   {
     TT_Get_Metrics( &face->horizontal, idx, lsb, aw );
 
-    if ( check && face->postscript.isFixedPitch )
+    if ( force_check && face->postscript.isFixedPitch )
       *aw = face->horizontal.advance_Width_Max;
   }
 
@@ -816,16 +816,22 @@
 
       if ( !metrics_found )
         Get_HMetrics( face, glyph_index,
+                      /*
                       (FT_Bool)!( loader->load_flags &
                                   FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ),
+                       */
+                      FALSE,
                       &left_bearing,
                       &advance_width );
 
 #else
 
       Get_HMetrics( face, glyph_index,
+                    /*
                     (FT_Bool)!( loader->load_flags &
                                 FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ),
+                     */
+                    FALSE,
                     &left_bearing,
                     &advance_width );
 
@@ -1400,7 +1406,10 @@
       /* exclusively in the X-TrueType font server.                     */
       /*                                                                */
       if ( face->postscript.isFixedPitch                                     &&
+           /*
            ( loader->load_flags & FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH ) == 0 )
+            */
+           FALSE )
         advance = face->horizontal.advance_Width_Max;
 
       /* we need to return the advance in font units in linearHoriAdvance, */