Commit 64b900e3 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(font_prop_validate_style): Adjusted for the format

change of font_style_table.
parent a368801c
2008-05-22 Kenichi Handa <handa@m17n.org> 2008-05-22 Kenichi Handa <handa@m17n.org>
* font.c (font_prop_validate_style): Adjusted for the format
change of font_style_table.
* w32font.c (w32font_open_internal): Call Ffont_xlfd_name with * w32font.c (w32font_open_internal): Call Ffont_xlfd_name with
two args. two args.
...@@ -40,21 +43,21 @@ ...@@ -40,21 +43,21 @@
* font.c: Checking of FONT_DEBUG is moved to font.h. All calls of * font.c: Checking of FONT_DEBUG is moved to font.h. All calls of
xassert are changed to font_assert. Delete many unused variables. xassert are changed to font_assert. Delete many unused variables.
(Vfont_weight_table, Vfont_slant_table, Vfont_width_table): (Vfont_weight_table, Vfont_slant_table, Vfont_width_table): New
New variables. variables.
(struct table_entry): Move from xfaces.c and modified. (struct table_entry): Move from xfaces.c and modified.
(weight_table, slant_table, width_table): Move from xfaces.c and (weight_table, slant_table, width_table): Move from xfaces.c and
contents adjusted for the change of struct table_entry. contents adjusted for the change of struct table_entry.
(font_style_to_value, font_style_symbolic): Adjut for the format (font_style_to_value, font_style_symbolic): Adjusted for the
change of font_style_table. format change of font_style_table.
(font_parse_family_registry): Don't overwrite existing foundry and (font_parse_family_registry): Don't overwrite existing foundry and
family of font_spec. family of font_spec.
(font_score): Fix calculation of diff for sizes. (font_score): Fix calculation of diff for sizes.
(font_sort_entites): Call font_add_log. (font_sort_entites): Call font_add_log.
(font_delete_unmatched): Return a newly created list. (font_delete_unmatched): Return a newly created list.
(font_list_entities): Fix previous change. Call font_add_log. (font_list_entities): Fix previous change. Call font_add_log.
(font_matching_entity, font_open_entity, font_close_entity): (font_matching_entity, font_open_entity, font_close_entity): Call
Call font_add_log. font_add_log.
(Ffont_xlfd_name): New arg FOLD-WILDCARDS. (Ffont_xlfd_name): New arg FOLD-WILDCARDS.
(Finternal_set_font_style_table): Delete. (Finternal_set_font_style_table): Delete.
(BUILD_STYLE_TABLE): New macro. (BUILD_STYLE_TABLE): New macro.
......
...@@ -500,13 +500,16 @@ font_prop_validate_style (style, val) ...@@ -500,13 +500,16 @@ font_prop_validate_style (style, val)
if (INTEGERP (val)) if (INTEGERP (val))
{ {
n = XINT (val); n = XINT (val);
if ((n & 0xFF) if (((n >> 4) & 0xF)
>= ASIZE (AREF (font_style_table, prop - FONT_WEIGHT_INDEX))) >= ASIZE (AREF (font_style_table, prop - FONT_WEIGHT_INDEX)))
val = Qerror; val = Qerror;
else else
{ {
Lisp_Object elt = AREF (AREF (font_style_table, prop - FONT_WEIGHT_INDEX), n & 0xFF); Lisp_Object elt = AREF (AREF (font_style_table, prop - FONT_WEIGHT_INDEX), (n >> 4) & 0xF);
if (XINT (XCDR (elt)) != (n >> 8))
if ((n & 0xF) + 1 >= ASIZE (elt))
val = Qerror;
else if (XINT (AREF (elt, 0)) != (n >> 8))
val = Qerror; val = Qerror;
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment