From 542b674b6ef8cdb8deb751aba2697869ceef8b04 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 6 Mar 2002 17:25:36 +0000 Subject: Add some text names to weight map for weights that were added to the Wed Mar 6 12:12:21 2002 Owen Taylor * pango/fonts.c: Add some text names to weight map for weights that were added to the PangoWeight enumeration but not here. (#73728, Arnaud Charlet) --- ChangeLog | 6 ++++++ ChangeLog.pre-1-0 | 6 ++++++ ChangeLog.pre-1-10 | 6 ++++++ ChangeLog.pre-1-2 | 6 ++++++ ChangeLog.pre-1-4 | 6 ++++++ ChangeLog.pre-1-6 | 6 ++++++ ChangeLog.pre-1-8 | 6 ++++++ pango/fonts.c | 7 +++++-- 8 files changed, 47 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ffb74f71..dbcbf97d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index ffb74f71..dbcbf97d 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ffb74f71..dbcbf97d 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index ffb74f71..dbcbf97d 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index ffb74f71..dbcbf97d 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index ffb74f71..dbcbf97d 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index ffb74f71..dbcbf97d 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +Wed Mar 6 12:12:21 2002 Owen Taylor + + * pango/fonts.c: Add some text names to weight map for + weights that were added to the PangoWeight enumeration + but not here. (#73728, Arnaud Charlet) + 2002-03-06 Manish Singh * pango/Makefile.am: install-exec-hook should always exist, diff --git a/pango/fonts.c b/pango/fonts.c index 5051604c..1098ae0f 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -706,11 +706,14 @@ static FieldMap variant_map[] = { }; static FieldMap weight_map[] = { - { 300, "Light" }, + { PANGO_WEIGHT_ULTRALIGHT, "Ultra-Light" }, + { PANGO_WEIGHT_LIGHT, "Light" }, { PANGO_WEIGHT_NORMAL, NULL }, { 500, "Medium" }, { 600, "Semi-Bold" }, - { PANGO_WEIGHT_BOLD, "Bold" } + { PANGO_WEIGHT_BOLD, "Bold" }, + { PANGO_WEIGHT_ULTRABOLD, "Ultra-Bold" }, + { PANGO_WEIGHT_HEAVY, "Heavy" } }; static FieldMap stretch_map[] = { -- cgit v1.2.1