diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-01-06 11:33:51 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-01-06 11:33:51 +0000 |
| commit | 07992d0e2c7cca25032aeac650c847a905079b23 (patch) | |
| tree | f5701f0c675eb3ebb22315365beb7a40ae79c31a /pango/fonts.c | |
| parent | b072c3353cc2d10d6b26fb86cb13694a967a59cd (diff) | |
| download | pango-07992d0e2c7cca25032aeac650c847a905079b23.tar.gz | |
Bug 166709 – Handle font variants more consistently
2009-01-06 Behdad Esfahbod <behdad@gnome.org>
Bug 166709 – Handle font variants more consistently
* configure.in: Require fontconfig >= 2.5.0
* pango/fonts.c: Parse "Roman" as style=normal instead of
weight=normal. Doesn't make much difference in reality.
* pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc),
(pango_fc_convert_weight_to_pango): Update to reflect newly
added weights.
svn path=/trunk/; revision=2788
Diffstat (limited to 'pango/fonts.c')
| -rw-r--r-- | pango/fonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 1faedff5..76ffc17e 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -848,6 +848,7 @@ typedef struct static const FieldMap style_map[] = { { PANGO_STYLE_NORMAL, "" }, + { PANGO_STYLE_NORMAL, "Roman" }, { PANGO_STYLE_OBLIQUE, "Oblique" }, { PANGO_STYLE_ITALIC, "Italic" } }; @@ -865,7 +866,6 @@ static const FieldMap weight_map[] = { { PANGO_WEIGHT_BOOK, "Book" }, { PANGO_WEIGHT_NORMAL, "" }, { PANGO_WEIGHT_NORMAL, "Regular" }, - { PANGO_WEIGHT_NORMAL, "Roman" }, { PANGO_WEIGHT_MEDIUM, "Medium" }, { PANGO_WEIGHT_SEMIBOLD, "Semi-Bold" }, { PANGO_WEIGHT_SEMIBOLD, "Demi-Bold" }, |