summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-03-06 17:25:36 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-03-06 17:25:36 +0000
commit542b674b6ef8cdb8deb751aba2697869ceef8b04 (patch)
treebaca9000a6f71c87362f76ab99b9869215d468be
parent74a3b0e23ff9797780e074db3ba5b48396917ed0 (diff)
downloadpango-542b674b6ef8cdb8deb751aba2697869ceef8b04.tar.gz
Add some text names to weight map for weights that were added to the
Wed Mar 6 12:12:21 2002 Owen Taylor <otaylor@redhat.com> * 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)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-06
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--ChangeLog.pre-1-26
-rw-r--r--ChangeLog.pre-1-46
-rw-r--r--ChangeLog.pre-1-66
-rw-r--r--ChangeLog.pre-1-86
-rw-r--r--pango/fonts.c7
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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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 <otaylor@redhat.com>
+
+ * 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 <yosh@gimp.org>
* 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[] = {