Mercurial > emacs
changeset 107241:c7ed9615fb56
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).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 26 Feb 2010 21:06:13 -0500 |
| parents | 8953c1cd8568 |
| children | 26b234a2e901 |
| files | src/ChangeLog src/font.c |
| diffstat | 2 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Feb 26 19:19:50 2010 -0500 +++ b/src/ChangeLog Fri Feb 26 21:06:13 2010 -0500 @@ -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.
--- a/src/font.c Fri Feb 26 19:19:50 2010 -0500 +++ b/src/font.c Fri Feb 26 21:06:13 2010 -0500 @@ -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. */