1 |
|
2002-07-26 Kenichi Handa <handa@etl.go.jp> |
2 |
|
|
3 |
|
The following changes are to allow specifying multiple font |
4 |
|
patterns for a character range (specified by script or charset). |
5 |
|
|
6 |
|
* Makefile.in (abbrev.o): Depend on syntax.h. |
7 |
|
(xfaces.o): Depend on charset.h. |
8 |
|
|
9 |
|
* alloc.c (Fmake_string): Use ASCII_CHAR_P, not |
10 |
|
SINGLE_BYTE_CHAR_P. |
11 |
|
|
12 |
|
* ccl.c (Fccl_execute_on_string): Add `const' to local variables. |
13 |
|
|
14 |
|
* chartab.c (Fmake_char_table): Doc fixed. If PURPOSE doesn't |
15 |
|
have property char-table-extra-slots, make no extra slot. |
16 |
|
|
17 |
|
* dispextern.h (struct face): Member `charset' deleted. |
18 |
|
(FACE_SUITABLE_FOR_CHAR_P): Use ASCII_CHAR_P, not |
19 |
|
SINGLE_BYTE_CHAR_P. |
20 |
|
(FACE_FOR_CHAR): Likewise. |
21 |
|
(choose_face_font, lookup_non_ascii_face, font_name_registry): Add |
22 |
|
prototypes |
23 |
|
(lookup_face, lookup_named_face, lookup_derived_face): Prototype |
24 |
|
fixed. |
25 |
|
(generate_ascii_font_name): Renamed from generate_ascii_font. |
26 |
|
|
27 |
|
* fontset.h (get_font_repertory_func): New prototype. |
28 |
|
(make_fontset_for_ascii_face, fs_load_font): Prototypes fixed. |
29 |
|
(FS_LOAD_FONT): Call fs_load_font with the 3rd arg charset_ascii. |
30 |
|
|
31 |
|
* fontset.c (Qprepend, Qappend): New variables. |
32 |
|
(FONTSET_CHARSET_ALIST, FONTSET_FACE_ALIST): These macros deleted. |
33 |
|
(FONTSET_NOFONT_FACE, FONTSET_REPERTORY): New macros. |
34 |
|
(FONTSET_REF): Optimize if FONTSET is Vdefault_fontset. |
35 |
|
(FONTSET_REF_AND_RANGE, FONTSET_ADD): New macros. |
36 |
|
(fontset_ref_and_range, fontset_add, reorder_font_vector) |
37 |
|
(load_font_get_repertory): New functions. |
38 |
|
(fontset_set): This function deleted. |
39 |
|
(fontset_face): New arg FACE. Return face ID, not face. |
40 |
|
Completely re-written to handle new fontset structure. Caller |
41 |
|
changed. |
42 |
|
(free_face_fontset): Use ASET istead of AREF (X) = Y. |
43 |
|
(face_for_char): Don't call lookup_face. |
44 |
|
(make_fontset_for_ascii_face): New arg FACE. |
45 |
|
(fs_load_font): New arg CHARSET_ID. Don't check |
46 |
|
Vfont_encoding_alist here. |
47 |
|
(find_font_encoding): New function. |
48 |
|
(list_fontsets): Use STRINGP, not ! NILP. |
49 |
|
(accumulate_script_ranges): New function. |
50 |
|
(Fset_fontset_font, Fnew_fontset, Ffontset_info): Completely |
51 |
|
re-written to handle new fontset structure. |
52 |
|
(Ffontset_font): Return a copy of element. |
53 |
|
(syms_of_fontset): Define symbols Qprepend and Qappend. Fix |
54 |
|
docstring of font-encoding-alist. |
55 |
|
|
56 |
|
* lisp.h (CHAR_TABLE_REF): Remove unnecessary check (IDX >= 0). |
57 |
|
(Fset_fotset_font): Fix arguments to 5. |
58 |
|
|
59 |
|
* msdos.c (XMenuActivate): Adjuted for the change of |
60 |
|
lookup_derived_face. |
61 |
|
|
62 |
|
* xdisp.c (message_dolog, set_message_1, |
63 |
|
extend_face_to_end_of_line): Use ASCII_CHAR_P, not |
64 |
|
SINGLE_BYTE_CHAR_P. |
65 |
|
(highlight_trailing_whitespace): Adjusted for the change of |
66 |
|
lookup_named_face. |
67 |
|
|
68 |
|
* xfaces.c: Include charset.h. |
69 |
|
(load_face_font): Argument C deleted. Caller changed. |
70 |
|
(generate_ascii_font_name): Renamed from generate_ascii_font. |
71 |
|
(font_name_registry): New function. |
72 |
|
(cache_face): Store ascii faces before non-ascii faces in buckets. |
73 |
|
(lookup_face): Arguments C and BASE_FACE deleted. Caller changed. |
74 |
|
Lookup only ascii faces. |
75 |
|
(lookup_non_ascii_face): New function. |
76 |
|
(lookup_named_face): Argument C deleted. Caller changed. |
77 |
|
(lookup_derived_face): Argument C deleted. Caller changed. |
78 |
|
(try_font_list): New arg PATTERN. Caller changed. If PATTERN is |
79 |
|
a string, just call font_list with it. |
80 |
|
(choose_face_font): Arguments FACE and C deleted. New arg |
81 |
|
FONT_SPEC. Caller changed. |
82 |
|
(realize_face): Arguments C and BASE_FACE deleted. Caller |
83 |
|
(realize_x_face): Likewise. |
84 |
|
(realize_non_ascii_face): New function. |
85 |
|
(realize_x_face): Call load_face_font here. |
86 |
|
(realize_tty_face): Argument C deleted. Caller changed. |
87 |
|
(compute_char_face): If CH is not ascii, call FACE_FOR_CHAR to |
88 |
|
get a face ID. |
89 |
|
(dump_realized_face): Don't print charset of FACE. |
90 |
|
|
91 |
|
* xfns.c (x_set_font): Always call x_new_fontset and |
92 |
|
store_frame_parameter. |
93 |
|
(Fx_create_frame): Call x_new_fontset, not x_new_font. |
94 |
|
(syms_of_xfns): Set get_font_repertory_func to |
95 |
|
x_get_font_repertory. |
96 |
|
|
97 |
|
* xterm.h (x_get_font_repertory): Extern it. |
98 |
|
|
99 |
|
* xterm.c (x_produce_glyphs): Use ASCII_CHAR_P, not |
100 |
|
SINGLE_BYTE_CHAR_P. Fix the logic of handling non-ASCII char when |
101 |
|
it->multibyte_p is zero. |
102 |
|
(XTread_socket): Use ASCII_CHAR_P, not SINGLE_BYTE_CHAR_P. |
103 |
|
(x_new_fontset): If FONTSETNAME doesn't match any existing |
104 |
|
fontsets, create a new one. |
105 |
|
(x_get_font_repertory): New function. |
106 |
|
|
107 |
2002-07-25 Kenichi Handa <handa@etl.go.jp> |
2002-07-25 Kenichi Handa <handa@etl.go.jp> |
108 |
|
|
109 |
* coding.c (Ffind_coding_systems_region_internal): Detect an |
* coding.c (Ffind_coding_systems_region_internal): Detect an |