Mercurial > emacs
annotate src/fontset.c @ 112453:06719a229a46 default tip
* calc/calc.el (calc-default-power-reference-level)
(calc-default-field-reference-level): New variables.
* calc/calc-units.el (math-standard-units): Add dB and Np.
(math-logunits): New variable.
(math-extract-logunits, math-logcombine, calcFunc-luplus)
(calcFunc-luminus, calc-luplus, calc-luminus, math-logunit-level)
(calcFunc-fieldlevel, calcFunc-powerlevel, calc-level): New
functions.
(math-find-base-units-rec): Add entry for ln(10).
* calc/calc-help.el (calc-u-prefix-help): Add logarithmic help.
(calc-ul-prefix-help): New function.
* calc/calc-ext.el (calc-init-extensions): Autoload new units
functions. Add keybindings for new units functions.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Sun, 23 Jan 2011 23:08:04 -0600 |
parents | 9de5a68b57e1 |
children |
rev | line source |
---|---|
17052 | 1 /* Fontset handler. |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
2 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
74605
diff
changeset
|
3 Free Software Foundation, Inc. |
74605
6ee41fdd69ff
Update AIST copyright years.
Kenichi Handa <handa@m17n.org>
parents:
71605
diff
changeset
|
4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
5 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
67658 | 6 National Institute of Advanced Industrial Science and Technology (AIST) |
7 Registration Number H14PRO021 | |
90410 | 8 Copyright (C) 2003, 2006 |
88405 | 9 National Institute of Advanced Industrial Science and Technology (AIST) |
10 Registration Number H13PRO009 | |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
11 |
17071 | 12 This file is part of GNU Emacs. |
13 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94928
diff
changeset
|
14 GNU Emacs is free software: you can redistribute it and/or modify |
17071 | 15 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94928
diff
changeset
|
16 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94928
diff
changeset
|
17 (at your option) 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 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94928
diff
changeset
|
25 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
17052 | 26 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
27 /* #define FONTSET_DEBUG */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
28 |
17052 | 29 #include <config.h> |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
30 #include <stdio.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105520
diff
changeset
|
31 #include <setjmp.h> |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
32 |
17052 | 33 #include "lisp.h" |
88405 | 34 #include "blockinput.h" |
28963 | 35 #include "buffer.h" |
88405 | 36 #include "character.h" |
17052 | 37 #include "charset.h" |
38 #include "ccl.h" | |
31102
6a0caa788013
Include keyboard.h before frame.h.
Andrew Innes <andrewi@gnu.org>
parents:
30941
diff
changeset
|
39 #include "keyboard.h" |
23517
73f09e7bc96e
Include frame.h before fontset.h.
Kenichi Handa <handa@m17n.org>
parents:
22719
diff
changeset
|
40 #include "frame.h" |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
41 #include "dispextern.h" |
89865 | 42 #include "intervals.h" |
17052 | 43 #include "fontset.h" |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
44 #include "window.h" |
52654
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
45 #ifdef HAVE_X_WINDOWS |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
46 #include "xterm.h" |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
47 #endif |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
48 #ifdef WINDOWSNT |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
49 #include "w32term.h" |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
50 #endif |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96655
diff
changeset
|
51 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96655
diff
changeset
|
52 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96655
diff
changeset
|
53 #endif |
82992
5de4189e659d
Got rid of the rif (window-based redisplay interface) global variable.
Karoly Lorentey <lorentey@elte.hu>
parents:
53353
diff
changeset
|
54 #include "termhooks.h" |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
55 |
90410 | 56 #include "font.h" |
57 | |
89483 | 58 #undef xassert |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
59 #ifdef FONTSET_DEBUG |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
60 #define xassert(X) do {if (!(X)) abort ();} while (0) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
61 #undef INLINE |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
62 #define INLINE |
89483 | 63 #else /* not FONTSET_DEBUG */ |
64 #define xassert(X) (void) 0 | |
65 #endif /* not FONTSET_DEBUG */ | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
66 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
67 /* FONTSET |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
68 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
69 A fontset is a collection of font related information to give |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
70 similar appearance (style, etc) of characters. A fontset has two |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
71 roles. One is to use for the frame parameter `font' as if it is an |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
72 ASCII font. In that case, Emacs uses the font specified for |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
73 `ascii' script for the frame's default font. |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
74 |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
75 Another role, the more important one, is to provide information |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
76 about which font to use for each non-ASCII character. |
41987
34952771ae85
Fix typos, remove unnecessary space.
Pavel Janík <Pavel@Janik.cz>
parents:
41052
diff
changeset
|
77 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
78 There are two kinds of fontsets; base and realized. A base fontset |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
79 is created by `new-fontset' from Emacs Lisp explicitly. A realized |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
80 fontset is created implicitly when a face is realized for ASCII |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
81 characters. A face is also realized for non-ASCII characters based |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
82 on an ASCII face. All of non-ASCII faces based on the same ASCII |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
83 face share the same realized fontset. |
89483 | 84 |
88405 | 85 A fontset object is implemented by a char-table whose default value |
86 and parent are always nil. | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
87 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
88 An element of a base fontset is a vector of FONT-DEFs which itself |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
89 is a vector [ FONT-SPEC ENCODING REPERTORY ]. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
90 |
101605
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
91 An element of a realized fontset is nil, t, 0, or a vector of this |
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
92 form: |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
93 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
94 [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
95 RFONT-DEF0 RFONT-DEF1 ... ] |
17052 | 96 |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
97 RFONT-DEFn (i.e. Realized FONT-DEF) has this form: |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
98 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
99 [ FACE-ID FONT-DEF FONT-OBJECT SORTING-SCORE ] |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
100 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
101 RFONT-DEFn are automatically reordered by the current charset |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
102 priority list. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
103 |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
104 The value nil means that we have not yet generated the above vector |
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
105 from the base of the fontset. |
88405 | 106 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
107 The value t means that no font is available for the corresponding |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
108 range of characters. |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
109 |
101605
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
110 The value 0 means that no font is available for the corresponding |
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
111 range of characters in this fontset, but may be available in the |
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
112 default fontset. |
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
113 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
114 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
115 A fontset has 9 extra slots. |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
116 |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
117 The 1st slot: the ID number of the fontset |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
118 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
119 The 2nd slot: |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
120 base: the name of the fontset |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
121 realized: nil |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
122 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
123 The 3rd slot: |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
124 base: nil |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
125 realized: the base fontset |
17052 | 126 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
127 The 4th slot: |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
128 base: nil |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
129 realized: the frame that the fontset belongs to |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
130 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
131 The 5th slot: |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
132 base: the font name for ASCII characters |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
133 realized: nil |
88405 | 134 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
135 The 6th slot: |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
136 base: nil |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
137 realized: the ID number of a face to use for characters that |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
138 has no font in a realized fontset. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
139 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
140 The 7th slot: |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
141 base: nil |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
142 realized: Alist of font index vs the corresponding repertory |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
143 char-table. |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
144 |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
145 The 8th slot: |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
146 base: nil |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
147 realized: If the base is not the default fontset, a fontset |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
148 realized from the default fontset, else nil. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
149 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
150 The 9th slot: |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
151 base: Same as element value (but for fallback fonts). |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
152 realized: Likewise. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
153 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
154 All fontsets are recorded in the vector Vfontset_table. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
155 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
156 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
157 DEFAULT FONTSET |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
158 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
159 There's a special base fontset named `default fontset' which |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
160 defines the default font specifications. When a base fontset |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
161 doesn't specify a font for a specific character, the corresponding |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
162 value in the default fontset is used. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
163 |
30398
dde5ab185aad
(fontset_ref): Remove INLINE declaration.
Kenichi Handa <handa@m17n.org>
parents:
30172
diff
changeset
|
164 The parent of a realized fontset created for such a face that has |
dde5ab185aad
(fontset_ref): Remove INLINE declaration.
Kenichi Handa <handa@m17n.org>
parents:
30172
diff
changeset
|
165 no fontset is the default fontset. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
166 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
167 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
168 These structures are hidden from the other codes than this file. |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
169 The other codes handle fontsets only by their ID numbers. They |
88405 | 170 usually use the variable name `fontset' for IDs. But, in this |
171 file, we always use varialbe name `id' for IDs, and name `fontset' | |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
172 for an actual fontset object, i.e., char-table. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
173 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
174 */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
175 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
176 /********** VARIABLES and FUNCTION PROTOTYPES **********/ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
177 |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
178 static Lisp_Object Qfontset; |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
179 static Lisp_Object Qfontset_info; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
180 static Lisp_Object Qprepend, Qappend; |
103271
f3d9124c9d27
(Qlatin): Don't make it static.
Kenichi Handa <handa@m17n.org>
parents:
103115
diff
changeset
|
181 Lisp_Object Qlatin; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
182 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
183 /* Vector containing all fontsets. */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
184 static Lisp_Object Vfontset_table; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
185 |
41987
34952771ae85
Fix typos, remove unnecessary space.
Pavel Janík <Pavel@Janik.cz>
parents:
41052
diff
changeset
|
186 /* Next possibly free fontset ID. Usually this keeps the minimum |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
187 fontset ID not yet used. */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
188 static int next_fontset_id; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
189 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
190 /* The default fontset. This gives default FAMILY and REGISTRY of |
88405 | 191 font for each character. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
192 static Lisp_Object Vdefault_fontset; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
193 |
17052 | 194 /* Check if any window system is used now. */ |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
195 void (*check_window_system_func) (void); |
17052 | 196 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
197 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
198 /* Prototype declarations for static functions. */ |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
199 static Lisp_Object fontset_add (Lisp_Object, Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
200 Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
201 static Lisp_Object fontset_find_font (Lisp_Object, int, struct face *, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
202 int, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
203 static void reorder_font_vector (Lisp_Object, struct font *); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
204 static Lisp_Object fontset_font (Lisp_Object, int, struct face *, int); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
205 static Lisp_Object make_fontset (Lisp_Object, Lisp_Object, Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
206 static Lisp_Object fontset_pattern_regexp (Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
207 static void accumulate_script_ranges (Lisp_Object, Lisp_Object, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
208 Lisp_Object); |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
209 static void set_fontset_font (Lisp_Object, Lisp_Object); |
89614
355fc0282e50
(set_fontset_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
89610
diff
changeset
|
210 |
88982
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
211 #ifdef FONTSET_DEBUG |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
212 |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
213 /* Return 1 if ID is a valid fontset id, else return 0. */ |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
214 |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
215 static int |
111997
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109977
diff
changeset
|
216 fontset_id_valid_p (int id) |
88982
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
217 { |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
218 return (id >= 0 && id < ASIZE (Vfontset_table) - 1); |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
219 } |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
220 |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
221 #endif |
d50b0a9ea97a
(fontset_add): Make the type `int'.
Kenichi Handa <handa@m17n.org>
parents:
88968
diff
changeset
|
222 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
223 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
224 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
225 /********** MACROS AND FUNCTIONS TO HANDLE FONTSET **********/ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
226 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
227 /* Return the fontset with ID. No check of ID's validness. */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
228 #define FONTSET_FROM_ID(id) AREF (Vfontset_table, id) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
229 |
30398
dde5ab185aad
(fontset_ref): Remove INLINE declaration.
Kenichi Handa <handa@m17n.org>
parents:
30172
diff
changeset
|
230 /* Macros to access special values of FONTSET. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
231 #define FONTSET_ID(fontset) XCHAR_TABLE (fontset)->extras[0] |
88405 | 232 |
233 /* Macros to access special values of (base) FONTSET. */ | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
234 #define FONTSET_NAME(fontset) XCHAR_TABLE (fontset)->extras[1] |
88405 | 235 #define FONTSET_ASCII(fontset) XCHAR_TABLE (fontset)->extras[4] |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
236 #define FONTSET_SPEC(fontset) XCHAR_TABLE (fontset)->extras[5] |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
237 |
88405 | 238 /* Macros to access special values of (realized) FONTSET. */ |
239 #define FONTSET_BASE(fontset) XCHAR_TABLE (fontset)->extras[2] | |
240 #define FONTSET_FRAME(fontset) XCHAR_TABLE (fontset)->extras[3] | |
91908
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
241 #define FONTSET_OBJLIST(fontset) XCHAR_TABLE (fontset)->extras[4] |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
242 #define FONTSET_NOFONT_FACE(fontset) XCHAR_TABLE (fontset)->extras[5] |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
243 #define FONTSET_REPERTORY(fontset) XCHAR_TABLE (fontset)->extras[6] |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
244 #define FONTSET_DEFAULT(fontset) XCHAR_TABLE (fontset)->extras[7] |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
245 |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
246 /* For both base and realized fontset. */ |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
247 #define FONTSET_FALLBACK(fontset) XCHAR_TABLE (fontset)->extras[8] |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
248 |
89428
eed327e0bad3
(BASE_FONTSET_P): Check FONTSET_BASE, not
Kenichi Handa <handa@m17n.org>
parents:
89349
diff
changeset
|
249 #define BASE_FONTSET_P(fontset) (NILP (FONTSET_BASE (fontset))) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
250 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
251 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
252 /* Macros for FONT-DEF and RFONT-DEF of fontset. */ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
253 #define FONT_DEF_NEW(font_def, font_spec, encoding, repertory) \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
254 do { \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
255 (font_def) = Fmake_vector (make_number (3), (font_spec)); \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
256 ASET ((font_def), 1, encoding); \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
257 ASET ((font_def), 2, repertory); \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
258 } while (0) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
259 |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
260 #define FONT_DEF_SPEC(font_def) AREF (font_def, 0) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
261 #define FONT_DEF_ENCODING(font_def) AREF (font_def, 1) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
262 #define FONT_DEF_REPERTORY(font_def) AREF (font_def, 2) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
263 |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
264 #define RFONT_DEF_FACE(rfont_def) AREF (rfont_def, 0) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
265 #define RFONT_DEF_SET_FACE(rfont_def, face_id) \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
266 ASET ((rfont_def), 0, make_number (face_id)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
267 #define RFONT_DEF_FONT_DEF(rfont_def) AREF (rfont_def, 1) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
268 #define RFONT_DEF_SPEC(rfont_def) FONT_DEF_SPEC (AREF (rfont_def, 1)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
269 #define RFONT_DEF_REPERTORY(rfont_def) FONT_DEF_REPERTORY (AREF (rfont_def, 1)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
270 #define RFONT_DEF_OBJECT(rfont_def) AREF (rfont_def, 2) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
271 #define RFONT_DEF_SET_OBJECT(rfont_def, object) \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
272 ASET ((rfont_def), 2, (object)) |
109977
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
273 /* Score of RFONT_DEF is an integer value; the lowest 8 bits represent |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
274 the order of listing by font backends, the higher bits represents |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
275 the order given by charset priority list. The smaller value is |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
276 preferable. */ |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
277 #define RFONT_DEF_SCORE(rfont_def) XINT (AREF (rfont_def, 3)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
278 #define RFONT_DEF_SET_SCORE(rfont_def, score) \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
279 ASET ((rfont_def), 3, make_number (score)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
280 #define RFONT_DEF_NEW(rfont_def, font_def) \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
281 do { \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
282 (rfont_def) = Fmake_vector (make_number (4), Qnil); \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
283 ASET ((rfont_def), 1, (font_def)); \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
284 RFONT_DEF_SET_SCORE ((rfont_def), 0); \ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
285 } while (0) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
286 |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
287 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
288 /* Return the element of FONTSET for the character C. If FONTSET is a |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
289 base fontset other then the default fontset and FONTSET doesn't |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
290 contain information for C, return the information in the default |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
291 fontset. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
292 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
293 #define FONTSET_REF(fontset, c) \ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
294 (EQ (fontset, Vdefault_fontset) \ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
295 ? CHAR_TABLE_REF (fontset, c) \ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
296 : fontset_ref ((fontset), (c))) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
297 |
30398
dde5ab185aad
(fontset_ref): Remove INLINE declaration.
Kenichi Handa <handa@m17n.org>
parents:
30172
diff
changeset
|
298 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
299 fontset_ref (Lisp_Object fontset, int c) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
300 { |
88405 | 301 Lisp_Object elt; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
302 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
303 elt = CHAR_TABLE_REF (fontset, c); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
304 if (NILP (elt) && ! EQ (fontset, Vdefault_fontset) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
305 /* Don't check Vdefault_fontset for a realized fontset. */ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
306 && NILP (FONTSET_BASE (fontset))) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
307 elt = CHAR_TABLE_REF (Vdefault_fontset, c); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
308 return elt; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
309 } |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
310 |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
311 /* Set elements of FONTSET for characters in RANGE to the value ELT. |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
312 RANGE is a cons (FROM . TO), where FROM and TO are character codes |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
313 specifying a range. */ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
314 |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
315 #define FONTSET_SET(fontset, range, elt) \ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
316 Fset_char_table_range ((fontset), (range), (elt)) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
317 |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
318 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
319 /* Modify the elements of FONTSET for characters in RANGE by replacing |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
320 with ELT or adding ELT. RANGE is a cons (FROM . TO), where FROM |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
321 and TO are character codes specifying a range. If ADD is nil, |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
322 replace with ELT, if ADD is `prepend', prepend ELT, otherwise, |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
323 append ELT. */ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
324 |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
325 #define FONTSET_ADD(fontset, range, elt, add) \ |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
326 (NILP (add) \ |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
327 ? (NILP (range) \ |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
328 ? (FONTSET_FALLBACK (fontset) = Fmake_vector (make_number (1), (elt))) \ |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
329 : Fset_char_table_range ((fontset), (range), \ |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
330 Fmake_vector (make_number (1), (elt)))) \ |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
331 : fontset_add ((fontset), (range), (elt), (add))) |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
332 |
89069
c2201502f37e
(fontset_add): Return Lisp_Object.
Dave Love <fx@gnu.org>
parents:
89006
diff
changeset
|
333 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
334 fontset_add (Lisp_Object fontset, Lisp_Object range, Lisp_Object elt, Lisp_Object add) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
335 { |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
336 Lisp_Object args[2]; |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
337 int idx = (EQ (add, Qappend) ? 0 : 1); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
338 |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
339 args[1 - idx] = Fmake_vector (make_number (1), elt); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
340 |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
341 if (CONSP (range)) |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
342 { |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
343 int from = XINT (XCAR (range)); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
344 int to = XINT (XCDR (range)); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
345 int from1, to1; |
89483 | 346 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
347 do { |
99980
0a43374c0145
(fontset_add): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
98582
diff
changeset
|
348 from1 = from, to1 = to; |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
349 args[idx] = char_table_ref_and_range (fontset, from, &from1, &to1); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
350 char_table_set_range (fontset, from, to1, |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
351 NILP (args[idx]) ? args[1 - idx] |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
352 : Fvconcat (2, args)); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
353 from = to1 + 1; |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
354 } while (from < to); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
355 } |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
356 else |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
357 { |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
358 args[idx] = FONTSET_FALLBACK (fontset); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
359 FONTSET_FALLBACK (fontset) |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
360 = NILP (args[idx]) ? args[1 - idx] : Fvconcat (2, args); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
361 } |
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
362 return Qnil; |
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
363 } |
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
364 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
365 static int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
366 fontset_compare_rfontdef (const void *val1, const void *val2) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
367 { |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
368 return (RFONT_DEF_SCORE (*(Lisp_Object *) val1) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
369 - RFONT_DEF_SCORE (*(Lisp_Object *) val2)); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
370 } |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
371 |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
372 /* Update FONT-GROUP which has this form: |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
373 [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
374 RFONT-DEF0 RFONT-DEF1 ... ] |
95256
993b2f1f702e
*** empty log message ***
Juanma Barranquero <lekktu@gmail.com>
parents:
95230
diff
changeset
|
375 Reorder RFONT-DEFs according to the current language, and update |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
376 CHARSET-ORDERED-LIST-TICK. |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
377 |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
378 If PREFERRED_FAMILY is not nil, that family has the higher priority |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
379 if the encoding charsets or languages in font-specs are the same. */ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
380 |
88405 | 381 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
382 reorder_font_vector (Lisp_Object font_group, struct font *font) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
383 { |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
384 Lisp_Object vec, font_object; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
385 int size; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
386 int i; |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
387 int score_changed = 0; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
388 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
389 if (font) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
390 XSETFONT (font_object, font); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
391 else |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
392 font_object = Qnil; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
393 |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
394 vec = XCDR (font_group); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
395 size = ASIZE (vec); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
396 /* Exclude the tailing nil element from the reordering. */ |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
397 if (NILP (AREF (vec, size - 1))) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
398 size--; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
399 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
400 for (i = 0; i < size; i++) |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
401 { |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
402 Lisp_Object rfont_def = AREF (vec, i); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
403 Lisp_Object font_def = RFONT_DEF_FONT_DEF (rfont_def); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
404 Lisp_Object font_spec = FONT_DEF_SPEC (font_def); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
405 int score = RFONT_DEF_SCORE (rfont_def) & 0xFF; |
109977
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
406 Lisp_Object otf_spec = Ffont_get (font_spec, QCotf); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
407 |
109977
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
408 if (! NILP (otf_spec)) |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
409 /* A font-spec with :otf is preferable regardless of encoding |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
410 and language.. */ |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
411 ; |
35753506eda5
fontset.c (reorder_font_vector): Prefer a font-spec specifying :otf.
Kenichi Handa <handa@m17n.org>
parents:
109637
diff
changeset
|
412 else if (! font_match_p (font_spec, font_object)) |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
413 { |
97556
0fc47f017980
(reorder_font_vector): Use encoding charset of fonts
Kenichi Handa <handa@m17n.org>
parents:
97539
diff
changeset
|
414 Lisp_Object encoding = FONT_DEF_ENCODING (font_def); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
415 |
97556
0fc47f017980
(reorder_font_vector): Use encoding charset of fonts
Kenichi Handa <handa@m17n.org>
parents:
97539
diff
changeset
|
416 if (! NILP (encoding)) |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
417 { |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
418 Lisp_Object tail; |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
419 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
420 for (tail = Vcharset_ordered_list; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
421 ! EQ (tail, Vcharset_non_preferred_head) && CONSP (tail); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
422 score += 0x100, tail = XCDR (tail)) |
97556
0fc47f017980
(reorder_font_vector): Use encoding charset of fonts
Kenichi Handa <handa@m17n.org>
parents:
97539
diff
changeset
|
423 if (EQ (encoding, XCAR (tail))) |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
424 break; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
425 } |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
426 else |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
427 { |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
428 Lisp_Object lang = Ffont_get (font_spec, QClang); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
429 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
430 if (! NILP (lang) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
431 && ! EQ (lang, Vcurrent_iso639_language) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
432 && (! CONSP (Vcurrent_iso639_language) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
433 || NILP (Fmemq (lang, Vcurrent_iso639_language)))) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
434 score |= 0x100; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
435 } |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
436 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
437 if (RFONT_DEF_SCORE (rfont_def) != score) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
438 { |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
439 RFONT_DEF_SET_SCORE (rfont_def, score); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
440 score_changed = 1; |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
441 } |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
442 } |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
443 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
444 if (score_changed) |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
445 qsort (XVECTOR (vec)->contents, size, sizeof (Lisp_Object), |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
446 fontset_compare_rfontdef); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
447 XSETCAR (font_group, make_number (charset_ordered_list_tick)); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
448 } |
91266
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
449 |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
450 /* Return a font-group (actually a cons (-1 . FONT-GROUP-VECTOR)) for |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
451 character C in FONTSET. If C is -1, return a fallback font-group. |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
452 If C is not -1, the value may be Qt (FONTSET doesn't have a font |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
453 for C even in the fallback group, or 0 (a font for C may be found |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
454 only in the fallback group). */ |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
455 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
456 static Lisp_Object |
96573
3de01ebe30b7
* fontset.c (fontset_get_font_group):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
96556
diff
changeset
|
457 fontset_get_font_group (Lisp_Object fontset, int c) |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
458 { |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
459 Lisp_Object font_group; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
460 Lisp_Object base_fontset; |
99980
0a43374c0145
(fontset_add): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
98582
diff
changeset
|
461 int from = 0, to = MAX_CHAR, i; |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
462 |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
463 xassert (! BASE_FONTSET_P (fontset)); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
464 if (c >= 0) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
465 font_group = CHAR_TABLE_REF (fontset, c); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
466 else |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
467 font_group = FONTSET_FALLBACK (fontset); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
468 if (! NILP (font_group)) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
469 return font_group; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
470 base_fontset = FONTSET_BASE (fontset); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
471 if (c >= 0) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
472 font_group = char_table_ref_and_range (base_fontset, c, &from, &to); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
473 else |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
474 font_group = FONTSET_FALLBACK (base_fontset); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
475 if (NILP (font_group)) |
101605
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
476 { |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
477 font_group = make_number (0); |
101605
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
478 if (c >= 0) |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
479 char_table_set_range (fontset, from, to, font_group); |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
480 return font_group; |
101605
b37403eedfa9
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101601
diff
changeset
|
481 } |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
482 font_group = Fcopy_sequence (font_group); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
483 for (i = 0; i < ASIZE (font_group); i++) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
484 if (! NILP (AREF (font_group, i))) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
485 { |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
486 Lisp_Object rfont_def; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
487 |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
488 RFONT_DEF_NEW (rfont_def, AREF (font_group, i)); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
489 /* Remember the original order. */ |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
490 RFONT_DEF_SET_SCORE (rfont_def, i); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
491 ASET (font_group, i, rfont_def); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
492 } |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
493 font_group = Fcons (make_number (-1), font_group); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
494 if (c >= 0) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
495 char_table_set_range (fontset, from, to, font_group); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
496 else |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
497 FONTSET_FALLBACK (fontset) = font_group; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
498 return font_group; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
499 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
500 |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
501 /* Return RFONT-DEF (vector) in the realized fontset FONTSET for the |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
502 character C. If no font is found, return Qnil if there's a |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
503 possibility that the default fontset or the fallback font groups |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
504 have a proper font, and return Qt if not. |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
505 |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
506 If a font is found but is not yet opened, open it (if FACE is not |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
507 NULL) or return Qnil (if FACE is NULL). |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
508 |
90802
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
509 ID is a charset-id that must be preferred, or -1 meaning no |
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
510 preference. |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
511 |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
512 If FALLBACK is nonzero, search only fallback fonts. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
513 |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
514 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
515 fontset_find_font (Lisp_Object fontset, int c, struct face *face, int id, int fallback) |
17052 | 516 { |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
517 Lisp_Object vec, font_group; |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
518 int i, charset_matched = 0, found_index; |
106734
562e48429719
fontset.c (fontset_find_font): Fix getting the frame pointer.
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
519 FRAME_PTR f = (FRAMEP (FONTSET_FRAME (fontset)) |
562e48429719
fontset.c (fontset_find_font): Fix getting the frame pointer.
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
520 ? XFRAME (FONTSET_FRAME (fontset)) : XFRAME (selected_frame)); |
103587
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
521 Lisp_Object rfont_def; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
522 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
523 font_group = fontset_get_font_group (fontset, fallback ? -1 : c); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
524 if (! CONSP (font_group)) |
101522
561d416172d0
(fontset_find_font): Fix handling of non-cons return
Chong Yidong <cyd@stupidchicken.com>
parents:
101447
diff
changeset
|
525 return font_group; |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
526 vec = XCDR (font_group); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
527 if (ASIZE (vec) == 0) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
528 return Qnil; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
529 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
530 if (ASIZE (vec) > 1) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
531 { |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
532 if (XINT (XCAR (font_group)) != charset_ordered_list_tick) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
533 /* We have just created the font-group, |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
534 or the charset priorities were changed. */ |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
535 reorder_font_vector (font_group, face->ascii_face->font); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
536 if (id >= 0) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
537 /* Find a spec matching with the charset ID to try at |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
538 first. */ |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
539 for (i = 0; i < ASIZE (vec); i++) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
540 { |
103112
35792077cc20
(fontset_find_font): Check if rfont_def is Qnil or not.
Kenichi Handa <handa@m17n.org>
parents:
103098
diff
changeset
|
541 Lisp_Object repertory; |
35792077cc20
(fontset_find_font): Check if rfont_def is Qnil or not.
Kenichi Handa <handa@m17n.org>
parents:
103098
diff
changeset
|
542 |
103587
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
543 rfont_def = AREF (vec, i); |
103112
35792077cc20
(fontset_find_font): Check if rfont_def is Qnil or not.
Kenichi Handa <handa@m17n.org>
parents:
103098
diff
changeset
|
544 if (NILP (rfont_def)) |
35792077cc20
(fontset_find_font): Check if rfont_def is Qnil or not.
Kenichi Handa <handa@m17n.org>
parents:
103098
diff
changeset
|
545 break; |
35792077cc20
(fontset_find_font): Check if rfont_def is Qnil or not.
Kenichi Handa <handa@m17n.org>
parents:
103098
diff
changeset
|
546 repertory = FONT_DEF_REPERTORY (RFONT_DEF_FONT_DEF (rfont_def)); |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
547 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
548 if (XINT (repertory) == id) |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
549 { |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
550 charset_matched = i; |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
551 break; |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
552 } |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
553 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
554 } |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
555 |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
556 /* Find the first available font in the vector of RFONT-DEF. */ |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
557 for (i = 0; i < ASIZE (vec); i++) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
558 { |
103587
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
559 Lisp_Object font_def; |
95230
fa14617b247e
Delete unused variables and add casting for char *
Kenichi Handa <handa@m17n.org>
parents:
95212
diff
changeset
|
560 Lisp_Object font_entity, font_object; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
561 |
103788
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
562 found_index = i; |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
563 if (i == 0) |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
564 { |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
565 if (charset_matched > 0) |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
566 { |
103788
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
567 /* Try the element matching with the charset ID at first. */ |
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
568 found_index = charset_matched; |
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
569 /* Make this negative so that we don't come here in the |
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
570 next loop. */ |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
571 charset_matched = - charset_matched; |
103788
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
572 /* We must try the first element in the next loop. */ |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
573 i--; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
574 } |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
575 } |
103788
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
576 else if (i == - charset_matched) |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
577 { |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
578 /* We have already tried this element and the followings |
103788
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
579 that have the same font specifications in the first |
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
580 iteration. So, skip them all. */ |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
581 rfont_def = AREF (vec, i); |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
582 font_def = RFONT_DEF_FONT_DEF (rfont_def); |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
583 for (; i + 1 < ASIZE (vec); i++) |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
584 { |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
585 rfont_def = AREF (vec, i + 1); |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
586 if (NILP (rfont_def)) |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
587 break; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
588 if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def)) |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
589 break; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
590 } |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
591 continue; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
592 } |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
593 |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
594 rfont_def = AREF (vec, found_index); |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
595 if (NILP (rfont_def)) |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
596 { |
103788
b4588e2be166
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
103775
diff
changeset
|
597 if (i < 0) |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
598 continue; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
599 /* This is a sign of not to try the other fonts. */ |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
600 return Qt; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
601 } |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
602 if (INTEGERP (RFONT_DEF_FACE (rfont_def)) |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
603 && XINT (RFONT_DEF_FACE (rfont_def)) < 0) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
604 /* We couldn't open this font last time. */ |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
605 continue; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
606 |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
607 font_object = RFONT_DEF_OBJECT (rfont_def); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
608 if (NILP (font_object)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
609 { |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
610 font_def = RFONT_DEF_FONT_DEF (rfont_def); |
90410 | 611 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
612 if (! face) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
613 /* We have not yet opened the font. */ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
614 return Qnil; |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
615 /* Find a font best-matching with the spec without checking |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
616 the support of the character C. That checking is costly, |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
617 and even without the checking, the found font supports C |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
618 in high possibility. */ |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
619 font_entity = font_find_for_lface (f, face->lface, |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
620 FONT_DEF_SPEC (font_def), -1); |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
621 if (NILP (font_entity)) |
90410 | 622 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
623 /* Record that no font matches the spec. */ |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
624 RFONT_DEF_SET_FACE (rfont_def, -1); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
625 continue; |
91136
d54684fee154
(fontset_find_font) [USE_FONT_BACKEND]: Try multiple
Kenichi Handa <handa@m17n.org>
parents:
91053
diff
changeset
|
626 } |
95570
b18ab5e0d568
(fontset_find_font): Call font_open_for_lface with the
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
627 font_object = font_open_for_lface (f, font_entity, face->lface, |
b18ab5e0d568
(fontset_find_font): Call font_open_for_lface with the
Kenichi Handa <handa@m17n.org>
parents:
95457
diff
changeset
|
628 FONT_DEF_SPEC (font_def)); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
629 if (NILP (font_object)) |
91136
d54684fee154
(fontset_find_font) [USE_FONT_BACKEND]: Try multiple
Kenichi Handa <handa@m17n.org>
parents:
91053
diff
changeset
|
630 { |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
631 /* Something strange happened, perhaps because of a |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
632 Font-backend problem. Too avoid crashing, record |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
633 that this spec is unsable. It may be better to find |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
634 another font of the same spec, but currently we don't |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
635 have such an API. */ |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
636 RFONT_DEF_SET_FACE (rfont_def, -1); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
637 continue; |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
638 } |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
639 RFONT_DEF_SET_OBJECT (rfont_def, font_object); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
640 } |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
641 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
642 if (font_has_char (f, font_object, c)) |
103587
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
643 goto found; |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
644 |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
645 /* Find a font already opened, maching with the current spec, |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
646 and supporting C. */ |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
647 font_def = RFONT_DEF_FONT_DEF (rfont_def); |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
648 for (; found_index + 1 < ASIZE (vec); found_index++) |
61736 | 649 { |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
650 rfont_def = AREF (vec, found_index + 1); |
103115
d6b2b717f098
(fontset_find_font): Check if rfont_def is Qnil or not.
Kenichi Handa <handa@m17n.org>
parents:
103114
diff
changeset
|
651 if (NILP (rfont_def)) |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
652 break; |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
653 if (! EQ (RFONT_DEF_FONT_DEF (rfont_def), font_def)) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
654 break; |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
655 font_object = RFONT_DEF_OBJECT (rfont_def); |
102417
5a5d05398f9e
(fontset_find_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
102414
diff
changeset
|
656 if (! NILP (font_object) && font_has_char (f, font_object, c)) |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
657 { |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
658 found_index++; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
659 goto found; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
660 } |
89826
b17725d55ba2
(Fset_fontset_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89811
diff
changeset
|
661 } |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
662 |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
663 /* Find a font-entity with the current spec and supporting C. */ |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
664 font_entity = font_find_for_lface (f, face->lface, |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
665 FONT_DEF_SPEC (font_def), c); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
666 if (! NILP (font_entity)) |
61736 | 667 { |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
668 /* We found a font. Open it and insert a new element for |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
669 that font in VEC. */ |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
670 Lisp_Object new_vec; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
671 int j; |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
672 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
673 font_object = font_open_for_lface (f, font_entity, face->lface, |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
674 Qnil); |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
675 if (NILP (font_object)) |
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
676 continue; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
677 RFONT_DEF_NEW (rfont_def, font_def); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
678 RFONT_DEF_SET_OBJECT (rfont_def, font_object); |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
679 RFONT_DEF_SET_SCORE (rfont_def, RFONT_DEF_SCORE (rfont_def)); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
680 new_vec = Fmake_vector (make_number (ASIZE (vec) + 1), Qnil); |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
681 found_index++; |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
682 for (j = 0; j < found_index; j++) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
683 ASET (new_vec, j, AREF (vec, j)); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
684 ASET (new_vec, j, rfont_def); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
685 for (j++; j < ASIZE (new_vec); j++) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
686 ASET (new_vec, j, AREF (vec, j - 1)); |
102414
5988cd89cf0b
(fontset_find_font): If a font found without
Kenichi Handa <handa@m17n.org>
parents:
102241
diff
changeset
|
687 XSETCDR (font_group, new_vec); |
103587
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
688 vec = new_vec; |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
689 goto found; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
690 } |
103775
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
691 if (i >= 0) |
9bc67103bc1d
(fontset_find_font): Fix the logic of handling
Kenichi Handa <handa@m17n.org>
parents:
103587
diff
changeset
|
692 i = found_index; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
693 } |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
694 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
695 FONTSET_SET (fontset, make_number (c), make_number (0)); |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
696 return Qnil; |
103587
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
697 |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
698 found: |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
699 if (fallback && found_index > 0) |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
700 { |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
701 /* The order of fonts in the fallback font-group is not that |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
702 important, and it is better to move the found font to the |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
703 first of the group so that the next try will find it |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
704 quickly. */ |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
705 for (i = found_index; i > 0; i--) |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
706 ASET (vec, i, AREF (vec, i - 1)); |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
707 ASET (vec, 0, rfont_def); |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
708 } |
1db851c2440a
(fontset_find_font): When a usable rfont_def is found
Kenichi Handa <handa@m17n.org>
parents:
103573
diff
changeset
|
709 return rfont_def; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
710 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
711 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
712 |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
713 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
714 fontset_font (Lisp_Object fontset, int c, struct face *face, int id) |
17052 | 715 { |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
716 Lisp_Object rfont_def, default_rfont_def; |
90802
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
717 Lisp_Object base_fontset; |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
718 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
719 /* Try a font-group of FONTSET. */ |
103541
1a80fde577a8
(fontset_font): Call FONT_DEFERRED_LOG.
Kenichi Handa <handa@m17n.org>
parents:
103342
diff
changeset
|
720 FONT_DEFERRED_LOG ("current fontset: font for", make_number (c), Qnil); |
90802
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
721 rfont_def = fontset_find_font (fontset, c, face, id, 0); |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
722 if (VECTORP (rfont_def)) |
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
723 return rfont_def; |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
724 if (NILP (rfont_def)) |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
725 FONTSET_SET (fontset, make_number (c), make_number (0)); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
726 |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
727 /* Try a font-group of the default fontset. */ |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
728 base_fontset = FONTSET_BASE (fontset); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
729 if (! EQ (base_fontset, Vdefault_fontset)) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
730 { |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
731 if (NILP (FONTSET_DEFAULT (fontset))) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
732 FONTSET_DEFAULT (fontset) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
733 = make_fontset (FONTSET_FRAME (fontset), Qnil, Vdefault_fontset); |
103541
1a80fde577a8
(fontset_font): Call FONT_DEFERRED_LOG.
Kenichi Handa <handa@m17n.org>
parents:
103342
diff
changeset
|
734 FONT_DEFERRED_LOG ("default fontset: font for", make_number (c), Qnil); |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
735 default_rfont_def |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
736 = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 0); |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
737 if (VECTORP (default_rfont_def)) |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
738 return default_rfont_def; |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
739 if (NILP (default_rfont_def)) |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
740 FONTSET_SET (FONTSET_DEFAULT (fontset), make_number (c), |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
741 make_number (0)); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
742 } |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
743 |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
744 /* Try a fallback font-group of FONTSET. */ |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
745 if (! EQ (rfont_def, Qt)) |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
746 { |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
747 FONT_DEFERRED_LOG ("current fallback: font for", make_number (c), Qnil); |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
748 rfont_def = fontset_find_font (fontset, c, face, id, 1); |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
749 if (VECTORP (rfont_def)) |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
750 return rfont_def; |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
751 /* Remember that FONTSET has no font for C. */ |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
752 FONTSET_SET (fontset, make_number (c), Qt); |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
753 } |
95230
fa14617b247e
Delete unused variables and add casting for char *
Kenichi Handa <handa@m17n.org>
parents:
95212
diff
changeset
|
754 |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
755 /* Try a fallback font-group of the default fontset. */ |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
756 if (! EQ (base_fontset, Vdefault_fontset) |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
757 && ! EQ (default_rfont_def, Qt)) |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
758 { |
103541
1a80fde577a8
(fontset_font): Call FONT_DEFERRED_LOG.
Kenichi Handa <handa@m17n.org>
parents:
103342
diff
changeset
|
759 FONT_DEFERRED_LOG ("default fallback: font for", make_number (c), Qnil); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
760 rfont_def = fontset_find_font (FONTSET_DEFAULT (fontset), c, face, id, 1); |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
761 if (VECTORP (rfont_def)) |
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
762 return rfont_def; |
103573
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
763 /* Remember that the default fontset has no font for C. */ |
67e242fdd3e1
(fontset_get_font_group): Return 0 if no font-group is
Kenichi Handa <handa@m17n.org>
parents:
103541
diff
changeset
|
764 FONTSET_SET (FONTSET_DEFAULT (fontset), make_number (c), Qt); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
765 } |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
766 |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
767 return Qnil; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
768 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
769 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
770 /* Return a newly created fontset with NAME. If BASE is nil, make a |
88405 | 771 base fontset. Otherwise make a realized fontset whose base is |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
772 BASE. */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
773 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
774 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
775 make_fontset (Lisp_Object frame, Lisp_Object name, Lisp_Object base) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
776 { |
34975
0d69e2d2724e
(fontset_ref): Remove unused variable `i'.
Eli Zaretskii <eliz@gnu.org>
parents:
32978
diff
changeset
|
777 Lisp_Object fontset; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
778 int size = ASIZE (Vfontset_table); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
779 int id = next_fontset_id; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
780 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
781 /* Find a free slot in Vfontset_table. Usually, next_fontset_id is |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
782 the next available fontset ID. So it is expected that this loop |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
783 terminates quickly. In addition, as the last element of |
41987
34952771ae85
Fix typos, remove unnecessary space.
Pavel Janík <Pavel@Janik.cz>
parents:
41052
diff
changeset
|
784 Vfontset_table is always nil, we don't have to check the range of |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
785 id. */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
786 while (!NILP (AREF (Vfontset_table, id))) id++; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
787 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
788 if (id + 1 == size) |
91053 | 789 Vfontset_table = larger_vector (Vfontset_table, size + 32, Qnil); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
790 |
29767
c8e5453dc85d
(FONTSET_ASCII): Use the first element of char table
Kenichi Handa <handa@m17n.org>
parents:
29501
diff
changeset
|
791 fontset = Fmake_char_table (Qfontset, Qnil); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
792 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
793 FONTSET_ID (fontset) = make_number (id); |
88405 | 794 if (NILP (base)) |
795 { | |
796 FONTSET_NAME (fontset) = name; | |
797 } | |
798 else | |
799 { | |
800 FONTSET_NAME (fontset) = Qnil; | |
801 FONTSET_FRAME (fontset) = frame; | |
802 FONTSET_BASE (fontset) = base; | |
803 } | |
17052 | 804 |
88405 | 805 ASET (Vfontset_table, id, fontset); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
806 next_fontset_id = id + 1; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
807 return fontset; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
808 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
809 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
810 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
811 /********** INTERFACES TO xfaces.c, xfns.c, and dispextern.h **********/ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
812 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
813 /* Return the name of the fontset who has ID. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
814 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
815 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
816 fontset_name (int id) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
817 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
818 Lisp_Object fontset; |
88405 | 819 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
820 fontset = FONTSET_FROM_ID (id); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
821 return FONTSET_NAME (fontset); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
822 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
823 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
824 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
825 /* Return the ASCII font name of the fontset who has ID. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
826 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
827 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
828 fontset_ascii (int id) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
829 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
830 Lisp_Object fontset, elt; |
88405 | 831 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
832 fontset= FONTSET_FROM_ID (id); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
833 elt = FONTSET_ASCII (fontset); |
90410 | 834 if (CONSP (elt)) |
835 elt = XCAR (elt); | |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
836 return elt; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
837 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
838 |
91908
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
839 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
840 free_realized_fontset (FRAME_PTR f, Lisp_Object fontset) |
91908
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
841 { |
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
842 Lisp_Object tail; |
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
843 |
112290
9164d0b32512
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Paul Eggert <eggert@cs.ucla.edu>
parents:
112278
diff
changeset
|
844 if (0) |
9164d0b32512
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Paul Eggert <eggert@cs.ucla.edu>
parents:
112278
diff
changeset
|
845 for (tail = FONTSET_OBJLIST (fontset); CONSP (tail); tail = XCDR (tail)) |
9164d0b32512
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Paul Eggert <eggert@cs.ucla.edu>
parents:
112278
diff
changeset
|
846 { |
9164d0b32512
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Paul Eggert <eggert@cs.ucla.edu>
parents:
112278
diff
changeset
|
847 xassert (FONT_OBJECT_P (XCAR (tail))); |
9164d0b32512
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Paul Eggert <eggert@cs.ucla.edu>
parents:
112278
diff
changeset
|
848 font_close_object (f, XCAR (tail)); |
9164d0b32512
* fontset.c (free_realized_fontset): Mark unreachable code with if (0).
Paul Eggert <eggert@cs.ucla.edu>
parents:
112278
diff
changeset
|
849 } |
91908
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
850 } |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
851 |
88405 | 852 /* Free fontset of FACE defined on frame F. Called from |
853 free_realized_face. */ | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
854 |
17052 | 855 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
856 free_face_fontset (FRAME_PTR f, struct face *face) |
17052 | 857 { |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
858 Lisp_Object fontset; |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
859 |
91668
aeadaa72f7b1
(free_face_fontset): Use FONTSET_FROM_ID.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91513
diff
changeset
|
860 fontset = FONTSET_FROM_ID (face->fontset); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
861 if (NILP (fontset)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
862 return; |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
863 xassert (! BASE_FONTSET_P (fontset)); |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
864 xassert (f == XFRAME (FONTSET_FRAME (fontset))); |
91908
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
865 free_realized_fontset (f, fontset); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
866 ASET (Vfontset_table, face->fontset, Qnil); |
88405 | 867 if (face->fontset < next_fontset_id) |
868 next_fontset_id = face->fontset; | |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
869 if (! NILP (FONTSET_DEFAULT (fontset))) |
17052 | 870 { |
89865 | 871 int id = XINT (FONTSET_ID (FONTSET_DEFAULT (fontset))); |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
872 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
873 fontset = AREF (Vfontset_table, id); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
874 xassert (!NILP (fontset) && ! BASE_FONTSET_P (fontset)); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
875 xassert (f == XFRAME (FONTSET_FRAME (fontset))); |
91908
6916adc8df33
(FONTSET_OBJLIST): New macro.
Kenichi Handa <handa@m17n.org>
parents:
91887
diff
changeset
|
876 free_realized_fontset (f, fontset); |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
877 ASET (Vfontset_table, id, Qnil); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
878 if (id < next_fontset_id) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
879 next_fontset_id = face->fontset; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
880 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
881 face->fontset = -1; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
882 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
883 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
884 |
78501 | 885 /* Return 1 if FACE is suitable for displaying character C. |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
886 Otherwise return 0. Called from the macro FACE_SUITABLE_FOR_CHAR_P |
88405 | 887 when C is not an ASCII character. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
888 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
889 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
890 face_suitable_for_char_p (struct face *face, int c) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
891 { |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
892 Lisp_Object fontset, rfont_def; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
893 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
894 fontset = FONTSET_FROM_ID (face->fontset); |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
895 rfont_def = fontset_font (fontset, c, NULL, -1); |
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
896 return (VECTORP (rfont_def) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
897 && INTEGERP (RFONT_DEF_FACE (rfont_def)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
898 && face->id == XINT (RFONT_DEF_FACE (rfont_def))); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
899 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
900 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
901 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
902 /* Return ID of face suitable for displaying character C on frame F. |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
903 FACE must be reazlied for ASCII characters in advance. Called from |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
904 the macro FACE_FOR_CHAR. */ |
17052 | 905 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
906 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
907 face_for_char (FRAME_PTR f, struct face *face, int c, int pos, Lisp_Object object) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
908 { |
97539
cc7d396b5612
(face_for_char): Add font log.
Kenichi Handa <handa@m17n.org>
parents:
97043
diff
changeset
|
909 Lisp_Object fontset, rfont_def, charset; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
910 int face_id; |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
911 int id; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
912 |
98582
13af2a2ff3db
(face_for_char): If face->fontset is negative, just return ascii_face.
Kenichi Handa <handa@m17n.org>
parents:
98575
diff
changeset
|
913 /* If face->fontset is negative (that happens when no font is found |
13af2a2ff3db
(face_for_char): If face->fontset is negative, just return ascii_face.
Kenichi Handa <handa@m17n.org>
parents:
98575
diff
changeset
|
914 for face), just return face->ascii_face because we can't do |
13af2a2ff3db
(face_for_char): If face->fontset is negative, just return ascii_face.
Kenichi Handa <handa@m17n.org>
parents:
98575
diff
changeset
|
915 anything. Perhaps, we should fix the callers to assure |
13af2a2ff3db
(face_for_char): If face->fontset is negative, just return ascii_face.
Kenichi Handa <handa@m17n.org>
parents:
98575
diff
changeset
|
916 that face->fontset is always valid. */ |
13af2a2ff3db
(face_for_char): If face->fontset is negative, just return ascii_face.
Kenichi Handa <handa@m17n.org>
parents:
98575
diff
changeset
|
917 if (ASCII_CHAR_P (c) || face->fontset < 0) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
918 return face->ascii_face->id; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
919 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
920 xassert (fontset_id_valid_p (face->fontset)); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
921 fontset = FONTSET_FROM_ID (face->fontset); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
922 xassert (!BASE_FONTSET_P (fontset)); |
96556
0af6d3c9fb7c
(fontset_compare_rfontdef): Fix plus/minus.
Kenichi Handa <handa@m17n.org>
parents:
96414
diff
changeset
|
923 |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
924 if (pos < 0) |
97539
cc7d396b5612
(face_for_char): Add font log.
Kenichi Handa <handa@m17n.org>
parents:
97043
diff
changeset
|
925 { |
cc7d396b5612
(face_for_char): Add font log.
Kenichi Handa <handa@m17n.org>
parents:
97043
diff
changeset
|
926 id = -1; |
cc7d396b5612
(face_for_char): Add font log.
Kenichi Handa <handa@m17n.org>
parents:
97043
diff
changeset
|
927 charset = Qnil; |
cc7d396b5612
(face_for_char): Add font log.
Kenichi Handa <handa@m17n.org>
parents:
97043
diff
changeset
|
928 } |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
929 else |
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
930 { |
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
931 charset = Fget_char_property (make_number (pos), Qcharset, object); |
100168
acef56f002fc
(face_for_char): Handle invalid charset property
Kenichi Handa <handa@m17n.org>
parents:
99980
diff
changeset
|
932 if (CHARSETP (charset)) |
91266
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
933 { |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
934 Lisp_Object val; |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
935 |
101553
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
936 val = assq_no_quit (charset, Vfont_encoding_charset_alist); |
91266
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
937 if (CONSP (val) && CHARSETP (XCDR (val))) |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
938 charset = XCDR (val); |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
939 id = XINT (CHARSET_SYMBOL_ID (charset)); |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
940 } |
100168
acef56f002fc
(face_for_char): Handle invalid charset property
Kenichi Handa <handa@m17n.org>
parents:
99980
diff
changeset
|
941 else |
acef56f002fc
(face_for_char): Handle invalid charset property
Kenichi Handa <handa@m17n.org>
parents:
99980
diff
changeset
|
942 id = -1; |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
943 } |
95291
5ad7b7aaa2a5
(face_for_char): Optimize for the case of no charset property.
Kenichi Handa <handa@m17n.org>
parents:
95256
diff
changeset
|
944 |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
945 rfont_def = fontset_font (fontset, c, face, id); |
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
946 if (VECTORP (rfont_def)) |
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
947 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
948 if (INTEGERP (RFONT_DEF_FACE (rfont_def))) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
949 face_id = XINT (RFONT_DEF_FACE (rfont_def)); |
90410 | 950 else |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
951 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
952 Lisp_Object font_object; |
41987
34952771ae85
Fix typos, remove unnecessary space.
Pavel Janík <Pavel@Janik.cz>
parents:
41052
diff
changeset
|
953 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
954 font_object = RFONT_DEF_OBJECT (rfont_def); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
955 face_id = face_for_font (f, font_object, face); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
956 RFONT_DEF_SET_FACE (rfont_def, face_id); |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
957 } |
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
958 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
959 else |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
960 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
961 if (INTEGERP (FONTSET_NOFONT_FACE (fontset))) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
962 face_id = XINT (FONTSET_NOFONT_FACE (fontset)); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
963 else |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
964 { |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
965 face_id = face_for_font (f, Qnil, face); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
966 FONTSET_NOFONT_FACE (fontset) = make_number (face_id); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
967 } |
89898
0167306cb580
(fontset_font): Renamed from fontset_face. Return
Kenichi Handa <handa@m17n.org>
parents:
89865
diff
changeset
|
968 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
969 xassert (face_id >= 0); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
970 return face_id; |
17052 | 971 } |
972 | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
973 |
97824
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
974 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
975 font_for_char (struct face *face, int c, int pos, Lisp_Object object) |
97824
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
976 { |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
977 Lisp_Object fontset, rfont_def, charset; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
978 int id; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
979 |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
980 if (ASCII_CHAR_P (c)) |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
981 { |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
982 Lisp_Object font_object; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
983 |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
984 XSETFONT (font_object, face->ascii_face->font); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
985 return font_object; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
986 } |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
987 |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
988 xassert (fontset_id_valid_p (face->fontset)); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
989 fontset = FONTSET_FROM_ID (face->fontset); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
990 xassert (!BASE_FONTSET_P (fontset)); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
991 if (pos < 0) |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
992 { |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
993 id = -1; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
994 charset = Qnil; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
995 } |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
996 else |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
997 { |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
998 charset = Fget_char_property (make_number (pos), Qcharset, object); |
100168
acef56f002fc
(face_for_char): Handle invalid charset property
Kenichi Handa <handa@m17n.org>
parents:
99980
diff
changeset
|
999 if (CHARSETP (charset)) |
97824
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1000 { |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1001 Lisp_Object val; |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1002 |
101601
58bce94ff020
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101553
diff
changeset
|
1003 val = assq_no_quit (charset, Vfont_encoding_charset_alist); |
97824
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1004 if (CONSP (val) && CHARSETP (XCDR (val))) |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1005 charset = XCDR (val); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1006 id = XINT (CHARSET_SYMBOL_ID (charset)); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1007 } |
100168
acef56f002fc
(face_for_char): Handle invalid charset property
Kenichi Handa <handa@m17n.org>
parents:
99980
diff
changeset
|
1008 else |
acef56f002fc
(face_for_char): Handle invalid charset property
Kenichi Handa <handa@m17n.org>
parents:
99980
diff
changeset
|
1009 id = -1; |
97824
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1010 } |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1011 |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1012 rfont_def = fontset_font (fontset, c, face, id); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1013 return (VECTORP (rfont_def) |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1014 ? RFONT_DEF_OBJECT (rfont_def) |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1015 : Qnil); |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1016 } |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1017 |
991e41e2d92a
(font_for_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
97556
diff
changeset
|
1018 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1019 /* Make a realized fontset for ASCII face FACE on frame F from the |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1020 base fontset BASE_FONTSET_ID. If BASE_FONTSET_ID is -1, use the |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1021 default fontset as the base. Value is the id of the new fontset. |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1022 Called from realize_x_face. */ |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1023 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1024 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1025 make_fontset_for_ascii_face (FRAME_PTR f, int base_fontset_id, struct face *face) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1026 { |
34975
0d69e2d2724e
(fontset_ref): Remove unused variable `i'.
Eli Zaretskii <eliz@gnu.org>
parents:
32978
diff
changeset
|
1027 Lisp_Object base_fontset, fontset, frame; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1028 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1029 XSETFRAME (frame, f); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1030 if (base_fontset_id >= 0) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1031 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1032 base_fontset = FONTSET_FROM_ID (base_fontset_id); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1033 if (!BASE_FONTSET_P (base_fontset)) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1034 base_fontset = FONTSET_BASE (base_fontset); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1035 if (! BASE_FONTSET_P (base_fontset)) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1036 abort (); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1037 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1038 else |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1039 base_fontset = Vdefault_fontset; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1040 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1041 fontset = make_fontset (frame, Qnil, base_fontset); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1042 return XINT (FONTSET_ID (fontset)); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1043 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1044 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1045 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1046 |
17052 | 1047 /* Cache data used by fontset_pattern_regexp. The car part is a |
1048 pattern string containing at least one wild card, the cdr part is | |
1049 the corresponding regular expression. */ | |
1050 static Lisp_Object Vcached_fontset_data; | |
1051 | |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1052 #define CACHED_FONTSET_NAME SSDATA (XCAR (Vcached_fontset_data)) |
26164
d39ec0a27081
more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine
Ken Raeburn <raeburn@raeburn.org>
parents:
25668
diff
changeset
|
1053 #define CACHED_FONTSET_REGEX (XCDR (Vcached_fontset_data)) |
17052 | 1054 |
1055 /* If fontset name PATTERN contains any wild card, return regular | |
1056 expression corresponding to PATTERN. */ | |
1057 | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1058 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1059 fontset_pattern_regexp (Lisp_Object pattern) |
17052 | 1060 { |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1061 if (!strchr (SSDATA (pattern), '*') |
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1062 && !strchr (SSDATA (pattern), '?')) |
17052 | 1063 /* PATTERN does not contain any wild cards. */ |
17730
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
1064 return Qnil; |
17052 | 1065 |
1066 if (!CONSP (Vcached_fontset_data) | |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1067 || strcmp (SSDATA (pattern), CACHED_FONTSET_NAME)) |
17052 | 1068 { |
1069 /* We must at first update the cached data. */ | |
57947
678d2c0d522e
(fontset_pattern_regexp): Use unsigned char.
Kim F. Storm <storm@cua.dk>
parents:
57921
diff
changeset
|
1070 unsigned char *regex, *p0, *p1; |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1071 int ndashes = 0, nstars = 0, nescs = 0; |
57947
678d2c0d522e
(fontset_pattern_regexp): Use unsigned char.
Kim F. Storm <storm@cua.dk>
parents:
57921
diff
changeset
|
1072 |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1073 for (p0 = SDATA (pattern); *p0; p0++) |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1074 { |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1075 if (*p0 == '-') |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1076 ndashes++; |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1077 else if (*p0 == '*') |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1078 nstars++; |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1079 else if (*p0 == '[' |
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1080 || *p0 == '.' || *p0 == '\\' |
101943
97c9e9322753
Remove spurious semicolons.
Juanma Barranquero <lekktu@gmail.com>
parents:
101605
diff
changeset
|
1081 || *p0 == '+' || *p0 == '^' |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1082 || *p0 == '$') |
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1083 nescs++; |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1084 } |
17052 | 1085 |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1086 /* If PATTERN is not full XLFD we conert "*" to ".*". Otherwise |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1087 we convert "*" to "[^-]*" which is much faster in regular |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1088 expression matching. */ |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1089 if (ndashes < 14) |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1090 p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 2 * nstars + 2 * nescs + 1); |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1091 else |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1092 p1 = regex = (unsigned char *) alloca (SBYTES (pattern) + 5 * nstars + 2 * nescs + 1); |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1093 |
17730
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
1094 *p1++ = '^'; |
57947
678d2c0d522e
(fontset_pattern_regexp): Use unsigned char.
Kim F. Storm <storm@cua.dk>
parents:
57921
diff
changeset
|
1095 for (p0 = SDATA (pattern); *p0; p0++) |
17052 | 1096 { |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1097 if (*p0 == '*') |
17052 | 1098 { |
57685
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1099 if (ndashes < 14) |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1100 *p1++ = '.'; |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1101 else |
b935fc1cb542
(fontset_pattern_regexp): Optimize for the case that
Kenichi Handa <handa@m17n.org>
parents:
57573
diff
changeset
|
1102 *p1++ = '[', *p1++ = '^', *p1++ = '-', *p1++ = ']'; |
17730
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
1103 *p1++ = '*'; |
17052 | 1104 } |
17730
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
1105 else if (*p0 == '?') |
21127
577865651099
(fontset_pattern_regexp): `==' was used instead of `='.
Richard M. Stallman <rms@gnu.org>
parents:
20346
diff
changeset
|
1106 *p1++ = '.'; |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1107 else if (*p0 == '[' |
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1108 || *p0 == '.' || *p0 == '\\' |
101943
97c9e9322753
Remove spurious semicolons.
Juanma Barranquero <lekktu@gmail.com>
parents:
101605
diff
changeset
|
1109 || *p0 == '+' || *p0 == '^' |
96020
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1110 || *p0 == '$') |
b52fa52cd0fa
(fontset_pattern_regexp): Escape some regexp characters.
Kenichi Handa <handa@m17n.org>
parents:
95961
diff
changeset
|
1111 *p1++ = '\\', *p1++ = *p0; |
17730
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
1112 else |
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
1113 *p1++ = *p0; |
17052 | 1114 } |
1115 *p1++ = '$'; | |
1116 *p1++ = 0; | |
1117 | |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1118 Vcached_fontset_data = Fcons (build_string (SSDATA (pattern)), |
95230
fa14617b247e
Delete unused variables and add casting for char *
Kenichi Handa <handa@m17n.org>
parents:
95212
diff
changeset
|
1119 build_string ((char *) regex)); |
17052 | 1120 } |
1121 | |
1122 return CACHED_FONTSET_REGEX; | |
1123 } | |
1124 | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1125 /* Return ID of the base fontset named NAME. If there's no such |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1126 fontset, return -1. NAME_PATTERN specifies how to treat NAME as this: |
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1127 0: pattern containing '*' and '?' as wildcards |
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1128 1: regular expression |
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1129 2: literal fontset name |
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1130 */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1131 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1132 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1133 fs_query_fontset (Lisp_Object name, int name_pattern) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1134 { |
34975
0d69e2d2724e
(fontset_ref): Remove unused variable `i'.
Eli Zaretskii <eliz@gnu.org>
parents:
32978
diff
changeset
|
1135 Lisp_Object tem; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1136 int i; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1137 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1138 name = Fdowncase (name); |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1139 if (name_pattern != 1) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1140 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1141 tem = Frassoc (name, Vfontset_alias_alist); |
89699
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
1142 if (NILP (tem)) |
cda6f41a592e
(reorder_font_vector): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
89687
diff
changeset
|
1143 tem = Fassoc (name, Vfontset_alias_alist); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1144 if (CONSP (tem) && STRINGP (XCAR (tem))) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1145 name = XCAR (tem); |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1146 else if (name_pattern == 0) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1147 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1148 tem = fontset_pattern_regexp (name); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1149 if (STRINGP (tem)) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1150 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1151 name = tem; |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1152 name_pattern = 1; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1153 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1154 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1155 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1156 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1157 for (i = 0; i < ASIZE (Vfontset_table); i++) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1158 { |
57573
43067aee2f3e
(fs_load_font): Use fast_string_match_ignore_case for
Kenichi Handa <handa@m17n.org>
parents:
56293
diff
changeset
|
1159 Lisp_Object fontset, this_name; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1160 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1161 fontset = FONTSET_FROM_ID (i); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1162 if (NILP (fontset) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1163 || !BASE_FONTSET_P (fontset)) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1164 continue; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1165 |
57573
43067aee2f3e
(fs_load_font): Use fast_string_match_ignore_case for
Kenichi Handa <handa@m17n.org>
parents:
56293
diff
changeset
|
1166 this_name = FONTSET_NAME (fontset); |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1167 if (name_pattern == 1 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1168 ? fast_string_match_ignore_case (name, this_name) >= 0 |
95212
a6a4ada91449
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
95203
diff
changeset
|
1169 : !xstrcasecmp (SDATA (name), SDATA (this_name))) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1170 return i; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1171 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1172 return -1; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1173 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1174 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1175 |
21553
2d7afcd11b72
(find_ccl_program_func): New variable.
Kenichi Handa <handa@m17n.org>
parents:
21514
diff
changeset
|
1176 DEFUN ("query-fontset", Fquery_fontset, Squery_fontset, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1177 doc: /* Return the name of a fontset that matches PATTERN. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1178 The value is nil if there is no matching fontset. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1179 PATTERN can contain `*' or `?' as a wildcard |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1180 just as X font name matching algorithm allows. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1181 If REGEXPP is non-nil, PATTERN is a regular expression. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1182 (Lisp_Object pattern, Lisp_Object regexpp) |
17052 | 1183 { |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1184 Lisp_Object fontset; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1185 int id; |
17052 | 1186 |
1187 (*check_window_system_func) (); | |
1188 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40028
diff
changeset
|
1189 CHECK_STRING (pattern); |
17052 | 1190 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45848
diff
changeset
|
1191 if (SCHARS (pattern) == 0) |
17052 | 1192 return Qnil; |
1193 | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1194 id = fs_query_fontset (pattern, !NILP (regexpp)); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1195 if (id < 0) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1196 return Qnil; |
17052 | 1197 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1198 fontset = FONTSET_FROM_ID (id); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1199 return FONTSET_NAME (fontset); |
17052 | 1200 } |
1201 | |
88405 | 1202 /* Return a list of base fontset names matching PATTERN on frame F. */ |
17052 | 1203 |
1204 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1205 list_fontsets (FRAME_PTR f, Lisp_Object pattern, int size) |
17052 | 1206 { |
34975
0d69e2d2724e
(fontset_ref): Remove unused variable `i'.
Eli Zaretskii <eliz@gnu.org>
parents:
32978
diff
changeset
|
1207 Lisp_Object frame, regexp, val; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1208 int id; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1209 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1210 XSETFRAME (frame, f); |
17052 | 1211 |
1212 regexp = fontset_pattern_regexp (pattern); | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1213 val = Qnil; |
17052 | 1214 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1215 for (id = 0; id < ASIZE (Vfontset_table); id++) |
17052 | 1216 { |
57573
43067aee2f3e
(fs_load_font): Use fast_string_match_ignore_case for
Kenichi Handa <handa@m17n.org>
parents:
56293
diff
changeset
|
1217 Lisp_Object fontset, name; |
17052 | 1218 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1219 fontset = FONTSET_FROM_ID (id); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1220 if (NILP (fontset) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1221 || !BASE_FONTSET_P (fontset) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1222 || !EQ (frame, FONTSET_FRAME (fontset))) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1223 continue; |
57573
43067aee2f3e
(fs_load_font): Use fast_string_match_ignore_case for
Kenichi Handa <handa@m17n.org>
parents:
56293
diff
changeset
|
1224 name = FONTSET_NAME (fontset); |
17052 | 1225 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1226 if (STRINGP (regexp) |
57573
43067aee2f3e
(fs_load_font): Use fast_string_match_ignore_case for
Kenichi Handa <handa@m17n.org>
parents:
56293
diff
changeset
|
1227 ? (fast_string_match (regexp, name) < 0) |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1228 : strcmp (SSDATA (pattern), SSDATA (name))) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1229 continue; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1230 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1231 val = Fcons (Fcopy_sequence (FONTSET_NAME (fontset)), val); |
17052 | 1232 } |
1233 | |
1234 return val; | |
1235 } | |
1236 | |
88405 | 1237 |
89483 | 1238 /* Free all realized fontsets whose base fontset is BASE. */ |
17052 | 1239 |
88405 | 1240 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1241 free_realized_fontsets (Lisp_Object base) |
17052 | 1242 { |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1243 int id; |
17052 | 1244 |
90806
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1245 #if 0 |
88482
effba1417b74
(free_realized_fontsets): Call Fclear_face_cache instead
Kenichi Handa <handa@m17n.org>
parents:
88405
diff
changeset
|
1246 /* For the moment, this doesn't work because free_realized_face |
effba1417b74
(free_realized_fontsets): Call Fclear_face_cache instead
Kenichi Handa <handa@m17n.org>
parents:
88405
diff
changeset
|
1247 doesn't remove FACE from a cache. Until we find a solution, we |
effba1417b74
(free_realized_fontsets): Call Fclear_face_cache instead
Kenichi Handa <handa@m17n.org>
parents:
88405
diff
changeset
|
1248 suppress this code, and simply use Fclear_face_cache even though |
effba1417b74
(free_realized_fontsets): Call Fclear_face_cache instead
Kenichi Handa <handa@m17n.org>
parents:
88405
diff
changeset
|
1249 that is not efficient. */ |
88405 | 1250 BLOCK_INPUT; |
1251 for (id = 0; id < ASIZE (Vfontset_table); id++) | |
58025
bcd053632eb2
(fontset_pattern_regexp): Cancel my previous change;
Kenichi Handa <handa@m17n.org>
parents:
57947
diff
changeset
|
1252 { |
88405 | 1253 Lisp_Object this = AREF (Vfontset_table, id); |
17052 | 1254 |
88405 | 1255 if (EQ (FONTSET_BASE (this), base)) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1256 { |
88405 | 1257 Lisp_Object tail; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1258 |
88405 | 1259 for (tail = FONTSET_FACE_ALIST (this); CONSP (tail); |
1260 tail = XCDR (tail)) | |
1261 { | |
1262 FRAME_PTR f = XFRAME (FONTSET_FRAME (this)); | |
1263 int face_id = XINT (XCDR (XCAR (tail))); | |
1264 struct face *face = FACE_FROM_ID (f, face_id); | |
89483 | 1265 |
88405 | 1266 /* Face THIS itself is also freed by the following call. */ |
1267 free_realized_face (f, face); | |
1268 } | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1269 } |
17052 | 1270 } |
88405 | 1271 UNBLOCK_INPUT; |
88482
effba1417b74
(free_realized_fontsets): Call Fclear_face_cache instead
Kenichi Handa <handa@m17n.org>
parents:
88405
diff
changeset
|
1272 #else /* not 0 */ |
90806
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1273 /* But, we don't have to call Fclear_face_cache if no fontset has |
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1274 been realized from BASE. */ |
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1275 for (id = 0; id < ASIZE (Vfontset_table); id++) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1276 { |
90806
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1277 Lisp_Object this = AREF (Vfontset_table, id); |
17052 | 1278 |
91046 | 1279 if (CHAR_TABLE_P (this) && EQ (FONTSET_BASE (this), base)) |
90806
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1280 { |
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1281 Fclear_face_cache (Qt); |
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1282 break; |
1ae136ad0ba0
(free_realized_fontsets): Avoid unnecessary call of
Kenichi Handa <handa@m17n.org>
parents:
90802
diff
changeset
|
1283 } |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1284 } |
88482
effba1417b74
(free_realized_fontsets): Call Fclear_face_cache instead
Kenichi Handa <handa@m17n.org>
parents:
88405
diff
changeset
|
1285 #endif /* not 0 */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1286 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1287 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1288 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1289 /* Check validity of NAME as a fontset name and return the |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1290 corresponding fontset. If not valid, signal an error. |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1291 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1292 If NAME is t, return Vdefault_fontset. If NAME is nil, return the |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1293 fontset of *FRAME. |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1294 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1295 Set *FRAME to the actual frame. */ |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1296 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1297 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1298 check_fontset_name (Lisp_Object name, Lisp_Object *frame) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1299 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1300 int id; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1301 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1302 if (NILP (*frame)) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1303 *frame = selected_frame; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1304 CHECK_LIVE_FRAME (*frame); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1305 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1306 if (EQ (name, Qt)) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1307 return Vdefault_fontset; |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1308 if (NILP (name)) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1309 { |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1310 id = FRAME_FONTSET (XFRAME (*frame)); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1311 } |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1312 else |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1313 { |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1314 CHECK_STRING (name); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1315 /* First try NAME as literal. */ |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1316 id = fs_query_fontset (name, 2); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1317 if (id < 0) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1318 /* For backward compatibility, try again NAME as pattern. */ |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1319 id = fs_query_fontset (name, 0); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1320 if (id < 0) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1321 error ("Fontset `%s' does not exist", SDATA (name)); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1322 } |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1323 return FONTSET_FROM_ID (id); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1324 } |
17052 | 1325 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1326 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1327 accumulate_script_ranges (Lisp_Object arg, Lisp_Object range, Lisp_Object val) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1328 { |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1329 if (EQ (XCAR (arg), val)) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1330 { |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1331 if (CONSP (range)) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1332 XSETCDR (arg, Fcons (Fcons (XCAR (range), XCDR (range)), XCDR (arg))); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1333 else |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1334 XSETCDR (arg, Fcons (Fcons (range, range), XCDR (arg))); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1335 } |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1336 } |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
1337 |
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
1338 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1339 /* Callback function for map_charset_chars in Fset_fontset_font. |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1340 ARG is a vector [ FONTSET FONT_DEF ADD ASCII SCRIPT_RANGE_LIST ]. |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1341 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1342 In FONTSET, set FONT_DEF in a fashion specified by ADD for |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1343 characters in RANGE and ranges in SCRIPT_RANGE_LIST before RANGE. |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1344 The consumed ranges are poped up from SCRIPT_RANGE_LIST, and the |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1345 new SCRIPT_RANGE_LIST is stored in ARG. |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1346 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1347 If ASCII is nil, don't set FONT_DEF for ASCII characters. It is |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1348 assured that SCRIPT_RANGE_LIST doesn't contain ASCII in that |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1349 case. */ |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1350 |
89614
355fc0282e50
(set_fontset_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
89610
diff
changeset
|
1351 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1352 set_fontset_font (Lisp_Object arg, Lisp_Object range) |
89614
355fc0282e50
(set_fontset_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
89610
diff
changeset
|
1353 { |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1354 Lisp_Object fontset, font_def, add, ascii, script_range_list; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1355 int from = XINT (XCAR (range)), to = XINT (XCDR (range)); |
89614
355fc0282e50
(set_fontset_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
89610
diff
changeset
|
1356 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1357 fontset = AREF (arg, 0); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1358 font_def = AREF (arg, 1); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1359 add = AREF (arg, 2); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1360 ascii = AREF (arg, 3); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1361 script_range_list = AREF (arg, 4); |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1362 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1363 if (NILP (ascii) && from < 0x80) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1364 { |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1365 if (to < 0x80) |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1366 return; |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1367 from = 0x80; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1368 range = Fcons (make_number (0x80), XCDR (range)); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
1369 } |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1370 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1371 #define SCRIPT_FROM XINT (XCAR (XCAR (script_range_list))) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1372 #define SCRIPT_TO XINT (XCDR (XCAR (script_range_list))) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1373 #define POP_SCRIPT_RANGE() script_range_list = XCDR (script_range_list) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1374 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1375 for (; CONSP (script_range_list) && SCRIPT_TO < from; POP_SCRIPT_RANGE ()) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1376 FONTSET_ADD (fontset, XCAR (script_range_list), font_def, add); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1377 if (CONSP (script_range_list)) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1378 { |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1379 if (SCRIPT_FROM < from) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1380 range = Fcons (make_number (SCRIPT_FROM), XCDR (range)); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1381 while (CONSP (script_range_list) && SCRIPT_TO <= to) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1382 POP_SCRIPT_RANGE (); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1383 if (CONSP (script_range_list) && SCRIPT_FROM <= to) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1384 XSETCAR (XCAR (script_range_list), make_number (to + 1)); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1385 } |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1386 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1387 FONTSET_ADD (fontset, range, font_def, add); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1388 ASET (arg, 4, script_range_list); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
1389 } |
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
1390 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
106815
diff
changeset
|
1391 static void update_auto_fontset_alist (Lisp_Object, Lisp_Object); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1392 |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1393 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1394 DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 5, 0, |
89483 | 1395 doc: /* |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1396 Modify fontset NAME to use FONT-SPEC for TARGET characters. |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1397 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1398 NAME is a fontset name string, nil for the fontset of FRAME, or t for |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1399 the default fontset. |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1400 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1401 TARGET may be a cons; (FROM . TO), where FROM and TO are characters. |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1402 In that case, use FONT-SPEC for all characters in the range FROM and |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1403 TO (inclusive). |
88405 | 1404 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1405 TARGET may be a script name symbol. In that case, use FONT-SPEC for |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1406 all characters that belong to the script. |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1407 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1408 TARGET may be a charset. In that case, use FONT-SPEC for all |
89669
6871c119b186
(Fset_fontset_font): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
89614
diff
changeset
|
1409 characters in the charset. |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1410 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1411 TARGET may be nil. In that case, use FONT-SPEC for any characters for |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1412 that no FONT-SPEC is specified. |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1413 |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
1414 FONT-SPEC may one of these: |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1415 * A font-spec object made by the function `font-spec' (which see). |
89337
6026c8e5664f
(Fset_fontset_font): Fix indentation of docstring.
Kenichi Handa <handa@m17n.org>
parents:
89069
diff
changeset
|
1416 * A cons (FAMILY . REGISTRY), where FAMILY is a font family name and |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1417 REGISTRY is a font registry name. FAMILY may contain foundry |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1418 name, and REGISTRY may contain encoding name. |
88931
74d18470865c
(fontset_add): Declare args. Call make_number
Dave Love <fx@gnu.org>
parents:
88903
diff
changeset
|
1419 * A font name string. |
91364
1e43b74bf9e5
(reorder_font_vector): Exclude nil elements from the
Kenichi Handa <handa@m17n.org>
parents:
91352
diff
changeset
|
1420 * nil, which explicitly specifies that there's no font for TARGET. |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1421 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1422 Optional 4th argument FRAME is a frame or nil for the selected frame |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1423 that is concerned in the case that NAME is nil. |
88405 | 1424 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1425 Optional 5th argument ADD, if non-nil, specifies how to add FONT-SPEC |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1426 to the font specifications for TARGET previously set. If it is |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1427 `prepend', FONT-SPEC is prepended. If it is `append', FONT-SPEC is |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1428 appended. By default, FONT-SPEC overrides the previous settings. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1429 (Lisp_Object name, Lisp_Object target, Lisp_Object font_spec, Lisp_Object frame, Lisp_Object add) |
17052 | 1430 { |
88405 | 1431 Lisp_Object fontset; |
90056
b0c203a8776d
(Fset_fontset_font): Call find_font_encoding with
Kenichi Handa <handa@m17n.org>
parents:
90044
diff
changeset
|
1432 Lisp_Object font_def, registry, family; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1433 Lisp_Object range_list; |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1434 struct charset *charset = NULL; |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1435 Lisp_Object fontname; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1436 int ascii_changed = 0; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1437 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1438 fontset = check_fontset_name (name, &frame); |
17052 | 1439 |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1440 fontname = Qnil; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1441 if (CONSP (font_spec)) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1442 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1443 Lisp_Object spec = Ffont_spec (0, NULL); |
91169
8eb408860621
Include "font.h" unconditionally.
Kenichi Handa <handa@m17n.org>
parents:
91136
diff
changeset
|
1444 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1445 font_parse_family_registry (XCAR (font_spec), XCDR (font_spec), spec); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1446 font_spec = spec; |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1447 fontname = Ffont_xlfd_name (font_spec, Qnil); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1448 } |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1449 else if (STRINGP (font_spec)) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1450 { |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
1451 Lisp_Object args[2]; |
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
1452 |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1453 fontname = font_spec; |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
1454 args[0] = QCname; |
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
1455 args[1] = font_spec; |
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
1456 font_spec = Ffont_spec (2, args); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1457 } |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1458 else if (FONT_SPEC_P (font_spec)) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1459 fontname = Ffont_xlfd_name (font_spec, Qnil); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1460 else if (! NILP (font_spec)) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1461 Fsignal (Qfont, list2 (build_string ("Invalid font-spec"), font_spec)); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1462 |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1463 if (! NILP (font_spec)) |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1464 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1465 Lisp_Object encoding, repertory; |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1466 |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1467 family = AREF (font_spec, FONT_FAMILY_INDEX); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1468 if (! NILP (family) ) |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1469 family = SYMBOL_NAME (family); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1470 registry = AREF (font_spec, FONT_REGISTRY_INDEX); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1471 if (! NILP (registry)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1472 registry = Fdowncase (SYMBOL_NAME (registry)); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1473 encoding = find_font_encoding (concat3 (family, build_string ("-"), |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1474 registry)); |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1475 if (NILP (encoding)) |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1476 encoding = Qascii; |
91231
29d8135e8f58
(fontset_add): New args charset_id and famliy. Caller
Kenichi Handa <handa@m17n.org>
parents:
91224
diff
changeset
|
1477 |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1478 if (SYMBOLP (encoding)) |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1479 { |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1480 CHECK_CHARSET (encoding); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1481 encoding = repertory = CHARSET_SYMBOL_ID (encoding); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1482 } |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1483 else |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1484 { |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1485 repertory = XCDR (encoding); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1486 encoding = XCAR (encoding); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1487 CHECK_CHARSET (encoding); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1488 encoding = CHARSET_SYMBOL_ID (encoding); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1489 if (! NILP (repertory) && SYMBOLP (repertory)) |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1490 { |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1491 CHECK_CHARSET (repertory); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1492 repertory = CHARSET_SYMBOL_ID (repertory); |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1493 } |
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1494 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1495 FONT_DEF_NEW (font_def, font_spec, encoding, repertory); |
89826
b17725d55ba2
(Fset_fontset_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89811
diff
changeset
|
1496 } |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1497 else |
91352
b6befec471b8
(reorder_font_vector): Fix typo.
Kenichi Handa <handa@m17n.org>
parents:
91336
diff
changeset
|
1498 font_def = Qnil; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1499 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1500 if (CHARACTERP (target)) |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1501 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1502 if (XFASTINT (target) < 0x80) |
105520
cc5bde43f76d
* fontset.c (Fset_fontset_font): Fix typos in error messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
104321
diff
changeset
|
1503 error ("Can't set a font for partial ASCII range"); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1504 range_list = Fcons (Fcons (target, target), Qnil); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1505 } |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1506 else if (CONSP (target)) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1507 { |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1508 Lisp_Object from, to; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1509 |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1510 from = Fcar (target); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1511 to = Fcdr (target); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1512 CHECK_CHARACTER (from); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1513 CHECK_CHARACTER (to); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1514 if (XFASTINT (from) < 0x80) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1515 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1516 if (XFASTINT (from) != 0 || XFASTINT (to) < 0x7F) |
105520
cc5bde43f76d
* fontset.c (Fset_fontset_font): Fix typos in error messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
104321
diff
changeset
|
1517 error ("Can't set a font for partial ASCII range"); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1518 ascii_changed = 1; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1519 } |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1520 range_list = Fcons (target, Qnil); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1521 } |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1522 else if (SYMBOLP (target) && !NILP (target)) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1523 { |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1524 Lisp_Object script_list; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1525 Lisp_Object val; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1526 |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1527 range_list = Qnil; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1528 script_list = XCHAR_TABLE (Vchar_script_table)->extras[0]; |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1529 if (! NILP (Fmemq (target, script_list))) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1530 { |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1531 if (EQ (target, Qlatin)) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1532 ascii_changed = 1; |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1533 val = Fcons (target, Qnil); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1534 map_char_table (accumulate_script_ranges, Qnil, Vchar_script_table, |
89483 | 1535 val); |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1536 range_list = Fnreverse (XCDR (val)); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1537 } |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1538 if (CHARSETP (target)) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1539 { |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1540 CHECK_CHARSET_GET_CHARSET (target, charset); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1541 if (charset->ascii_compatible_p) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1542 ascii_changed = 1; |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1543 } |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1544 else if (NILP (range_list)) |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1545 error ("Invalid script or charset name: %s", |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1546 SDATA (SYMBOL_NAME (target))); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1547 } |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1548 else if (NILP (target)) |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1549 range_list = Fcons (Qnil, Qnil); |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1550 else |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
1551 error ("Invalid target for setting a font"); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1552 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1553 if (ascii_changed) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1554 { |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1555 Lisp_Object val; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1556 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1557 if (NILP (font_spec)) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1558 error ("Can't set ASCII font to nil"); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1559 val = CHAR_TABLE_REF (fontset, 0); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1560 if (! NILP (val) && EQ (add, Qappend)) |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1561 /* We are going to change just an additional font for ASCII. */ |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1562 ascii_changed = 0; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1563 } |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1564 |
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1565 if (charset) |
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1566 { |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1567 Lisp_Object arg; |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1568 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1569 arg = Fmake_vector (make_number (5), Qnil); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1570 ASET (arg, 0, fontset); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1571 ASET (arg, 1, font_def); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1572 ASET (arg, 2, add); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1573 ASET (arg, 3, ascii_changed ? Qt : Qnil); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1574 ASET (arg, 4, range_list); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1575 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1576 map_charset_chars (set_fontset_font, Qnil, arg, charset, |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1577 CHARSET_MIN_CODE (charset), |
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1578 CHARSET_MAX_CODE (charset)); |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1579 range_list = AREF (arg, 4); |
89901
d1a1970e3dd1
(find_font_encoding): Return `ascii' for unknown
Kenichi Handa <handa@m17n.org>
parents:
89898
diff
changeset
|
1580 } |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1581 for (; CONSP (range_list); range_list = XCDR (range_list)) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1582 FONTSET_ADD (fontset, XCAR (range_list), font_def, add); |
17052 | 1583 |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1584 if (ascii_changed) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1585 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1586 Lisp_Object tail, frame, alist; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1587 int fontset_id = XINT (FONTSET_ID (fontset)); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1588 |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1589 FONTSET_ASCII (fontset) = fontname; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1590 name = FONTSET_NAME (fontset); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1591 FOR_EACH_FRAME (tail, frame) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1592 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1593 FRAME_PTR f = XFRAME (frame); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1594 Lisp_Object font_object; |
102654
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1595 struct face *face; |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1596 |
102654
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1597 if (FRAME_INITIAL_P (f) || FRAME_TERMCAP_P (f)) |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1598 continue; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1599 if (fontset_id != FRAME_FONTSET (f)) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1600 continue; |
102654
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1601 face = FACE_FROM_ID (f, DEFAULT_FACE_ID); |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1602 if (face) |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1603 font_object = font_load_for_lface (f, face->lface, font_spec); |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1604 else |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1605 font_object = font_open_by_spec (f, font_spec); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1606 if (! NILP (font_object)) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1607 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1608 update_auto_fontset_alist (font_object, fontset); |
102654
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1609 alist = Fcons (Fcons (Qfont, Fcons (name, font_object)), Qnil); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1610 Fmodify_frame_parameters (frame, alist); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1611 } |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1612 } |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1613 } |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1614 |
102654
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1615 /* Free all realized fontsets whose base is FONTSET. This way, the |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1616 specified character(s) are surely redisplayed by a correct |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1617 font. */ |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1618 free_realized_fontsets (fontset); |
8cacd0d8fb30
(Fset_fontset_font): When a spec of ASCII font is
Kenichi Handa <handa@m17n.org>
parents:
102528
diff
changeset
|
1619 |
17052 | 1620 return Qnil; |
1621 } | |
1622 | |
88405 | 1623 |
1624 DEFUN ("new-fontset", Fnew_fontset, Snew_fontset, 2, 2, 0, | |
1625 doc: /* Create a new fontset NAME from font information in FONTLIST. | |
1626 | |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1627 FONTLIST is an alist of scripts vs the corresponding font specification list. |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1628 Each element of FONTLIST has the form (SCRIPT FONT-SPEC ...), where a |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1629 character of SCRIPT is displayed by a font that matches one of |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1630 FONT-SPEC. |
88405 | 1631 |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1632 SCRIPT is a symbol that appears in the first extra slot of the |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1633 char-table `char-script-table'. |
88405 | 1634 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1635 FONT-SPEC is a vector, a cons, or a string. See the documentation of |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1636 `set-fontset-font' for the meaning. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1637 (Lisp_Object name, Lisp_Object fontlist) |
88405 | 1638 { |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1639 Lisp_Object fontset; |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1640 int id; |
88405 | 1641 |
1642 CHECK_STRING (name); | |
1643 CHECK_LIST (fontlist); | |
1644 | |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1645 name = Fdowncase (name); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1646 id = fs_query_fontset (name, 0); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1647 if (id < 0) |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1648 { |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1649 Lisp_Object font_spec = Ffont_spec (0, NULL); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1650 Lisp_Object short_name; |
94981
e01e37b8203e
(Fnew_fontset): Call font_unparse_xlfd with 256-byte
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
1651 char xlfd[256]; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1652 int len; |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1653 |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1654 if (font_parse_xlfd (SSDATA (name), font_spec) < 0) |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1655 error ("Fontset name must be in XLFD format"); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1656 short_name = AREF (font_spec, FONT_REGISTRY_INDEX); |
112434
9de5a68b57e1
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents:
112364
diff
changeset
|
1657 if (strncmp (SSDATA (SYMBOL_NAME (short_name)), "fontset-", 8) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1658 || SBYTES (SYMBOL_NAME (short_name)) < 9) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1659 error ("Registry field of fontset name must be \"fontset-*\""); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1660 Vfontset_alias_alist = Fcons (Fcons (name, SYMBOL_NAME (short_name)), |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1661 Vfontset_alias_alist); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1662 ASET (font_spec, FONT_REGISTRY_INDEX, Qiso8859_1); |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1663 fontset = make_fontset (Qnil, name, Qnil); |
94981
e01e37b8203e
(Fnew_fontset): Call font_unparse_xlfd with 256-byte
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
1664 len = font_unparse_xlfd (font_spec, 0, xlfd, 256); |
e01e37b8203e
(Fnew_fontset): Call font_unparse_xlfd with 256-byte
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
1665 if (len < 0) |
e01e37b8203e
(Fnew_fontset): Call font_unparse_xlfd with 256-byte
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
1666 error ("Invalid fontset name (perhaps too long): %s", SDATA (name)); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1667 FONTSET_ASCII (fontset) = make_unibyte_string (xlfd, len); |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1668 } |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1669 else |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1670 { |
101943
97c9e9322753
Remove spurious semicolons.
Juanma Barranquero <lekktu@gmail.com>
parents:
101605
diff
changeset
|
1671 fontset = FONTSET_FROM_ID (id); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1672 free_realized_fontsets (fontset); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1673 Fset_char_table_range (fontset, Qt, Qnil); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1674 } |
88405 | 1675 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1676 for (; ! NILP (fontlist); fontlist = Fcdr (fontlist)) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1677 { |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1678 Lisp_Object elt, script; |
88405 | 1679 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1680 elt = Fcar (fontlist); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1681 script = Fcar (elt); |
89607
9090f7eba02c
(Fnew_fontset): Check NAME more rigidly.
Kenichi Handa <handa@m17n.org>
parents:
89603
diff
changeset
|
1682 elt = Fcdr (elt); |
9090f7eba02c
(Fnew_fontset): Check NAME more rigidly.
Kenichi Handa <handa@m17n.org>
parents:
89603
diff
changeset
|
1683 if (CONSP (elt) && (NILP (XCDR (elt)) || CONSP (XCDR (elt)))) |
9090f7eba02c
(Fnew_fontset): Check NAME more rigidly.
Kenichi Handa <handa@m17n.org>
parents:
89603
diff
changeset
|
1684 for (; CONSP (elt); elt = XCDR (elt)) |
9090f7eba02c
(Fnew_fontset): Check NAME more rigidly.
Kenichi Handa <handa@m17n.org>
parents:
89603
diff
changeset
|
1685 Fset_fontset_font (name, script, XCAR (elt), Qnil, Qappend); |
9090f7eba02c
(Fnew_fontset): Check NAME more rigidly.
Kenichi Handa <handa@m17n.org>
parents:
89603
diff
changeset
|
1686 else |
9090f7eba02c
(Fnew_fontset): Check NAME more rigidly.
Kenichi Handa <handa@m17n.org>
parents:
89603
diff
changeset
|
1687 Fset_fontset_font (name, script, elt, Qnil, Qappend); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1688 } |
88405 | 1689 return name; |
1690 } | |
1691 | |
1692 | |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
1693 /* Alist of automatically created fontsets. Each element is a cons |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1694 (FONT-SPEC . FONTSET-ID). */ |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
1695 static Lisp_Object auto_fontset_alist; |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1696 |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1697 /* Number of automatically created fontsets. */ |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1698 static int num_auto_fontsets; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1699 |
102793
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1700 /* Retun a fontset synthesized from FONT-OBJECT. This is called from |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1701 x_new_font when FONT-OBJECT is used for the default ASCII font of a |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1702 frame, and the returned fontset is used for the default fontset of |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1703 that frame. The fontset specifies a font of the same registry as |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1704 FONT-OBJECT for all characters in the repertory of the registry |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1705 (see Vfont_encoding_alist). If the repertory is not known, the |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1706 fontset specifies the font for all Latin characters assuming that a |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1707 user intends to use FONT-OBJECT for Latin characters. */ |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1708 |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1709 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1710 fontset_from_font (Lisp_Object font_object) |
90410 | 1711 { |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1712 Lisp_Object font_name = font_get_name (font_object); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1713 Lisp_Object font_spec = Fcopy_font_spec (font_object); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1714 Lisp_Object registry = AREF (font_spec, FONT_REGISTRY_INDEX); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1715 Lisp_Object fontset_spec, alias, name, fontset; |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1716 Lisp_Object val; |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1717 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1718 val = assoc_no_quit (font_spec, auto_fontset_alist); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1719 if (CONSP (val)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1720 return XINT (FONTSET_ID (XCDR (val))); |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1721 if (num_auto_fontsets++ == 0) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1722 alias = intern ("fontset-startup"); |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1723 else |
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1724 { |
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1725 char temp[32]; |
90410 | 1726 |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1727 sprintf (temp, "fontset-auto%d", num_auto_fontsets - 1); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1728 alias = intern (temp); |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1729 } |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1730 fontset_spec = Fcopy_font_spec (font_spec); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1731 ASET (fontset_spec, FONT_REGISTRY_INDEX, alias); |
95179
5c007b5b6cd8
(fontset_from_font, Ffontset_info): Add the 2nd arg in
Kenichi Handa <handa@m17n.org>
parents:
95143
diff
changeset
|
1732 name = Ffont_xlfd_name (fontset_spec, Qnil); |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1733 if (NILP (name)) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1734 abort (); |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1735 fontset = make_fontset (Qnil, name, Qnil); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1736 Vfontset_alias_alist = Fcons (Fcons (name, SYMBOL_NAME (alias)), |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1737 Vfontset_alias_alist); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1738 alias = Fdowncase (AREF (font_object, FONT_NAME_INDEX)); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1739 Vfontset_alias_alist = Fcons (Fcons (name, alias), Vfontset_alias_alist); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1740 auto_fontset_alist = Fcons (Fcons (font_spec, fontset), auto_fontset_alist); |
102793
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1741 font_spec = Ffont_spec (0, NULL); |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1742 ASET (font_spec, FONT_REGISTRY_INDEX, registry); |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1743 { |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1744 Lisp_Object target = find_font_encoding (SYMBOL_NAME (registry)); |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1745 |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1746 if (CONSP (target)) |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1747 target = XCDR (target); |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1748 if (! CHARSETP (target)) |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1749 target = Qlatin; |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1750 Fset_fontset_font (name, target, font_spec, Qnil, Qnil); |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1751 Fset_fontset_font (name, Qnil, font_spec, Qnil, Qnil); |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1752 } |
0e6449977a63
(fontset_from_font): Specify only registry in a font-spec for all
Kenichi Handa <handa@m17n.org>
parents:
102654
diff
changeset
|
1753 |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1754 FONTSET_ASCII (fontset) = font_name; |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96655
diff
changeset
|
1755 |
90466
4c9461c6aef4
(new_fontset_from_font) [USE_FONT_BACKEND]: Argument F
Kenichi Handa <handa@m17n.org>
parents:
90449
diff
changeset
|
1756 return XINT (FONTSET_ID (fontset)); |
90410 | 1757 } |
1758 | |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1759 |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1760 /* Update auto_fontset_alist for FONTSET. When an ASCII font of |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1761 FONTSET is changed, we delete an entry of FONTSET if any from |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1762 auto_fontset_alist so that FONTSET is not re-used by |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1763 fontset_from_font. */ |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1764 |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1765 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1766 update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) |
102480
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1767 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1768 Lisp_Object prev, tail; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1769 |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1770 for (prev = Qnil, tail = auto_fontset_alist; CONSP (tail); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1771 prev = tail, tail = XCDR (tail)) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1772 if (EQ (fontset, XCDR (XCAR (tail)))) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1773 { |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1774 if (NILP (prev)) |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1775 auto_fontset_alist = XCDR (tail); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1776 else |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1777 XSETCDR (prev, XCDR (tail)); |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1778 break; |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1779 } |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1780 } |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1781 |
c50bd87f030b
(Fset_fontset_font): When a font for ASCII is changed,
Kenichi Handa <handa@m17n.org>
parents:
102417
diff
changeset
|
1782 |
96414
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1783 /* Return a cons (FONT-OBJECT . GLYPH-CODE). |
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1784 FONT-OBJECT is the font for the character at POSITION in the current |
28963 | 1785 buffer. This is computed from all the text properties and overlays |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1786 that apply to POSITION. POSTION may be nil, in which case, |
96414
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1787 FONT-SPEC is the font for displaying the character CH with the |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1788 default face. |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1789 |
52654
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1790 GLYPH-CODE is the glyph code in the font to use for the character. |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1791 |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1792 If the 2nd optional arg CH is non-nil, it is a character to check |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1793 the font instead of the character at POSITION. |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1794 |
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1795 It returns nil in the following cases: |
28963 | 1796 |
1797 (1) The window system doesn't have a font for the character (thus | |
1798 it is displayed by an empty box). | |
1799 | |
1800 (2) The character code is invalid. | |
1801 | |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1802 (3) If POSITION is not nil, and the current buffer is not displayed |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1803 in any window. |
28963 | 1804 |
1805 In addition, the returned font name may not take into account of | |
1806 such redisplay engine hooks as what used in jit-lock-mode if | |
1807 POSITION is currently not visible. */ | |
1808 | |
1809 | |
52654
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1810 DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
1811 doc: /* For internal use only. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1812 (Lisp_Object position, Lisp_Object ch) |
28963 | 1813 { |
92237
ce06567a933d
* dispextern.h (face_at_buffer_position, face_for_overlay_string)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91908
diff
changeset
|
1814 EMACS_INT pos, pos_byte, dummy; |
28963 | 1815 int face_id; |
1816 int c; | |
1817 struct frame *f; | |
1818 struct face *face; | |
90725
6d8c81691fc8
(Finternal_char_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
90716
diff
changeset
|
1819 int cs_id; |
28963 | 1820 |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1821 if (NILP (position)) |
52654
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1822 { |
89904 | 1823 CHECK_CHARACTER (ch); |
52654
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1824 c = XINT (ch); |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1825 f = XFRAME (selected_frame); |
95457
415f68458e61
Implement face-remapping-alist feature
Miles Bader <miles@gnu.org>
parents:
95404
diff
changeset
|
1826 face_id = lookup_basic_face (f, DEFAULT_FACE_ID); |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1827 pos = -1; |
90725
6d8c81691fc8
(Finternal_char_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
90716
diff
changeset
|
1828 cs_id = -1; |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1829 } |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1830 else |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1831 { |
90716
f5dc0b9a442c
(Finternal_char_font): Fix for the case of POSITION
Kenichi Handa <handa@m17n.org>
parents:
90642
diff
changeset
|
1832 Lisp_Object window, charset; |
55094
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1833 struct window *w; |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1834 |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1835 CHECK_NUMBER_COERCE_MARKER (position); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1836 pos = XINT (position); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1837 if (pos < BEGV || pos >= ZV) |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1838 args_out_of_range_3 (position, make_number (BEGV), make_number (ZV)); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1839 pos_byte = CHAR_TO_BYTE (pos); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1840 if (NILP (ch)) |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1841 c = FETCH_CHAR (pos_byte); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1842 else |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1843 { |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1844 CHECK_NATNUM (ch); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1845 c = XINT (ch); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1846 } |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1847 window = Fget_buffer_window (Fcurrent_buffer (), Qnil); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1848 if (NILP (window)) |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1849 return Qnil; |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1850 w = XWINDOW (window); |
450b41d3c078
(Finternal_char_font): If POSITION is nil, return
Kenichi Handa <handa@m17n.org>
parents:
54995
diff
changeset
|
1851 f = XFRAME (w->frame); |
103114
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103112
diff
changeset
|
1852 face_id = face_at_buffer_position (w, pos, -1, -1, &dummy, |
fa8e2c663118
* xfaces.c (face_at_buffer_position): New arg base_face_id.
Chong Yidong <cyd@stupidchicken.com>
parents:
103112
diff
changeset
|
1853 pos + 100, 0, -1); |
90716
f5dc0b9a442c
(Finternal_char_font): Fix for the case of POSITION
Kenichi Handa <handa@m17n.org>
parents:
90642
diff
changeset
|
1854 charset = Fget_char_property (position, Qcharset, Qnil); |
f5dc0b9a442c
(Finternal_char_font): Fix for the case of POSITION
Kenichi Handa <handa@m17n.org>
parents:
90642
diff
changeset
|
1855 if (CHARSETP (charset)) |
90725
6d8c81691fc8
(Finternal_char_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
90716
diff
changeset
|
1856 cs_id = XINT (CHARSET_SYMBOL_ID (charset)); |
90716
f5dc0b9a442c
(Finternal_char_font): Fix for the case of POSITION
Kenichi Handa <handa@m17n.org>
parents:
90642
diff
changeset
|
1857 else |
90725
6d8c81691fc8
(Finternal_char_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
90716
diff
changeset
|
1858 cs_id = -1; |
52654
2e5944e29aa0
(Finternal_char_font): Change return value to
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1859 } |
28963 | 1860 if (! CHAR_VALID_P (c, 0)) |
1861 return Qnil; | |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
1862 face_id = FACE_FOR_CHAR (f, FACE_FROM_ID (f, face_id), c, pos, Qnil); |
28963 | 1863 face = FACE_FROM_ID (f, face_id); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1864 if (face->font) |
28963 | 1865 { |
96414
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1866 unsigned code = face->font->driver->encode_char (face->font, c); |
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1867 Lisp_Object font_object; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1868 /* Assignment to EMACS_INT stops GCC whining about limited range |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1869 of data type. */ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1870 EMACS_INT cod = code; |
49874
3bdee1887901
(check_fontset_name): If NAME is nil, return the
Kenichi Handa <handa@m17n.org>
parents:
49286
diff
changeset
|
1871 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1872 if (code == FONT_INVALID_CODE) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1873 return Qnil; |
96414
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1874 XSETFONT (font_object, face->font); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1875 if (cod <= MOST_POSITIVE_FIXNUM) |
96414
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1876 return Fcons (font_object, make_number (code)); |
37737408d4f2
(Finternal_char_font): Return font-object instead of font-name.
Kenichi Handa <handa@m17n.org>
parents:
96087
diff
changeset
|
1877 return Fcons (font_object, Fcons (make_number (code >> 16), |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1878 make_number (code & 0xFFFF))); |
28963 | 1879 } |
89904 | 1880 return Qnil; |
28963 | 1881 } |
1882 | |
1883 | |
17052 | 1884 DEFUN ("fontset-info", Ffontset_info, Sfontset_info, 1, 2, 0, |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1885 doc: /* Return information about a fontset FONTSET on frame FRAME. |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1886 |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1887 FONTSET is a fontset name string, nil for the fontset of FRAME, or t |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1888 for the default fontset. FRAME nil means the selected frame. |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1889 |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
1890 The value is a char-table whose elements have this form: |
28963 | 1891 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1892 ((FONT OPENED-FONT ...) ...) |
28963 | 1893 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1894 FONT is a name of font specified for a range of characters. |
28963 | 1895 |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1896 OPENED-FONT is a name of a font actually opened. |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1897 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1898 The char-table has one extra slot. If FONTSET is not the default |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1899 fontset, the value the extra slot is a char-table containing the |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1900 information about the derived fonts from the default fontset. The |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1901 format is the same as above. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1902 (Lisp_Object fontset, Lisp_Object frame) |
17052 | 1903 { |
1904 FRAME_PTR f; | |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1905 Lisp_Object *realized[2], fontsets[2], tables[2]; |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1906 Lisp_Object val, elt; |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1907 int c, i, j, k; |
41987
34952771ae85
Fix typos, remove unnecessary space.
Pavel Janík <Pavel@Janik.cz>
parents:
41052
diff
changeset
|
1908 |
17052 | 1909 (*check_window_system_func) (); |
1910 | |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1911 fontset = check_fontset_name (fontset, &frame); |
25668
99290b59352d
(Ffont_info): Change for Lisp_Object selected_frame.
Gerd Moellmann <gerd@gnu.org>
parents:
24611
diff
changeset
|
1912 f = XFRAME (frame); |
17052 | 1913 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1914 /* Recode fontsets realized on FRAME from the base fontset FONTSET |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1915 in the table `realized'. */ |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1916 realized[0] = (Lisp_Object *) alloca (sizeof (Lisp_Object) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1917 * ASIZE (Vfontset_table)); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1918 for (i = j = 0; i < ASIZE (Vfontset_table); i++) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1919 { |
28963 | 1920 elt = FONTSET_FROM_ID (i); |
1921 if (!NILP (elt) | |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1922 && EQ (FONTSET_BASE (elt), fontset) |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1923 && EQ (FONTSET_FRAME (elt), frame)) |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1924 realized[0][j++] = elt; |
49874
3bdee1887901
(check_fontset_name): If NAME is nil, return the
Kenichi Handa <handa@m17n.org>
parents:
49286
diff
changeset
|
1925 } |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1926 realized[0][j] = Qnil; |
49874
3bdee1887901
(check_fontset_name): If NAME is nil, return the
Kenichi Handa <handa@m17n.org>
parents:
49286
diff
changeset
|
1927 |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1928 realized[1] = (Lisp_Object *) alloca (sizeof (Lisp_Object) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1929 * ASIZE (Vfontset_table)); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1930 for (i = j = 0; ! NILP (realized[0][i]); i++) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1931 { |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1932 elt = FONTSET_DEFAULT (realized[0][i]); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1933 if (! NILP (elt)) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1934 realized[1][j++] = elt; |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1935 } |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1936 realized[1][j] = Qnil; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1937 |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1938 tables[0] = Fmake_char_table (Qfontset_info, Qnil); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1939 fontsets[0] = fontset; |
102528
89dd546c60a7
(Ffontset_info): YAILOM (Yet another int/Lisp_Object mixup).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102527
diff
changeset
|
1940 if (!EQ (fontset, Vdefault_fontset)) |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1941 { |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1942 tables[1] = Fmake_char_table (Qnil, Qnil); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1943 XCHAR_TABLE (tables[0])->extras[0] = tables[1]; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1944 fontsets[1] = Vdefault_fontset; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1945 } |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1946 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1947 /* Accumulate information of the fontset in TABLE. The format of |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1948 each element is ((FONT-SPEC OPENED-FONT ...) ...). */ |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1949 for (k = 0; k <= 1; k++) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1950 { |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1951 for (c = 0; c <= MAX_CHAR; ) |
28963 | 1952 { |
99980
0a43374c0145
(fontset_add): Adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
98582
diff
changeset
|
1953 int from = c, to = MAX_5_BYTE_CHAR; |
17052 | 1954 |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1955 if (c <= MAX_5_BYTE_CHAR) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1956 { |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1957 val = char_table_ref_and_range (fontsets[k], c, &from, &to); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1958 } |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1959 else |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1960 { |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1961 val = FONTSET_FALLBACK (fontsets[k]); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1962 to = MAX_CHAR; |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1963 } |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1964 if (VECTORP (val)) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
1965 { |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1966 Lisp_Object alist; |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1967 |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1968 /* At first, set ALIST to ((FONT-SPEC) ...). */ |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1969 for (alist = Qnil, i = 0; i < ASIZE (val); i++) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1970 if (! NILP (AREF (val, i))) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1971 alist = Fcons (Fcons (FONT_DEF_SPEC (AREF (val, i)), Qnil), |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1972 alist); |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1973 alist = Fnreverse (alist); |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
1974 |
95656
32785fc68f99
(Ffontset_info): Fix typo.
Andreas Schwab <schwab@suse.de>
parents:
95570
diff
changeset
|
1975 /* Then store opened font names to cdr of each elements. */ |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1976 for (i = 0; ! NILP (realized[k][i]); i++) |
28963 | 1977 { |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1978 if (c <= MAX_5_BYTE_CHAR) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1979 val = FONTSET_REF (realized[k][i], c); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1980 else |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
1981 val = FONTSET_FALLBACK (realized[k][i]); |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1982 if (! CONSP (val) || ! VECTORP (XCDR (val))) |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1983 continue; |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1984 /* VAL: (int . [[FACE-ID FONT-DEF FONT-OBJECT int] ... ]) */ |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1985 val = XCDR (val); |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
1986 for (j = 0; j < ASIZE (val); j++) |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1987 { |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1988 elt = AREF (val, j); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1989 if (FONT_OBJECT_P (RFONT_DEF_OBJECT (elt))) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1990 { |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1991 Lisp_Object font_object = RFONT_DEF_OBJECT (elt); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1992 Lisp_Object slot, name; |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
1993 |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1994 slot = Fassq (RFONT_DEF_SPEC (elt), alist); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1995 name = AREF (font_object, FONT_NAME_INDEX); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1996 if (NILP (Fmember (name, XCDR (slot)))) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1997 nconc2 (slot, Fcons (name, Qnil)); |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
1998 } |
91513
53399782ad84
(Ffontset_info): Handle the case of inhibitting the
Kenichi Handa <handa@m17n.org>
parents:
91364
diff
changeset
|
1999 } |
28963 | 2000 } |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
2001 |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
2002 /* Store ALIST in TBL for characters C..TO. */ |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
2003 if (c <= MAX_5_BYTE_CHAR) |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
2004 char_table_set_range (tables[k], c, to, alist); |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
2005 else |
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
2006 XCHAR_TABLE (tables[k])->defalt = alist; |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
2007 |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
2008 /* At last, change each elements to font names. */ |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
2009 for (; CONSP (alist); alist = XCDR (alist)) |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
2010 { |
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
2011 elt = XCAR (alist); |
95179
5c007b5b6cd8
(fontset_from_font, Ffontset_info): Add the 2nd arg in
Kenichi Handa <handa@m17n.org>
parents:
95143
diff
changeset
|
2012 XSETCAR (elt, Ffont_xlfd_name (XCAR (elt), Qnil)); |
94928
a9ee82808208
Throughout the file, delete all USE_FONT_BACKEND
Kenichi Handa <handa@m17n.org>
parents:
92705
diff
changeset
|
2013 } |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2014 } |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
2015 c = to + 1; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2016 } |
102527
e16d4567a1bc
(Ffontset_info): YAILOM (Yet another int/Lisp_Object mixup).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102524
diff
changeset
|
2017 if (EQ (fontset, Vdefault_fontset)) |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
2018 break; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2019 } |
30124
26076259e03f
(Ffontset_info): Make the return value more compatible
Kenichi Handa <handa@m17n.org>
parents:
29767
diff
changeset
|
2020 |
89811
d13626b05df3
(fontset_face): Handle fallback fonts correctly.
Kenichi Handa <handa@m17n.org>
parents:
89805
diff
changeset
|
2021 return tables[0]; |
17052 | 2022 } |
2023 | |
2024 | |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2025 DEFUN ("fontset-font", Ffontset_font, Sfontset_font, 2, 3, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2026 doc: /* Return a font name pattern for character CH in fontset NAME. |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2027 If NAME is t, find a pattern in the default fontset. |
104319
61b86c490f92
*** empty log message ***
Kenichi Handa <handa@m17n.org>
parents:
103788
diff
changeset
|
2028 If NAME is nil, find a pattern in the fontset of the selected frame. |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2029 |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2030 The value has the form (FAMILY . REGISTRY), where FAMILY is a font |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2031 family name and REGISTRY is a font registry name. This is actually |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2032 the first font name pattern for CH in the fontset or in the default |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2033 fontset. |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2034 |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2035 If the 2nd optional arg ALL is non-nil, return a list of all font name |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2036 patterns. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2037 (Lisp_Object name, Lisp_Object ch, Lisp_Object all) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2038 { |
34975
0d69e2d2724e
(fontset_ref): Remove unused variable `i'.
Eli Zaretskii <eliz@gnu.org>
parents:
32978
diff
changeset
|
2039 int c; |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2040 Lisp_Object fontset, elt, list, repertory, val; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2041 int i, j; |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
2042 Lisp_Object frame; |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2043 |
102521
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
2044 frame = Qnil; |
855091f2ad89
(Ffontset_info, check_fontset_name): New arg frame.
Kenichi Handa <handa@m17n.org>
parents:
102480
diff
changeset
|
2045 fontset = check_fontset_name (name, &frame); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2046 |
88405 | 2047 CHECK_CHARACTER (ch); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2048 c = XINT (ch); |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2049 list = Qnil; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2050 while (1) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2051 { |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2052 for (i = 0, elt = FONTSET_REF (fontset, c); i < 2; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2053 i++, elt = FONTSET_FALLBACK (fontset)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2054 if (VECTORP (elt)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2055 for (j = 0; j < ASIZE (elt); j++) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2056 { |
101553
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2057 Lisp_Object family, registry; |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2058 |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2059 val = AREF (elt, j); |
104319
61b86c490f92
*** empty log message ***
Kenichi Handa <handa@m17n.org>
parents:
103788
diff
changeset
|
2060 if (NILP (val)) |
104321
8f1c018c050c
(Ffontset_font): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
104319
diff
changeset
|
2061 return Qnil; |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2062 repertory = AREF (val, 1); |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2063 if (INTEGERP (repertory)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2064 { |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2065 struct charset *charset = CHARSET_FROM_ID (XINT (repertory)); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2066 |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2067 if (! CHAR_CHARSET_P (c, charset)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2068 continue; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2069 } |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2070 else if (CHAR_TABLE_P (repertory)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2071 { |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2072 if (NILP (CHAR_TABLE_REF (repertory, c))) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2073 continue; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2074 } |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2075 val = AREF (val, 0); |
101553
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2076 /* VAL is a FONT-SPEC */ |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2077 family = AREF (val, FONT_FAMILY_INDEX); |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2078 if (! NILP (family)) |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2079 family = SYMBOL_NAME (family); |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2080 registry = AREF (val, FONT_REGISTRY_INDEX); |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2081 if (! NILP (registry)) |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2082 registry = SYMBOL_NAME (registry); |
a44c0bbce387
(font_for_char): Use assq_no_quit, not assoc_no_quit.
Kenichi Handa <handa@m17n.org>
parents:
101522
diff
changeset
|
2083 val = Fcons (family, registry); |
89940
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2084 if (NILP (all)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2085 return val; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2086 list = Fcons (val, list); |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2087 } |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2088 if (EQ (fontset, Vdefault_fontset)) |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2089 break; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2090 fontset = Vdefault_fontset; |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2091 } |
713a4f4140ca
(Fset_fontset_font): Docstring fixed.
Kenichi Handa <handa@m17n.org>
parents:
89904
diff
changeset
|
2092 return (Fnreverse (list)); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2093 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2094 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2095 DEFUN ("fontset-list", Ffontset_list, Sfontset_list, 0, 0, 0, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2096 doc: /* Return a list of all defined fontset names. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2097 (void) |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2098 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2099 Lisp_Object fontset, list; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2100 int i; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2101 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2102 list = Qnil; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2103 for (i = 0; i < ASIZE (Vfontset_table); i++) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2104 { |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2105 fontset = FONTSET_FROM_ID (i); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2106 if (!NILP (fontset) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2107 && BASE_FONTSET_P (fontset)) |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2108 list = Fcons (FONTSET_NAME (fontset), list); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2109 } |
28963 | 2110 |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2111 return list; |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2112 } |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2113 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2114 |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2115 #ifdef FONTSET_DEBUG |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2116 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2117 Lisp_Object |
111997
a5a188ddc758
Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
109977
diff
changeset
|
2118 dump_fontset (Lisp_Object fontset) |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2119 { |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2120 Lisp_Object vec; |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2121 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2122 vec = Fmake_vector (make_number (3), Qnil); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2123 ASET (vec, 0, FONTSET_ID (fontset)); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2124 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2125 if (BASE_FONTSET_P (fontset)) |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2126 { |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2127 ASET (vec, 1, FONTSET_NAME (fontset)); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2128 } |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2129 else |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2130 { |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2131 Lisp_Object frame; |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2132 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2133 frame = FONTSET_FRAME (fontset); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2134 if (FRAMEP (frame)) |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2135 { |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2136 FRAME_PTR f = XFRAME (frame); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2137 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2138 if (FRAME_LIVE_P (f)) |
90802
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2139 ASET (vec, 1, |
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2140 Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), f->name)); |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2141 else |
90802
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2142 ASET (vec, 1, |
bfafc889caa9
(fontset_find_font): New function.
Kenichi Handa <handa@m17n.org>
parents:
90737
diff
changeset
|
2143 Fcons (FONTSET_NAME (FONTSET_BASE (fontset)), Qnil)); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2144 } |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
2145 if (!NILP (FONTSET_DEFAULT (fontset))) |
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
2146 ASET (vec, 2, FONTSET_ID (FONTSET_DEFAULT (fontset))); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2147 } |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2148 return vec; |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2149 } |
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2150 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2151 DEFUN ("fontset-list-all", Ffontset_list_all, Sfontset_list_all, 0, 0, 0, |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2152 doc: /* Return a brief summary of all fontsets for debug use. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
2153 (void) |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2154 { |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2155 Lisp_Object val; |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2156 int i; |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2157 |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2158 for (i = 0, val = Qnil; i < ASIZE (Vfontset_table); i++) |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2159 if (! NILP (AREF (Vfontset_table, i))) |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2160 val = Fcons (dump_fontset (AREF (Vfontset_table, i)), val); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2161 return (Fnreverse (val)); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2162 } |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2163 #endif /* FONTSET_DEBUG */ |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2164 |
21514 | 2165 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2166 syms_of_fontset (void) |
17052 | 2167 { |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
2168 DEFSYM (Qfontset, "fontset"); |
89805
35a0a24752d3
(FONTSET_DEFAULT): New macro.
Kenichi Handa <handa@m17n.org>
parents:
89711
diff
changeset
|
2169 Fput (Qfontset, Qchar_table_extra_slots, make_number (9)); |
89349
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
2170 DEFSYM (Qfontset_info, "fontset-info"); |
9a305cf42688
Give 8 extra slots to fontset objects.
Kenichi Handa <handa@m17n.org>
parents:
89337
diff
changeset
|
2171 Fput (Qfontset_info, Qchar_table_extra_slots, make_number (1)); |
17052 | 2172 |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
2173 DEFSYM (Qprepend, "prepend"); |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
2174 DEFSYM (Qappend, "append"); |
90642 | 2175 DEFSYM (Qlatin, "latin"); |
17052 | 2176 |
2177 Vcached_fontset_data = Qnil; | |
2178 staticpro (&Vcached_fontset_data); | |
2179 | |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2180 Vfontset_table = Fmake_vector (make_number (32), Qnil); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2181 staticpro (&Vfontset_table); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2182 |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2183 Vdefault_fontset = Fmake_char_table (Qfontset, Qnil); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2184 staticpro (&Vdefault_fontset); |
28963 | 2185 FONTSET_ID (Vdefault_fontset) = make_number (0); |
2186 FONTSET_NAME (Vdefault_fontset) | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2187 = make_pure_c_string ("-*-*-*-*-*-*-*-*-*-*-*-*-fontset-default"); |
91668
aeadaa72f7b1
(free_face_fontset): Use FONTSET_FROM_ID.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91513
diff
changeset
|
2188 ASET (Vfontset_table, 0, Vdefault_fontset); |
28963 | 2189 next_fontset_id = 1; |
17052 | 2190 |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2191 auto_fontset_alist = Qnil; |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2192 staticpro (&auto_fontset_alist); |
53353
b085f18ebcf0
(Voverriding_fontspec_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
53072
diff
changeset
|
2193 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2194 DEFVAR_LISP ("font-encoding-charset-alist", Vfont_encoding_charset_alist, |
91266
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2195 doc: /* |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2196 Alist of charsets vs the charsets to determine the preferred font encoding. |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
2197 Each element looks like (CHARSET . ENCODING-CHARSET), |
91266
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2198 where ENCODING-CHARSET is a charset registered in the variable |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2199 `font-encoding-alist' as ENCODING. |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2200 |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2201 When a text has a property `charset' and the value is CHARSET, a font |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2202 whose encoding corresponds to ENCODING-CHARSET is preferred. */); |
3cd59392b3ec
(Vfont_encoding_charset_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
91250
diff
changeset
|
2203 Vfont_encoding_charset_alist = Qnil; |
17052 | 2204 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2205 DEFVAR_LISP ("use-default-ascent", Vuse_default_ascent, |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
2206 doc: /* |
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
2207 Char table of characters whose ascent values should be ignored. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2208 If an entry for a character is non-nil, the ascent value of the glyph |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
2209 is assumed to be specified by _MULE_DEFAULT_ASCENT property of a font. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2210 |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2211 This affects how a composite character which contains |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2212 such a character is displayed on screen. */); |
19282
09a1536debb4
(Vignore_relative_composition): New variable.
Kenichi Handa <handa@m17n.org>
parents:
19172
diff
changeset
|
2213 Vuse_default_ascent = Qnil; |
09a1536debb4
(Vignore_relative_composition): New variable.
Kenichi Handa <handa@m17n.org>
parents:
19172
diff
changeset
|
2214 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2215 DEFVAR_LISP ("ignore-relative-composition", Vignore_relative_composition, |
88903
d32a3736c4fe
(Qprepend, Qappend): New variables.
Kenichi Handa <handa@m17n.org>
parents:
88857
diff
changeset
|
2216 doc: /* |
95143
3e0cd839473e
(Ffontset_info): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
95127
diff
changeset
|
2217 Char table of characters which are not composed relatively. |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2218 If an entry for a character is non-nil, a composition sequence |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2219 which contains that character is displayed so that |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2220 the glyph of that character is put without considering |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2221 an ascent and descent value of a previous character. */); |
26858
7cc081b4e084
(Vvertical_centering_font_regexp): New variable.
Kenichi Handa <handa@m17n.org>
parents:
26164
diff
changeset
|
2222 Vignore_relative_composition = Qnil; |
17112
5c48ff325655
(syms_of_fontset): Intern Qfontset. Declare new lisp
Kenichi Handa <handa@m17n.org>
parents:
17071
diff
changeset
|
2223 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2224 DEFVAR_LISP ("alternate-fontname-alist", Valternate_fontname_alist, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2225 doc: /* Alist of fontname vs list of the alternate fontnames. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2226 When a specified font name is not found, the corresponding |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2227 alternate fontnames (if any) are tried instead. */); |
19450
895dc2520755
(Valternate_fontname_alist): Name changed from
Kenichi Handa <handa@m17n.org>
parents:
19282
diff
changeset
|
2228 Valternate_fontname_alist = Qnil; |
17193
dc4562b0152a
(Valternative_fontname_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17190
diff
changeset
|
2229 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2230 DEFVAR_LISP ("fontset-alias-alist", Vfontset_alias_alist, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2231 doc: /* Alist of fontset names vs the aliases. */); |
28963 | 2232 Vfontset_alias_alist = Fcons (Fcons (FONTSET_NAME (Vdefault_fontset), |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
2233 make_pure_c_string ("fontset-default")), |
28963 | 2234 Qnil); |
17730
4bbcc6804b5d
(Vfontset_alias_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
17331
diff
changeset
|
2235 |
26858
7cc081b4e084
(Vvertical_centering_font_regexp): New variable.
Kenichi Handa <handa@m17n.org>
parents:
26164
diff
changeset
|
2236 DEFVAR_LISP ("vertical-centering-font-regexp", |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2237 Vvertical_centering_font_regexp, |
41001
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2238 doc: /* *Regexp matching font names that require vertical centering on display. |
a17c8b15ef1b
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
40771
diff
changeset
|
2239 When a character is displayed with such fonts, the character is displayed |
41987
34952771ae85
Fix typos, remove unnecessary space.
Pavel Janík <Pavel@Janik.cz>
parents:
41052
diff
changeset
|
2240 at the vertical center of lines. */); |
26858
7cc081b4e084
(Vvertical_centering_font_regexp): New variable.
Kenichi Handa <handa@m17n.org>
parents:
26164
diff
changeset
|
2241 Vvertical_centering_font_regexp = Qnil; |
7cc081b4e084
(Vvertical_centering_font_regexp): New variable.
Kenichi Handa <handa@m17n.org>
parents:
26164
diff
changeset
|
2242 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112290
diff
changeset
|
2243 DEFVAR_LISP ("otf-script-alist", Votf_script_alist, |
90509
c1ec6b950928
(Votf_script_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90475
diff
changeset
|
2244 doc: /* Alist of OpenType script tags vs the corresponding script names. */); |
c1ec6b950928
(Votf_script_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90475
diff
changeset
|
2245 Votf_script_alist = Qnil; |
c1ec6b950928
(Votf_script_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents:
90475
diff
changeset
|
2246 |
17052 | 2247 defsubr (&Squery_fontset); |
2248 defsubr (&Snew_fontset); | |
2249 defsubr (&Sset_fontset_font); | |
28963 | 2250 defsubr (&Sinternal_char_font); |
17052 | 2251 defsubr (&Sfontset_info); |
28223
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2252 defsubr (&Sfontset_font); |
b888c69e8bf0
All codes rewritten or adjusted for the change of
Kenichi Handa <handa@m17n.org>
parents:
26858
diff
changeset
|
2253 defsubr (&Sfontset_list); |
89610
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2254 #ifdef FONTSET_DEBUG |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2255 defsubr (&Sfontset_list_all); |
3aa74296be55
(fontset_face): Create a fallback fontset on demand
Kenichi Handa <handa@m17n.org>
parents:
89607
diff
changeset
|
2256 #endif |
17052 | 2257 } |