Index: src/cairo-ft-font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-ft-font.c,v
retrieving revision 1.98
diff -u -r1.98 cairo-ft-font.c
--- src/cairo-ft-font.c	11 Aug 2005 21:49:07 -0000	1.98
+++ src/cairo-ft-font.c	13 Aug 2005 08:53:41 -0000
@@ -1310,6 +1310,7 @@
 _get_pattern_load_flags (FcPattern *pattern)
 {
     FcBool antialias, vertical_layout, hinting, autohint;
+    FcBool global_advance;
     int rgba;
 #ifdef FC_HINT_STYLE    
     int hintstyle;
@@ -1391,10 +1392,17 @@
     if (FcPatternGetBool (pattern,
 			  FC_VERTICAL_LAYOUT, 0, &vertical_layout) != FcResultMatch)
 	vertical_layout = FcFalse;
+
+    if (FcPatternGetBool (pattern,
+			  FC_GLOBAL_ADVANCE, 0, &global_advance) != FcResultMatch)
+	global_advance = FcTrue;
     
     if (vertical_layout)
 	load_flags |= FT_LOAD_VERTICAL_LAYOUT;
     
+    if (!global_advance)
+	load_flags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
+
     return load_flags;
 }
 
@@ -1555,7 +1563,7 @@
     if (!unscaled)
 	goto FREE_RESOLVED;
 
-    load_flags = _get_pattern_load_flags (pattern);
+    load_flags = _get_pattern_load_flags (resolved);
 
     new_font = _cairo_ft_scaled_font_create (unscaled,
 					     &toy_face->base,