From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 27 Feb 2010 02:06:13 +0000 (-0500)
Subject: Recognize more keywords in GTK font names (Bug#5646).
X-Git-Tag: emacs-pretest-23.1.93~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe69a72236d483ea3ce08084d0a6a315a82b5cab;p=emacs.git

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 f60b400b930..67a547a8058 100644
--- 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 5f1d59afe22..de84dc43d53 100644
--- 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.  */