summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-02-26 21:09:03 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-02-26 21:09:03 -0500
commit4ed28cf4e5fe36f460adb103865c3adcbad62da3 (patch)
tree2514a80c064aa9523ab6c1cc13161fc256160345
parentfe69a72236d483ea3ce08084d0a6a315a82b5cab (diff)
downloademacs-4ed28cf4e5fe36f460adb103865c3adcbad62da3.tar.gz
Addendum to last patch: add "Medium" GTK font name keyword.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/font.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 67a547a8058..ac909cc7885 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
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).
+ * font.c (font_parse_fcname): Recognize "Book", "Condensed",
+ "Medium", and "Semi-Condensed" keywords in GTK names (Bug#5646).
2010-02-26 Kenichi Handa <handa@m17n.org>
diff --git a/src/font.c b/src/font.c
index de84dc43d53..765712198fe 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1582,6 +1582,12 @@ font_parse_fcname (name, font)
prop = font_intern_prop ("book", 4, 1);
FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
}
+ else if (PROP_MATCH ("Medium", 6))
+ {
+ prop_found = 1;
+ prop = font_intern_prop ("medium", 6, 1);
+ FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
+ }
else if (PROP_MATCH ("Semi-Bold", 9))
{
prop_found = 1;