pango r2787 - in trunk: . docs/tmpl pango

[behdad svn gnome org]

Author: behdad
Date: Tue Jan  6 11:07:02 2009
New Revision: 2787
URL: http://svn.gnome.org/viewvc/pango?rev=2787&view=rev

Log:
2009-01-06  Behdad Esfahbod  <behdad gnome org>

        Bug 166709 â Handle font variants more consistently

        * pango/pango-font.h:
        Add enum values PANGO_WEIGHT_BOOK and PANGO_WEIGHT_ULTRAHEAVY.

        * pango/fonts.c:
        * docs/tmpl/fonts.sgml:
        Add new weights with their aliases, as well as aliasing "Roman" to the
        normal weight.

Modified:
   trunk/ChangeLog
   trunk/docs/tmpl/fonts.sgml
   trunk/pango/fonts.c
   trunk/pango/pango-font.h

Modified: trunk/docs/tmpl/fonts.sgml
==============================================================================
--- trunk/docs/tmpl/fonts.sgml	(original)
+++ trunk/docs/tmpl/fonts.sgml	Tue Jan  6 11:07:02 2009
@@ -59,13 +59,17 @@
 value ranging from 100 to 900, but there are some predefined values:
 </para>
 
+ PANGO_WEIGHT_THIN: the thin weight (= 100; Since: 1.24)
 @PANGO_WEIGHT_ULTRALIGHT: the ultralight weight (= 200)
- PANGO_WEIGHT_LIGHT:  the light weight (=300)
+ PANGO_WEIGHT_LIGHT: the light weight (= 300)
+ PANGO_WEIGHT_BOOK: the book weight (= 380; Since: 1.24)
 @PANGO_WEIGHT_NORMAL: the default weight (= 400)
- PANGO_WEIGHT_SEMIBOLD: a weight intermediate between normal and bold (=600)
+ PANGO_WEIGHT_MEDIUM: the normal weight (= 500; Since: 1.24)
+ PANGO_WEIGHT_SEMIBOLD: the semibold weight (= 600)
 @PANGO_WEIGHT_BOLD: the bold weight (= 700)
 @PANGO_WEIGHT_ULTRABOLD: the ultrabold weight (= 800)
 @PANGO_WEIGHT_HEAVY: the heavy weight (= 900)
+ PANGO_WEIGHT_ULTRAHEAVY: the ultraheavy weight (= 1000; Since: 1.24)
 
 <!-- ##### MACRO PANGO_TYPE_WEIGHT ##### -->
 <para>

Modified: trunk/pango/fonts.c
==============================================================================
--- trunk/pango/fonts.c	(original)
+++ trunk/pango/fonts.c	Tue Jan  6 11:07:02 2009
@@ -862,8 +862,10 @@
   { PANGO_WEIGHT_ULTRALIGHT, "Ultra-Light" },
   { PANGO_WEIGHT_ULTRALIGHT, "Extra-Light" },
   { PANGO_WEIGHT_LIGHT, "Light" },
+  { 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" },
@@ -871,7 +873,11 @@
   { PANGO_WEIGHT_ULTRABOLD, "Ultra-Bold" },
   { PANGO_WEIGHT_ULTRABOLD, "Extra-Bold" },
   { PANGO_WEIGHT_HEAVY, "Heavy" },
-  { PANGO_WEIGHT_HEAVY, "Black" }
+  { PANGO_WEIGHT_HEAVY, "Black" },
+  { PANGO_WEIGHT_ULTRAHEAVY, "Ultra-Heavy" },
+  { PANGO_WEIGHT_ULTRAHEAVY, "Extra-Heavy" },
+  { PANGO_WEIGHT_ULTRAHEAVY, "Ultra-Black" },
+  { PANGO_WEIGHT_ULTRAHEAVY, "Extra-Black" }
 };
 
 static const FieldMap stretch_map[] = {

Modified: trunk/pango/pango-font.h
==============================================================================
--- trunk/pango/pango-font.h	(original)
+++ trunk/pango/pango-font.h	Tue Jan  6 11:07:02 2009
@@ -55,12 +55,14 @@
   PANGO_WEIGHT_THIN = 100,
   PANGO_WEIGHT_ULTRALIGHT = 200,
   PANGO_WEIGHT_LIGHT = 300,
+  PANGO_WEIGHT_BOOK = 380,
   PANGO_WEIGHT_NORMAL = 400,
   PANGO_WEIGHT_MEDIUM = 500,
   PANGO_WEIGHT_SEMIBOLD = 600,
   PANGO_WEIGHT_BOLD = 700,
   PANGO_WEIGHT_ULTRABOLD = 800,
-  PANGO_WEIGHT_HEAVY = 900
+  PANGO_WEIGHT_HEAVY = 900,
+  PANGO_WEIGHT_ULTRAHEAVY = 1000
 } PangoWeight;
 
 typedef enum {