Mercurial > emacs
annotate src/fontset.h @ 94938:5752d7154afc
Throughout the file, delete all USE_FONT_BACKEND
conditionals. Don't check enable_font_backend. Delete all codes
used only when USE_FONT_BACKEND is not defined. Use
FONT_XXX_NAME_NUMERIC instead of face_numeric_xxx.
(QCfoundry, QCadstyle, QCregistry, QCspacing, QCsize, QCavgwidth)
(Qp): Extern them.
(clear_font_table, load_face_font, xlfd_lookup_field_contents):
Deleted.
(struct font_name): Deleted.
(xlfd_numeric_value, xlfd_symbolic_value): Deleted.
(compare_fonts_by_sort_order): New function.
(xlfd_numeric_slant, xlfd_symbolic_slant, xlfd_numeric_weight)
(xlfd_symbolic_weight, xlfd_numeric_swidth, xlfd_symbolic_swidth):
Deleted.
(Fx_family_fonts): Use font_list_entities, and sort fonts by
compare_fonts_by_sort_order.
(Fx_font_family_list): Call Ffont_family_list.
(face_numeric_value, face_numeric_weight, face_numeric_slant)
(face_numeric_swidth, face_symbolic_value, face_symbolic_weight)
(face_symbolic_slant, face_symbolic_swidth)
(split_font_name_into_vector, build_font_name_from_vector)
(xlfd_fixed_p, xlfd_point_size, pixel_point_size)
(font_rescale_ratio, split_font_name, build_font_name)
(free_font_names, sort_fonts, x_face_list_fonts)
(face_font_available_p, sorted_font_list, cmp_font_names)
(font_list_1, concat_font_list, font_list, remove_duplicates):
Deleted.
(Fx_list_fonts): Use Ffont_list.
(LFACE_AVGWIDTH): Deleted.
(check_lface_attrs): Don't check LFACE_AVGWIDTH. Check LFACE_FONT
by FONTP.
(lface_fully_specified_p): Don't check LFACE_AVGWIDTH.
(set_lface_from_font_name): Delete it.
(set_lface_from_font): Renamed from
set_lface_from_font_and_fontset. Caller changed. Don't set
LFACE_AVGWIDTH. Use FONT_XXX_FOR_FACE to get a symbol suitable
for face.
(merge_face_vectors): Copy font-spec if necessary. Clear
properties of the font-spec if necessary.
(merge_face_ref): Clear properties of the font-spec if necessary.
(Finternal_set_lisp_face_attribute): Likewise.
(set_font_frame_param): Use font_load_for_lface to load a
font-object, and call Fmodify_frame_parameters with it.
(x_update_menu_appearance): Don't check LFACE_AVGWIDTH. Get XLFD
font name by Ffont_xlfd_name.
(Finternal_lisp_face_attribute_values): Don't check QCweight,
QCslant, and QCwidth.
(Fface_font): Get a font name from font->props[FONT_NAME_INDEX].
(lface_same_font_attributes_p): Don't check LFACE_AVGWIDTH.
Compare fonts by EQ.
(lookup_non_ascii_face): Deleted.
(face_for_font): The 2nd argument changed.
(x_supports_face_attributes_p): Don't check LFACE_AVGWIDTH. Check
atomic font properties by case insensitive.
(realize_non_ascii_face): Set face->overstrike correctly.
(realize_x_face): Likewise. Check if LFACE_FONT is a font_object.
(dump_realized_face): Get font name from
font->props[FONT_NAME_INDEX]. Don't print font_info_id.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Wed, 14 May 2008 01:41:52 +0000 |
parents | 1a920d0cdcb9 |
children | 29adfc9354e7 |
rev | line source |
---|---|
17052 | 1 /* Header for fontset handler. |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74605
diff
changeset
|
2 Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, |
79759 | 3 2006, 2007, 2008 Free Software Foundation, Inc. |
74605
6ee41fdd69ff
Update AIST copyright years.
Kenichi Handa <handa@m17n.org>
parents:
68651
diff
changeset
|
4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
79759 | 5 2005, 2006, 2007, 2008 |
67658 | 6 National Institute of Advanced Industrial Science and Technology (AIST) |
7 Registration Number H14PRO021 | |
90409
0347a454915c
(FONT_INFO_FROM_FACE): New macro.
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
8 Copyright (C) 2003, 2006 |
88376
7c109f1a7bcb
(struct font_info): Type of the member encoding_type
Kenichi Handa <handa@m17n.org>
parents:
41053
diff
changeset
|
9 National Institute of Advanced Industrial Science and Technology (AIST) |
7c109f1a7bcb
(struct font_info): Type of the member encoding_type
Kenichi Handa <handa@m17n.org>
parents:
41053
diff
changeset
|
10 Registration Number H13PRO009 |
17052 | 11 |
17071 | 12 This file is part of GNU Emacs. |
13 | |
14 GNU Emacs is free software; you can redistribute it and/or modify | |
15 it under the terms of the GNU General Public License as published by | |
78313
2b9404c2f01f
Remove license from trivial file.
Glenn Morris <rgm@gnu.org>
parents:
75364
diff
changeset
|
16 the Free Software Foundation; either version 3, or (at your option) |
17071 | 17 any later version. |
17052 | 18 |
17071 | 19 GNU Emacs is distributed in the hope that it will be useful, |
20 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
22 GNU General Public License for more details. | |
17052 | 23 |
17071 | 24 You should have received a copy of the GNU General Public License |
25 along with GNU Emacs; see the file COPYING. If not, write to | |
64084 | 26 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
27 Boston, MA 02110-1301, USA. */ | |
17052 | 28 |
29573
2b0359c5b384
(EMACS_FONTSET_H): Renamed from _FONTSET_H.
Kenichi Handa <handa@m17n.org>
parents:
28224
diff
changeset
|
29 #ifndef EMACS_FONTSET_H |
2b0359c5b384
(EMACS_FONTSET_H): Renamed from _FONTSET_H.
Kenichi Handa <handa@m17n.org>
parents:
28224
diff
changeset
|
30 #define EMACS_FONTSET_H |
17052 | 31 |
32 /* Check if any window system is used now. */ | |
20318
1507c5324f4c
Add prototypes and more function declarations.
Andreas Schwab <schwab@suse.de>
parents:
19449
diff
changeset
|
33 extern void (*check_window_system_func) P_ ((void)); |
17052 | 34 |
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
35 struct face; |
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
36 |
29896
929a27e59f25
(free_face_fontset): Renamed from fs_free_face_fontset.
Dave Love <fx@gnu.org>
parents:
29573
diff
changeset
|
37 extern void free_face_fontset P_ ((FRAME_PTR, struct face *)); |
88376
7c109f1a7bcb
(struct font_info): Type of the member encoding_type
Kenichi Handa <handa@m17n.org>
parents:
41053
diff
changeset
|
38 extern Lisp_Object fontset_font_pattern P_ ((FRAME_PTR, struct face *, int)); |
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
39 extern int face_suitable_for_char_p P_ ((struct face *, int)); |
89698
2ae6208036bd
(face_for_char): Prototype adjusted.
Kenichi Handa <handa@m17n.org>
parents:
89574
diff
changeset
|
40 extern int face_for_char P_ ((FRAME_PTR, struct face *, int, |
2ae6208036bd
(face_for_char): Prototype adjusted.
Kenichi Handa <handa@m17n.org>
parents:
89574
diff
changeset
|
41 int, Lisp_Object)); |
88902
8975795eb087
(get_font_repertory_func): New prototype.
Kenichi Handa <handa@m17n.org>
parents:
88376
diff
changeset
|
42 extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *)); |
94927
1a920d0cdcb9
(struct font_info): Delete it. Most memnbers go to
Kenichi Handa <handa@m17n.org>
parents:
91327
diff
changeset
|
43 extern int fontset_from_font_name P_ ((Lisp_Object)); |
60510
09ba76deaedd
(set_default_ascii_font): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
59202
diff
changeset
|
44 extern void set_default_ascii_font P_ ((Lisp_Object)); |
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
45 extern int fs_query_fontset P_ ((Lisp_Object, int)); |
21552
14f3ce59e036
(FONT_ENCODING_NOT_DECIDED): The value is changed to 255.
Kenichi Handa <handa@m17n.org>
parents:
20855
diff
changeset
|
46 EXFUN (Fquery_fontset, 2); |
20318
1507c5324f4c
Add prototypes and more function declarations.
Andreas Schwab <schwab@suse.de>
parents:
19449
diff
changeset
|
47 extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int)); |
17052 | 48 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
41053
diff
changeset
|
49 extern Lisp_Object Vuse_default_ascent; |
19281
5834b16ab7fa
(Vignore_relative_composition): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
18541
diff
changeset
|
50 extern Lisp_Object Vignore_relative_composition; |
19449
7574338c92e2
Adjusted for the name change of
Kenichi Handa <handa@m17n.org>
parents:
19281
diff
changeset
|
51 extern Lisp_Object Valternate_fontname_alist; |
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
52 extern Lisp_Object Vfontset_alias_alist; |
26857
cd7f4013a815
(struct font_info): New member vertical_centering.
Kenichi Handa <handa@m17n.org>
parents:
25031
diff
changeset
|
53 extern Lisp_Object Vvertical_centering_font_regexp; |
90508
1a247e569906
(Votf_script_alist): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
90467
diff
changeset
|
54 extern Lisp_Object Votf_script_alist; |
18345
6e93b01c3883
(font_idx_temp): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
18341
diff
changeset
|
55 |
28224
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
56 extern Lisp_Object fontset_name P_ ((int)); |
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
57 extern Lisp_Object fontset_ascii P_ ((int)); |
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
58 extern int fontset_height P_ ((int)); |
04099a17871f
(FONT_NOT_OPENED, FONT_NOT_FOUND): Macros removed.
Kenichi Handa <handa@m17n.org>
parents:
26857
diff
changeset
|
59 |
90409
0347a454915c
(FONT_INFO_FROM_FACE): New macro.
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
60 struct font; |
94927
1a920d0cdcb9
(struct font_info): Delete it. Most memnbers go to
Kenichi Handa <handa@m17n.org>
parents:
91327
diff
changeset
|
61 extern int face_for_font P_ ((struct frame *, Lisp_Object, struct face *)); |
90467
f1cd4833b97a
(new_fontset_from_font) [USE_FONT_BACKEND]: Prototype
Kenichi Handa <handa@m17n.org>
parents:
90409
diff
changeset
|
62 extern int new_fontset_from_font P_ ((Lisp_Object)); |
90409
0347a454915c
(FONT_INFO_FROM_FACE): New macro.
Kenichi Handa <handa@m17n.org>
parents:
90294
diff
changeset
|
63 |
29573
2b0359c5b384
(EMACS_FONTSET_H): Renamed from _FONTSET_H.
Kenichi Handa <handa@m17n.org>
parents:
28224
diff
changeset
|
64 #endif /* EMACS_FONTSET_H */ |
52401 | 65 |
66 /* arch-tag: c27cef7b-3cab-488a-8398-7a4daa96bb77 | |
67 (do not change this comment) */ |