Recognize more keywords in GTK font names (Bug#5646).

* font.c (font_parse_fcname): Recognize "Book", "Condensed", and
"Semi-Condensed" keywords in GTK names (Bug#5646).

diff --git a/src/ChangeLog b/src/ChangeLog
index f60b400b9303ea4f0ca4796b5b1e4e93a333f410..67a547a805867e435e3178bdf030ca6919b02b61 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-27  Chong Yidong  <cyd@stupidchicken.com>
+
+       * font.c (font_parse_fcname): Recognize "Book", "Condensed", and
+       "Semi-Condensed" keywords in GTK names (Bug#5646).
+
 2010-02-26  Kenichi Handa  <handa@m17n.org>
 
        * ftfont.c (ftfont_get_open_type_spec): Fix parsing of otf_spec.

diff --git a/src/font.c b/src/font.c
index 5f1d59afe22fc1a1d493cb227b67888e3b9829c8..de84dc43d53a2311728d381ae961e9dc9fe3521e 100644 (file)
--- a/src/font.c
+++ b/src/font.c
@@ -1576,6 +1576,12 @@ font_parse_fcname (name, font)
              prop = font_intern_prop ("light", 5, 1);
              FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
            }
+         else if (PROP_MATCH ("Book", 4))
+           {
+             prop_found = 1;
+             prop = font_intern_prop ("book", 4, 1);
+             FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+           }
          else if (PROP_MATCH ("Semi-Bold", 9))
            {
              prop_found = 1;
@@ -1600,6 +1606,18 @@ font_parse_fcname (name, font)
              prop = font_intern_prop ("oblique", 7, 1);
              FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
            }
+         else if (PROP_MATCH ("Semi-Condensed", 14))
+           {
+             prop_found = 1;
+             prop = font_intern_prop ("semi-condensed", 14, 1);
+             FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+           }
+         else if (PROP_MATCH ("Condensed", 9))
+           {
+             prop_found = 1;
+             prop = font_intern_prop ("condensed", 9, 1);
+             FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
+           }
          else {
            if (prop_found)
              return -1; /* Unknown property in GTK-style font name.  */