Mercurial > emacs

comparison src/font.c @ 107241:c7ed9615fb56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 fa65fbe23fdb
children 26b234a2e901
comparison
equal deleted inserted replaced
107240:8953c1cd8568 107241:c7ed9615fb56
1574 { 1574 {
1575 prop_found = 1; 1575 prop_found = 1;
1576 prop = font_intern_prop ("light", 5, 1); 1576 prop = font_intern_prop ("light", 5, 1);
1577 FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); 1577 FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
1578 } 1578 }
1579 else if (PROP_MATCH ("Book", 4))
1580 {
1581 prop_found = 1;
1582 prop = font_intern_prop ("book", 4, 1);
1583 FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
1584 }
1579 else if (PROP_MATCH ("Semi-Bold", 9)) 1585 else if (PROP_MATCH ("Semi-Bold", 9))
1580 { 1586 {
1581 prop_found = 1; 1587 prop_found = 1;
1582 prop = font_intern_prop ("semi-bold", 9, 1); 1588 prop = font_intern_prop ("semi-bold", 9, 1);
1583 FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop); 1589 FONT_SET_STYLE (font, FONT_WEIGHT_INDEX, prop);
1597 else if (PROP_MATCH ("Oblique", 7)) 1603 else if (PROP_MATCH ("Oblique", 7))
1598 { 1604 {
1599 prop_found = 1; 1605 prop_found = 1;
1600 prop = font_intern_prop ("oblique", 7, 1); 1606 prop = font_intern_prop ("oblique", 7, 1);
1601 FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop); 1607 FONT_SET_STYLE (font, FONT_SLANT_INDEX, prop);
1608 }
1609 else if (PROP_MATCH ("Semi-Condensed", 14))
1610 {
1611 prop_found = 1;
1612 prop = font_intern_prop ("semi-condensed", 14, 1);
1613 FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
1614 }
1615 else if (PROP_MATCH ("Condensed", 9))
1616 {
1617 prop_found = 1;
1618 prop = font_intern_prop ("condensed", 9, 1);
1619 FONT_SET_STYLE (font, FONT_WIDTH_INDEX, prop);
1602 } 1620 }
1603 else { 1621 else {
1604 if (prop_found) 1622 if (prop_found)
1605 return -1; /* Unknown property in GTK-style font name. */ 1623 return -1; /* Unknown property in GTK-style font name. */
1606 family_end = q; 1624 family_end = q;