Mercurial > emacs
annotate src/category.c @ 97986:64b0e68e3313
Fix setting of composition-function-table.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 05 Sep 2008 01:00:30 +0000 |
parents | 8971ddf55736 |
children | 3092df1e1b8a |
rev | line source |
---|---|
17052 | 1 /* GNU Emacs routines to deal with category tables. |
79759 | 2 Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
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:
73927
diff
changeset
|
4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
79759 | 5 2005, 2006, 2007, 2008 |
67658 | 6 National Institute of Advanced Industrial Science and Technology (AIST) |
7 Registration Number H14PRO021 | |
89483 | 8 Copyright (C) 2003 |
88359 | 9 National Institute of Advanced Industrial Science and Technology (AIST) |
10 Registration Number H13PRO009 | |
17052 | 11 |
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:
91327
diff
changeset
|
14 GNU Emacs is free software: you can redistribute it and/or modify |
17052 | 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:
91327
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:
91327
diff
changeset
|
17 (at your option) any later version. |
17052 | 18 |
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. | |
23 | |
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:
91327
diff
changeset
|
25 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
17052 | 26 |
27 | |
28 /* Here we handle three objects: category, category set, and category | |
29 table. Read comments in the file category.h to understand them. */ | |
30 | |
31 #include <config.h> | |
32 #include <ctype.h> | |
33 #include "lisp.h" | |
34 #include "buffer.h" | |
88359 | 35 #include "character.h" |
17052 | 36 #include "charset.h" |
37 #include "category.h" | |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34984
diff
changeset
|
38 #include "keymap.h" |
17052 | 39 |
40 /* The version number of the latest category table. Each category | |
41 table has a unique version number. It is assigned a new number | |
42 also when it is modified. When a regular expression is compiled | |
43 into the struct re_pattern_buffer, the version number of the | |
44 category table (of the current buffer) at that moment is also | |
45 embedded in the structure. | |
46 | |
47 For the moment, we are not using this feature. */ | |
48 static int category_table_version; | |
49 | |
50 Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; | |
51 | |
52 /* Variables to determine word boundary. */ | |
53 Lisp_Object Vword_combining_categories, Vword_separating_categories; | |
54 | |
55 /* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */ | |
56 Lisp_Object _temp_category_set; | |
57 | |
58 | |
59 /* Category set staff. */ | |
60 | |
61 DEFUN ("make-category-set", Fmake_category_set, Smake_category_set, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
62 doc: /* Return a newly created category-set which contains CATEGORIES. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
63 CATEGORIES is a string of category mnemonics. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
64 The value is a bool-vector which has t at the indices corresponding to |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
65 those categories. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
66 (categories) |
17052 | 67 Lisp_Object categories; |
68 { | |
69 Lisp_Object val; | |
70 int len; | |
71 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
72 CHECK_STRING (categories); |
17052 | 73 val = MAKE_CATEGORY_SET; |
74 | |
20612
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
75 if (STRING_MULTIBYTE (categories)) |
63694
8f10ba0f0a86
(Fmake_category_set): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
54091
diff
changeset
|
76 error ("Multibyte string in `make-category-set'"); |
20612
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
77 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41643
diff
changeset
|
78 len = SCHARS (categories); |
17052 | 79 while (--len >= 0) |
80 { | |
17369
566b26e1930e
(Fmake_category_set): Use XSETFASTINT.
Karl Heuer <kwzh@gnu.org>
parents:
17324
diff
changeset
|
81 Lisp_Object category; |
17052 | 82 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41643
diff
changeset
|
83 XSETFASTINT (category, SREF (categories, len)); |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
84 CHECK_CATEGORY (category); |
17052 | 85 SET_CATEGORY_SET (val, category, Qt); |
86 } | |
87 return val; | |
88 } | |
89 | |
90 | |
91 /* Category staff. */ | |
92 | |
93 Lisp_Object check_category_table (); | |
94 | |
95 DEFUN ("define-category", Fdefine_category, Sdefine_category, 2, 3, 0, | |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
96 doc: /* Define CATEGORY as a category which is described by DOCSTRING. |
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
97 CATEGORY should be an ASCII printing character in the range ` ' to `~'. |
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
98 DOCSTRING is the documentation string of the category. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
99 The category is defined only in category table TABLE, which defaults to |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
100 the current buffer's category table. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
101 (category, docstring, table) |
17052 | 102 Lisp_Object category, docstring, table; |
103 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
104 CHECK_CATEGORY (category); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
105 CHECK_STRING (docstring); |
17052 | 106 table = check_category_table (table); |
107 | |
108 if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
109 error ("Category `%c' is already defined", XFASTINT (category)); | |
110 CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring; | |
111 | |
112 return Qnil; | |
113 } | |
114 | |
115 DEFUN ("category-docstring", Fcategory_docstring, Scategory_docstring, 1, 2, 0, | |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
116 doc: /* Return the documentation string of CATEGORY, as defined in TABLE. |
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
117 TABLE should be a category table and defaults to the current buffer's |
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
118 category table. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
119 (category, table) |
17052 | 120 Lisp_Object category, table; |
121 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
122 CHECK_CATEGORY (category); |
17052 | 123 table = check_category_table (table); |
124 | |
125 return CATEGORY_DOCSTRING (table, XFASTINT (category)); | |
126 } | |
127 | |
128 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category, | |
129 0, 1, 0, | |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
130 doc: /* Return a category which is not yet defined in TABLE. |
41038
a882905d8a96
(Fget_unused_category): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
131 If no category remains available, return nil. |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
132 The optional argument TABLE specifies which category table to modify; |
41038
a882905d8a96
(Fget_unused_category): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40656
diff
changeset
|
133 it defaults to the current buffer's category table. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
134 (table) |
17052 | 135 Lisp_Object table; |
136 { | |
137 int i; | |
138 | |
139 table = check_category_table (table); | |
140 | |
141 for (i = ' '; i <= '~'; i++) | |
142 if (NILP (CATEGORY_DOCSTRING (table, i))) | |
143 return make_number (i); | |
144 | |
145 return Qnil; | |
146 } | |
147 | |
148 | |
149 /* Category-table staff. */ | |
150 | |
151 DEFUN ("category-table-p", Fcategory_table_p, Scategory_table_p, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
152 doc: /* Return t if ARG is a category table. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
153 (arg) |
17052 | 154 Lisp_Object arg; |
155 { | |
156 if (CHAR_TABLE_P (arg) | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
157 && EQ (XCHAR_TABLE (arg)->purpose, Qcategory_table)) |
17052 | 158 return Qt; |
159 return Qnil; | |
160 } | |
161 | |
162 /* If TABLE is nil, return the current category table. If TABLE is | |
163 not nil, check the validity of TABLE as a category table. If | |
164 valid, return TABLE itself, but if not valid, signal an error of | |
165 wrong-type-argument. */ | |
166 | |
167 Lisp_Object | |
168 check_category_table (table) | |
169 Lisp_Object table; | |
170 { | |
171 if (NILP (table)) | |
172 return current_buffer->category_table; | |
71829
8adcaaf366b4
(check_category_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
173 CHECK_TYPE (!NILP (Fcategory_table_p (table)), Qcategory_table_p, table); |
17052 | 174 return table; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
175 } |
17052 | 176 |
177 DEFUN ("category-table", Fcategory_table, Scategory_table, 0, 0, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
178 doc: /* Return the current category table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
179 This is the one specified by the current buffer. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
180 () |
17052 | 181 { |
182 return current_buffer->category_table; | |
183 } | |
184 | |
185 DEFUN ("standard-category-table", Fstandard_category_table, | |
186 Sstandard_category_table, 0, 0, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
187 doc: /* Return the standard category table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
188 This is the one used for new buffers. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
189 () |
17052 | 190 { |
191 return Vstandard_category_table; | |
192 } | |
193 | |
88359 | 194 |
195 static void | |
89483 | 196 copy_category_entry (table, c, val) |
197 Lisp_Object table, c, val; | |
88359 | 198 { |
89380
9320c2f4f351
(copy_category_entry): Fix for the case that RANGE is an integer.
Kenichi Handa <handa@m17n.org>
parents:
88850
diff
changeset
|
199 val = Fcopy_sequence (val); |
89483 | 200 if (CONSP (c)) |
201 char_table_set_range (table, XINT (XCAR (c)), XINT (XCDR (c)), val); | |
89380
9320c2f4f351
(copy_category_entry): Fix for the case that RANGE is an integer.
Kenichi Handa <handa@m17n.org>
parents:
88850
diff
changeset
|
202 else |
89483 | 203 char_table_set (table, XINT (c), val); |
88359 | 204 } |
205 | |
17052 | 206 /* Return a copy of category table TABLE. We can't simply use the |
207 function copy-sequence because no contents should be shared between | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
208 the original and the copy. This function is called recursively by |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
209 binding TABLE to a sub char table. */ |
17052 | 210 |
211 Lisp_Object | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
212 copy_category_table (table) |
17052 | 213 Lisp_Object table; |
214 { | |
88359 | 215 table = copy_char_table (table); |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
216 |
88359 | 217 if (! NILP (XCHAR_TABLE (table)->defalt)) |
218 XCHAR_TABLE (table)->defalt | |
219 = Fcopy_sequence (XCHAR_TABLE (table)->defalt); | |
220 XCHAR_TABLE (table)->extras[0] | |
221 = Fcopy_sequence (XCHAR_TABLE (table)->extras[0]); | |
89483 | 222 map_char_table (copy_category_entry, Qnil, table, table); |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
223 |
17052 | 224 return table; |
225 } | |
226 | |
227 DEFUN ("copy-category-table", Fcopy_category_table, Scopy_category_table, | |
228 0, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
229 doc: /* Construct a new category table and return it. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
230 It is a copy of the TABLE, which defaults to the standard category table. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
231 (table) |
17052 | 232 Lisp_Object table; |
233 { | |
234 if (!NILP (table)) | |
235 check_category_table (table); | |
236 else | |
237 table = Vstandard_category_table; | |
238 | |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
239 return copy_category_table (table); |
17052 | 240 } |
241 | |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
242 DEFUN ("make-category-table", Fmake_category_table, Smake_category_table, |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
243 0, 0, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
244 doc: /* Construct a new and empty category table and return it. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
245 () |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
246 { |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
247 Lisp_Object val; |
88359 | 248 int i; |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
249 |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
250 val = Fmake_char_table (Qcategory_table, Qnil); |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
251 XCHAR_TABLE (val)->defalt = MAKE_CATEGORY_SET; |
89483 | 252 for (i = 0; i < (1 << CHARTAB_SIZE_BITS_0); i++) |
88359 | 253 XCHAR_TABLE (val)->contents[i] = MAKE_CATEGORY_SET; |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
254 Fset_char_table_extra_slot (val, make_number (0), |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
255 Fmake_vector (make_number (95), Qnil)); |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
256 return val; |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
257 } |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
258 |
17052 | 259 DEFUN ("set-category-table", Fset_category_table, Sset_category_table, 1, 1, 0, |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
260 doc: /* Specify TABLE as the category table for the current buffer. |
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
261 Return TABLE. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
262 (table) |
17052 | 263 Lisp_Object table; |
264 { | |
28315
16ed41346de7
(Fset_category_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
26841
diff
changeset
|
265 int idx; |
17052 | 266 table = check_category_table (table); |
267 current_buffer->category_table = table; | |
268 /* Indicate that this buffer now has a specified category table. */ | |
28351 | 269 idx = PER_BUFFER_VAR_IDX (category_table); |
270 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1); | |
17052 | 271 return table; |
272 } | |
273 | |
274 | |
88359 | 275 Lisp_Object |
276 char_category_set (c) | |
277 int c; | |
278 { | |
279 return CHAR_TABLE_REF (current_buffer->category_table, c); | |
280 } | |
281 | |
17052 | 282 DEFUN ("char-category-set", Fchar_category_set, Schar_category_set, 1, 1, 0, |
73927
e74524ea3f55
(Fchar_category_set): Improve arg/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents:
71829
diff
changeset
|
283 doc: /* Return the category set of CHAR. |
e74524ea3f55
(Fchar_category_set): Improve arg/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents:
71829
diff
changeset
|
284 usage: (char-category-set CHAR) */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
285 (ch) |
17052 | 286 Lisp_Object ch; |
287 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
288 CHECK_NUMBER (ch); |
17052 | 289 return CATEGORY_SET (XFASTINT (ch)); |
290 } | |
291 | |
292 DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics, | |
293 Scategory_set_mnemonics, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
294 doc: /* Return a string containing mnemonics of the categories in CATEGORY-SET. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
295 CATEGORY-SET is a bool-vector, and the categories \"in\" it are those |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
296 that are indexes where t occurs in the bool-vector. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
297 The return value is a string containing those same categories. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
298 (category_set) |
17052 | 299 Lisp_Object category_set; |
300 { | |
301 int i, j; | |
302 char str[96]; | |
303 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
304 CHECK_CATEGORY_SET (category_set); |
17052 | 305 |
306 j = 0; | |
307 for (i = 32; i < 127; i++) | |
308 if (CATEGORY_MEMBER (i, category_set)) | |
309 str[j++] = i; | |
310 str[j] = '\0'; | |
311 | |
312 return build_string (str); | |
313 } | |
314 | |
315 void | |
316 set_category_set (category_set, category, val) | |
317 Lisp_Object category_set, category, val; | |
318 { | |
319 do { | |
320 int idx = XINT (category) / 8; | |
321 unsigned char bits = 1 << (XINT (category) % 8); | |
322 | |
323 if (NILP (val)) | |
324 XCATEGORY_SET (category_set)->data[idx] &= ~bits; | |
325 else | |
326 XCATEGORY_SET (category_set)->data[idx] |= bits; | |
327 } while (0); | |
328 } | |
329 | |
330 DEFUN ("modify-category-entry", Fmodify_category_entry, | |
331 Smodify_category_entry, 2, 4, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
332 doc: /* Modify the category set of CHARACTER by adding CATEGORY to it. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
333 The category is changed only for table TABLE, which defaults to |
88622
6bd578d2b8af
(Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents:
88359
diff
changeset
|
334 the current buffer's category table. |
6bd578d2b8af
(Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents:
88359
diff
changeset
|
335 CHARACTER can be either a single character or a cons representing the |
6bd578d2b8af
(Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents:
88359
diff
changeset
|
336 lower and upper ends of an inclusive character range to modify. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
337 If optional fourth argument RESET is non-nil, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
338 then delete CATEGORY from the category set instead of adding it. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
339 (character, category, table, reset) |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
340 Lisp_Object character, category, table, reset; |
17052 | 341 { |
342 Lisp_Object set_value; /* Actual value to be set in category sets. */ | |
88622
6bd578d2b8af
(Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents:
88359
diff
changeset
|
343 Lisp_Object category_set; |
88359 | 344 int start, end; |
345 int from, to; | |
17052 | 346 |
88359 | 347 if (INTEGERP (character)) |
348 { | |
349 CHECK_CHARACTER (character); | |
350 start = end = XFASTINT (character); | |
351 } | |
352 else | |
353 { | |
354 CHECK_CONS (character); | |
89483 | 355 CHECK_CHARACTER_CAR (character); |
356 CHECK_CHARACTER_CDR (character); | |
88359 | 357 start = XFASTINT (XCAR (character)); |
358 end = XFASTINT (XCDR (character)); | |
359 } | |
360 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
361 CHECK_CATEGORY (category); |
17052 | 362 table = check_category_table (table); |
363 | |
364 if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
365 error ("Undefined category: %c", XFASTINT (category)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
366 |
17052 | 367 set_value = NILP (reset) ? Qt : Qnil; |
368 | |
88359 | 369 while (start <= end) |
17052 | 370 { |
88359 | 371 category_set = char_table_ref_and_range (table, start, &from, &to); |
88850
6f9164905a7c
(Fmodify_category_entry): Fix CATEGORY_MEMBER call.
Dave Love <fx@gnu.org>
parents:
88741
diff
changeset
|
372 if (CATEGORY_MEMBER (XFASTINT (category), category_set) != NILP (reset)) |
88359 | 373 { |
88741
a93a8b796b91
(Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents:
88622
diff
changeset
|
374 category_set = Fcopy_sequence (category_set); |
a93a8b796b91
(Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents:
88622
diff
changeset
|
375 SET_CATEGORY_SET (category_set, category, set_value); |
88359 | 376 if (to > end) |
377 char_table_set_range (table, start, end, category_set); | |
378 else | |
379 char_table_set_range (table, start, to, category_set); | |
380 } | |
381 start = to + 1; | |
17052 | 382 } |
383 | |
384 return Qnil; | |
385 } | |
386 | |
387 /* Return 1 if there is a word boundary between two word-constituent | |
388 characters C1 and C2 if they appear in this order, else return 0. | |
389 Use the macro WORD_BOUNDARY_P instead of calling this function | |
390 directly. */ | |
391 | |
392 int | |
393 word_boundary_p (c1, c2) | |
394 int c1, c2; | |
395 { | |
396 Lisp_Object category_set1, category_set2; | |
397 Lisp_Object tail; | |
398 int default_result; | |
399 | |
400 if (CHAR_CHARSET (c1) == CHAR_CHARSET (c2)) | |
401 { | |
402 tail = Vword_separating_categories; | |
403 default_result = 0; | |
404 } | |
405 else | |
406 { | |
407 tail = Vword_combining_categories; | |
408 default_result = 1; | |
409 } | |
410 | |
411 category_set1 = CATEGORY_SET (c1); | |
412 if (NILP (category_set1)) | |
413 return default_result; | |
414 category_set2 = CATEGORY_SET (c2); | |
415 if (NILP (category_set2)) | |
416 return default_result; | |
417 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
418 for (; CONSP (tail); tail = XCDR (tail)) |
17052 | 419 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
420 Lisp_Object elt = XCAR (tail); |
17052 | 421 |
422 if (CONSP (elt) | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
423 && CATEGORYP (XCAR (elt)) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
424 && CATEGORYP (XCDR (elt)) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
425 && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1) |
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
426 && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2)) |
17052 | 427 return !default_result; |
428 } | |
429 return default_result; | |
430 } | |
431 | |
432 | |
21514 | 433 void |
17052 | 434 init_category_once () |
435 { | |
436 /* This has to be done here, before we call Fmake_char_table. */ | |
437 Qcategory_table = intern ("category-table"); | |
438 staticpro (&Qcategory_table); | |
439 | |
440 /* Intern this now in case it isn't already done. | |
441 Setting this variable twice is harmless. | |
442 But don't staticpro it here--that is done in alloc.c. */ | |
443 Qchar_table_extra_slots = intern ("char-table-extra-slots"); | |
444 | |
445 /* Now we are ready to set up this property, so we can | |
446 create category tables. */ | |
447 Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); | |
448 | |
449 Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
450 /* Set a category set which contains nothing to the default. */ |
17052 | 451 XCHAR_TABLE (Vstandard_category_table)->defalt = MAKE_CATEGORY_SET; |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
452 Fset_char_table_extra_slot (Vstandard_category_table, make_number (0), |
17052 | 453 Fmake_vector (make_number (95), Qnil)); |
454 } | |
455 | |
21514 | 456 void |
17052 | 457 syms_of_category () |
458 { | |
459 Qcategoryp = intern ("categoryp"); | |
460 staticpro (&Qcategoryp); | |
461 Qcategorysetp = intern ("categorysetp"); | |
462 staticpro (&Qcategorysetp); | |
463 Qcategory_table_p = intern ("category-table-p"); | |
464 staticpro (&Qcategory_table_p); | |
465 | |
466 DEFVAR_LISP ("word-combining-categories", &Vword_combining_categories, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
467 doc: /* List of pair (cons) of categories to determine word boundary. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
468 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
469 Emacs treats a sequence of word constituent characters as a single |
78501 | 470 word (i.e. finds no word boundary between them) only if they belong to |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
471 the same charset. But, exceptions are allowed in the following cases. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
472 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
473 \(1) The case that characters are in different charsets is controlled |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
474 by the variable `word-combining-categories'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
475 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
476 Emacs finds no word boundary between characters of different charsets |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
477 if they have categories matching some element of this list. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
478 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
479 More precisely, if an element of this list is a cons of category CAT1 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
480 and CAT2, and a multibyte character C1 which has CAT1 is followed by |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
481 C2 which has CAT2, there's no word boundary between C1 and C2. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
482 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
483 For instance, to tell that ASCII characters and Latin-1 characters can |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
484 form a single word, the element `(?l . ?l)' should be in this list |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
485 because both characters have the category `l' (Latin characters). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
486 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
487 \(2) The case that character are in the same charset is controlled by |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
488 the variable `word-separating-categories'. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
489 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
490 Emacs find a word boundary between characters of the same charset |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
491 if they have categories matching some element of this list. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
492 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
493 More precisely, if an element of this list is a cons of category CAT1 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
494 and CAT2, and a multibyte character C1 which has CAT1 is followed by |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
495 C2 which has CAT2, there's a word boundary between C1 and C2. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
496 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
497 For instance, to tell that there's a word boundary between Japanese |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
498 Hiragana and Japanese Kanji (both are in the same charset), the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
499 element `(?H . ?C) should be in this list. */); |
17052 | 500 |
501 Vword_combining_categories = Qnil; | |
502 | |
503 DEFVAR_LISP ("word-separating-categories", &Vword_separating_categories, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
504 doc: /* List of pair (cons) of categories to determine word boundary. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
505 See the documentation of the variable `word-combining-categories'. */); |
17052 | 506 |
507 Vword_separating_categories = Qnil; | |
508 | |
509 defsubr (&Smake_category_set); | |
510 defsubr (&Sdefine_category); | |
511 defsubr (&Scategory_docstring); | |
512 defsubr (&Sget_unused_category); | |
513 defsubr (&Scategory_table_p); | |
514 defsubr (&Scategory_table); | |
515 defsubr (&Sstandard_category_table); | |
516 defsubr (&Scopy_category_table); | |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
517 defsubr (&Smake_category_table); |
17052 | 518 defsubr (&Sset_category_table); |
519 defsubr (&Schar_category_set); | |
520 defsubr (&Scategory_set_mnemonics); | |
521 defsubr (&Smodify_category_entry); | |
522 | |
523 category_table_version = 0; | |
524 } | |
52401 | 525 |
526 /* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211 | |
527 (do not change this comment) */ |