diff options
| author | Owen Taylor <otaylor@redhat.com> | 2004-12-17 19:44:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2004-12-17 19:44:56 +0000 |
| commit | a947a4efe7913df1e1ca4e1e7b0264938fa89b20 (patch) | |
| tree | 79612fa496d797fdfa88df352ba41d5626463a54 | |
| parent | 9c03716c09258556049be6ec8055b927f3bafb5b (diff) | |
| download | pango-a947a4efe7913df1e1ca4e1e7b0264938fa89b20.tar.gz | |
Use FC_WEIGHT_MEDIUM, not FC_WEIGHT_NORMAL in old-fontconfig case.
Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use
FC_WEIGHT_MEDIUM, not FC_WEIGHT_NORMAL in old-fontconfig
case. (#161568, Vincent Noel)
Fri Dec 17 12:44:10 2004 Owen Taylor <otaylor@redhat.com>
* configure.in: Fix a couple of typos in the handling of
tibetan for --with-included-modules. (#161501, Sebastien Bacher)
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 11 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 2 |
4 files changed, 25 insertions, 3 deletions
@@ -1,3 +1,14 @@ +Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use + FC_WEIGHT_MEDIUM, not FC_WEIGHT_NORMAL in old-fontconfig + case. (#161568, Vincent Noel) + +Fri Dec 17 12:44:10 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Fix a couple of typos in the handling of + tibetan for --with-included-modules. (#161501, Sebastien Bacher) + Fri Dec 17 12:28:56 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_get_extents_internal): Fix diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 11615467..cd0cc712 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,14 @@ +Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use + FC_WEIGHT_MEDIUM, not FC_WEIGHT_NORMAL in old-fontconfig + case. (#161568, Vincent Noel) + +Fri Dec 17 12:44:10 2004 Owen Taylor <otaylor@redhat.com> + + * configure.in: Fix a couple of typos in the handling of + tibetan for --with-included-modules. (#161501, Sebastien Bacher) + Fri Dec 17 12:28:56 2004 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_get_extents_internal): Fix diff --git a/configure.in b/configure.in index d50945cf..5f283583 100644 --- a/configure.in +++ b/configure.in @@ -332,9 +332,9 @@ hebrew_modules="hebrew-fc" indic_modules="indic-fc" syriac_modules="syriac-fc" thai_modules="thai-fc" -tibetan_modules="tibetan_fc" +tibetan_modules="tibetan-fc" -all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$syriac_modules,$thai_modules,tibetan_modules" +all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$syriac_modules,$thai_modules,$tibetan_modules" included_modules="" if test "x$with_included_modules" != xno || test "x$with_included_modules" = x ; then diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 6f50e0f4..8e17d76d 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -581,7 +581,7 @@ pango_fc_convert_weight_to_fc (PangoWeight pango_weight) if (pango_weight < (PANGO_WEIGHT_LIGHT + PANGO_WEIGHT_NORMAL) / 2) return FC_WEIGHT_LIGHT; else if (pango_weight < (500 /* PANGO_WEIGHT_MEDIUM */ + PANGO_WEIGHT_SEMIBOLD) / 2) - return FC_WEIGHT_NORMAL; + return FC_WEIGHT_MEDIUM; else if (pango_weight < (PANGO_WEIGHT_SEMIBOLD + PANGO_WEIGHT_BOLD) / 2) return FC_WEIGHT_DEMIBOLD; else if (pango_weight < (PANGO_WEIGHT_BOLD + PANGO_WEIGHT_ULTRABOLD) / 2) |