pango r2782 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Sun Jan  4 02:25:59 2009
New Revision: 2782
URL: http://svn.gnome.org/viewvc/pango?rev=2782&view=rev

Log:
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).

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

Modified: trunk/pango/fonts.c
==============================================================================
--- trunk/pango/fonts.c	(original)
+++ trunk/pango/fonts.c	Sun Jan  4 02:25:59 2009
@@ -858,14 +858,20 @@
 };
 
 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[] = {

Modified: trunk/pango/pango-font.h
==============================================================================
--- trunk/pango/pango-font.h	(original)
+++ trunk/pango/pango-font.h	Sun Jan  4 02:25:59 2009
@@ -52,9 +52,11 @@
 } 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,