1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-06 20:00:46 -08:00

(add_font_entity_to_list): Limit unicode-sip fonts to those that

contain characters beyond the bmp.
This commit is contained in:
Jason Rumney 2008-12-10 16:10:36 +00:00
parent 174f1c745d
commit 9d32f81899
2 changed files with 7 additions and 3 deletions

View file

@ -3,6 +3,8 @@
* w32font.c (Qcham): New symbol.
(font_supported_scripts): Add cham, and comments for other new
scripts in bitfield from OpenType spec.
(add_font_entity_to_list): Limit unicode-sip fonts to those that
contain characters beyond the bmp.
2008-12-10 Kenichi Handa <handa@m17n.org>
@ -11179,7 +11181,6 @@
* charset.c (Fdefine_charset_internal): Setup charset.fast_map
correctly.
2008-02-01 Dave Love <fx@gnu.org>
* fns.c (Flanginfo): Call synchronize_system_time_locale.

View file

@ -1403,11 +1403,14 @@ add_font_entity_to_list (logical_font, physical_font, font_type, lParam)
ANSI and DEFAULT charsets, as most unicode fonts will
contain one of those plus others. */
if ((EQ (spec_charset, Qiso10646_1)
|| EQ (spec_charset, Qunicode_bmp)
|| EQ (spec_charset, Qunicode_sip))
|| EQ (spec_charset, Qunicode_bmp))
&& logical_font->elfLogFont.lfCharSet != DEFAULT_CHARSET
&& logical_font->elfLogFont.lfCharSet != ANSI_CHARSET)
return 1;
/* unicode-sip fonts must contain characters beyond the BMP. */
else if (EQ (spec_charset, Qunicode_sip)
&& !(physical_font->ntmFontSig.fsUsb[1] & 0x02000000))
return 1;
/* If registry was specified, but did not map to a windows
charset, only report fonts that have unknown charsets.
This will still report fonts that don't match, but at