diff options
| author | Kenichi Handa <handa@m17n.org> | 2009-04-13 12:41:33 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2009-04-13 12:41:33 +0000 |
| commit | a8a3728b90d75d89368be8e35d5c26468e071d5c (patch) | |
| tree | a7f3775c829d7114fb68d2bbe243d4e0f53a927d /src | |
| parent | 99c4d65db7400d28b56494fd3671471a43acb76d (diff) | |
| download | emacs-a8a3728b90d75d89368be8e35d5c26468e071d5c.tar.gz | |
(get_adstyle_property): Fix previous change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 28 | ||||
| -rw-r--r-- | src/ftfont.c | 1 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 37a4a833fe4..f4bbfa43526 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,29 @@ +2009-04-13 Kenichi Handa <handa@m17n.org> + + * font.c (font_delete_unmatched): Preserve the order of list + elements. + (font_select_entity): Suppress the code to optimize for the same + kind of fonts. + (font_load_for_lface): Get a font that supports at least ASCII + characters. + + * ftfont.c (Qja, Qko): New variables. + (fc_charset_table): Delete uniquifier data for iso8859-1. + (ftfont_get_latin1_charset): New function. + (get_adstyle_property): New function. + (ftfont_pattern_entity): Set FONT_ADSTYLE_INDEX of entity for + bitmap fonts. + (ftfont_lookup_cache): Handle the case that KEY is a font-entity. + Delete iso-8859-1 range from the charset of fonts whose adstyle is + `ko' or `ja'. + (ftfont_get_fc_charset): Call ftfont_lookup_cache with ENTITY. + (ftfont_get_charset): For iso8859-1, call + ftfont_get_latin1_charset. + (ftfont_list): Don't refuse a font spec with non-nil `adstyle' + property. + (ftfont_open): Call ftfont_lookup_cache with ENTITY. + (syms_of_ftfont): DEFSYM Qja and Qko. + 2009-04-09 Kenichi Handa <handa@m17n.org> * charset.c (map_charset_chars): For a charset of `superset' @@ -443,7 +469,7 @@ (font_find_for_lface): Use font_select_entity to select a font. * fontset.c (fontset_find_font): If a font found without - restricting of the characters C doen't support C, try to find a + restricting to the characters C doesn't support C, try to find a font with C restriction. 2009-03-04 Nikolaj Schumacher <me@nschum.de> diff --git a/src/ftfont.c b/src/ftfont.c index 6865478bd20..f2fa877c554 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -187,6 +187,7 @@ get_adstyle_property (FcPattern *p) char *p = alloca (end - str + 1); memcpy (p, str, end - str); p[end - str] = '\0'; + end = p + (end - str); str = p; } if (xstrcasecmp (str, "Regular") == 0 |