From b31315f9da2b0b401776dab33a974c26b284eca6 Mon Sep 17 00:00:00 2001 From: asac Date: Mon, 12 Mar 2007 17:02:56 +0100 Subject: [PATCH] deb299697-lp42559-use-FC_ANY_METRICS --- gfx/cairo/cairo/src/cairo-ft-font.c | 1 + gfx/src/cairo/nsFontMetricsXft.cpp | 4 ++++ gfx/src/gtk/nsFontMetricsXft.cpp | 4 ++++ gfx/src/ps/nsFontMetricsPS.cpp | 2 ++ 4 files changed, 11 insertions(+), 0 deletions(-) diff --git a/gfx/cairo/cairo/src/cairo-ft-font.c b/gfx/cairo/cairo/src/cairo-ft-font.c index b2be2cd..fd4879b 100644 --- a/gfx/cairo/cairo/src/cairo-ft-font.c +++ b/gfx/cairo/cairo/src/cairo-ft-font.c @@ -1588,6 +1588,7 @@ _cairo_ft_scaled_font_create_toy (cairo_toy_font_face_t *toy_face, _compute_transform (&sf, &scale); FcPatternAddInteger (pattern, FC_PIXEL_SIZE, sf.y_scale); + FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); FcConfigSubstitute (NULL, pattern, FcMatchPattern); cairo_ft_font_options_substitute (options, pattern); diff --git a/gfx/src/cairo/nsFontMetricsXft.cpp b/gfx/src/cairo/nsFontMetricsXft.cpp index 5f10a83..275a1e7 100644 --- a/gfx/src/cairo/nsFontMetricsXft.cpp +++ b/gfx/src/cairo/nsFontMetricsXft.cpp @@ -1059,6 +1059,8 @@ nsFontMetricsXft::SetupFCPattern(void) FcPatternAddInteger(mPattern, FC_WEIGHT, NS_CalculateWeight(mFont.weight)); + FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); + // Set up the default substitutions for this font FcConfigSubstitute(0, mPattern, FcMatchPattern); XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), @@ -1221,6 +1223,8 @@ nsFontMetricsXft::SetupMiniFont(void) FcPatternAddInteger(pattern, FC_WEIGHT, NS_CalculateWeight(mFont.weight)); + FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); + FcConfigSubstitute(0, pattern, FcMatchPattern); XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), pattern); diff --git a/gfx/src/gtk/nsFontMetricsXft.cpp b/gfx/src/gtk/nsFontMetricsXft.cpp index 4c8ac2f..04eb053 100644 --- a/gfx/src/gtk/nsFontMetricsXft.cpp +++ b/gfx/src/gtk/nsFontMetricsXft.cpp @@ -1117,6 +1117,8 @@ nsFontMetricsXft::SetupFCPattern(void) FcPatternAddInteger(mPattern, FC_WEIGHT, NS_CalculateWeight(mFont.weight)); + FcPatternAddBool (mPattern, FC_ANY_METRICS, FcTrue); + // Set up the default substitutions for this font FcConfigSubstitute(0, mPattern, FcMatchPattern); XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), @@ -1279,6 +1281,8 @@ nsFontMetricsXft::SetupMiniFont(void) FcPatternAddInteger(pattern, FC_WEIGHT, NS_CalculateWeight(mFont.weight)); + FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); + FcConfigSubstitute(0, pattern, FcMatchPattern); XftDefaultSubstitute(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()), pattern); diff --git a/gfx/src/ps/nsFontMetricsPS.cpp b/gfx/src/ps/nsFontMetricsPS.cpp index e190a6f..fd2ef8b 100644 --- a/gfx/src/ps/nsFontMetricsPS.cpp +++ b/gfx/src/ps/nsFontMetricsPS.cpp @@ -950,6 +950,8 @@ nsFontPSXft::FindFont(PRUnichar aChar, const nsFont& aFont, // Add the weight FcPatternAddInteger(pattern, FC_WEIGHT, NS_CalculateWeight(aFont.weight)); + FcPatternAddBool (pattern, FC_ANY_METRICS, FcTrue); + // Set up the default substitutions for this font FcConfigSubstitute(0, pattern, FcMatchPattern); FcDefaultSubstitute(pattern); -- 1.4.4.4