--- freetype-2.1.2~/freetype-pre1.4/lib/ttgload.c Sun Jan 2 10:14:16 2000 +++ freetype-2.1.2/freetype-pre1.4/lib/ttgload.c Mon Sep 16 18:10:18 2002 @@ -84,18 +84,18 @@ /********************************************************/ /* Return horizontal metrics in font units for a given */ -/* glyph. If `check' is true, take care of mono-spaced */ -/* fonts by returning the advance width max. */ +/* glyph. If `force_check' is true, take care of mono- */ +/* spaced fonts by returning the advance width max. */ static void Get_HMetrics( PFace face, UShort index, - Bool check, + Bool force_check, Short* lsb, UShort* aw ) { TT_Get_Metrics( &face->horizontalHeader, index, lsb, aw ); - if ( check && face->postscript.isFixedPitch ) + if ( force_check && face->postscript.isFixedPitch ) *aw = face->horizontalHeader.advance_Width_Max; } @@ -730,7 +730,10 @@ Get_HMetrics( face, (UShort)index, + /* !(load_flags & TTLOAD_IGNORE_GLOBAL_ADVANCE_WIDTH), + */ + FALSE, &left_bearing, &advance_width );