[Emacs-diffs] /srv/bzr/emacs/trunk r99566: Recognize more keywords in GTK font names (Bug#5646).

[Chong Yidong]

------------------------------------------------------------
revno: 99566
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Fri 2010-02-26 21:06:13 -0500
message:
  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).
modified:
  src/ChangeLog
  src/font.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-02-26 12:40:46 +0000
+++ b/src/ChangeLog     2010-02-27 02:06:13 +0000
@@ -1,3 +1,8 @@
+2010-02-27  Chong Yidong  <address@hidden>
+
+       * font.c (font_parse_fcname): Recognize "Book", "Condensed", and
+       "Semi-Condensed" keywords in GTK names (Bug#5646).
+
 2010-02-26  Kenichi Handa  <address@hidden>
 
        * ftfont.c (ftfont_get_open_type_spec): Fix parsing of otf_spec.

=== modified file 'src/font.c'
--- a/src/font.c        2010-01-31 06:46:53 +0000
+++ b/src/font.c        2010-02-27 02:06:13 +0000
@@ -1576,6 +1576,12 @@
              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 @@
              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.  */