diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-01-04 02:25:59 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-01-04 02:25:59 +0000 |
| commit | 935bf108b2dd9693c7f9f1e0752a03d2f0ccfbfa (patch) | |
| tree | 1d86abb445b8004c0a92ead4b40cf9845b7f0bbb /pango | |
| parent | 8c3b00eda317f2e28acf075edb98c6bd5ee44a1a (diff) | |
| download | pango-935bf108b2dd9693c7f9f1e0752a03d2f0ccfbfa.tar.gz | |
Bug 384362 – pango can't select some font styles
2009-01-03 Behdad Esfahbod <behdad@gnome.org>
Bug 384362 – pango can't select some font styles
* pango/pango-font.h:
Add enum values PANGO_WEIGHT_THIN and PANGO_WEIGHT_MEDIUM to
PangoWeight.
* pango/fonts.c: Parse "Thin", "Extra-Light", "Regular", "Demi-Bold",
"Extra-Bold", and "Black" as weight descriptors (from the OpenType
spec).
svn path=/trunk/; revision=2782
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/fonts.c | 10 | ||||
| -rw-r--r-- | pango/pango-font.h | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index e1a10a5e..4af87e8e 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -858,14 +858,20 @@ static const FieldMap variant_map[] = { }; static const FieldMap weight_map[] = { + { PANGO_WEIGHT_THIN, "Thin" }, { PANGO_WEIGHT_ULTRALIGHT, "Ultra-Light" }, + { PANGO_WEIGHT_ULTRALIGHT, "Extra-Light" }, { PANGO_WEIGHT_LIGHT, "Light" }, { PANGO_WEIGHT_NORMAL, "" }, - { 500, "Medium" }, + { PANGO_WEIGHT_NORMAL, "Regular" }, + { PANGO_WEIGHT_MEDIUM, "Medium" }, { PANGO_WEIGHT_SEMIBOLD, "Semi-Bold" }, + { PANGO_WEIGHT_SEMIBOLD, "Demi-Bold" }, { PANGO_WEIGHT_BOLD, "Bold" }, { PANGO_WEIGHT_ULTRABOLD, "Ultra-Bold" }, - { PANGO_WEIGHT_HEAVY, "Heavy" } + { PANGO_WEIGHT_ULTRABOLD, "Extra-Bold" }, + { PANGO_WEIGHT_HEAVY, "Heavy" }, + { PANGO_WEIGHT_HEAVY, "Black" } }; static const FieldMap stretch_map[] = { diff --git a/pango/pango-font.h b/pango/pango-font.h index 66e68aa8..5a86113e 100644 --- a/pango/pango-font.h +++ b/pango/pango-font.h @@ -52,9 +52,11 @@ typedef enum { } PangoVariant; typedef enum { + PANGO_WEIGHT_THIN = 100, PANGO_WEIGHT_ULTRALIGHT = 200, PANGO_WEIGHT_LIGHT = 300, PANGO_WEIGHT_NORMAL = 400, + PANGO_WEIGHT_MEDIUM = 500, PANGO_WEIGHT_SEMIBOLD = 600, PANGO_WEIGHT_BOLD = 700, PANGO_WEIGHT_ULTRABOLD = 800, |