Mercurial > emacs
annotate src/category.c @ 109157:76b683a5339b
Minor zone.el fixes for bug#6483.
Zone did not like the intangible newlines etc in the gomoku buffer.
* lisp/play/zone.el (top-level): Do not require timer, tabify, or cl.
(zone-shift-left): Ignore intangibility, and any errors from forward-char.
(zone-shift-right): Remove no-op end-of-line. Ignore intangibility.
(zone-pgm-putz-with-case): Use upcase-region rather than inserting,
deleting, and copying text properties.
(zone-line-specs, zone-pgm-stress): Check forward-line exit status.
(zone-pgm-rotate): Handle odd buffers like that of gomoku, where getting
to point-max is hard.
(zone-fret, zone-fill-out-screen): Replace cl's do with dotimes.
(zone-fill-out-screen): Ignore intangibility.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 06 Jul 2010 21:16:27 -0700 |
parents | aec1143e8d85 |
children | 8cfee7d2955f |
rev | line source |
---|---|
17052 | 1 /* GNU Emacs routines to deal with category tables. |
106815 | 2 Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
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, |
106815 | 5 2005, 2006, 2007, 2008, 2009, 2010 |
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> | |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100951
diff
changeset
|
33 #include <setjmp.h> |
17052 | 34 #include "lisp.h" |
35 #include "buffer.h" | |
88359 | 36 #include "character.h" |
17052 | 37 #include "charset.h" |
38 #include "category.h" | |
39748
42b7a798ff79
Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34984
diff
changeset
|
39 #include "keymap.h" |
17052 | 40 |
41 /* The version number of the latest category table. Each category | |
42 table has a unique version number. It is assigned a new number | |
43 also when it is modified. When a regular expression is compiled | |
44 into the struct re_pattern_buffer, the version number of the | |
45 category table (of the current buffer) at that moment is also | |
46 embedded in the structure. | |
47 | |
48 For the moment, we are not using this feature. */ | |
49 static int category_table_version; | |
50 | |
51 Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p; | |
52 | |
53 /* Variables to determine word boundary. */ | |
54 Lisp_Object Vword_combining_categories, Vword_separating_categories; | |
55 | |
56 /* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */ | |
57 Lisp_Object _temp_category_set; | |
58 | |
59 | |
60 /* Category set staff. */ | |
61 | |
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
|
62 static Lisp_Object hash_get_category_set (Lisp_Object, Lisp_Object); |
99975
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
63 |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
64 static Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
65 hash_get_category_set (Lisp_Object table, Lisp_Object category_set) |
99975
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
66 { |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
67 Lisp_Object val; |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
68 struct Lisp_Hash_Table *h; |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
69 int i; |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
70 unsigned hash; |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
71 |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
72 if (NILP (XCHAR_TABLE (table)->extras[1])) |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
73 XCHAR_TABLE (table)->extras[1] |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
74 = make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE), |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
75 make_float (DEFAULT_REHASH_SIZE), |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
76 make_float (DEFAULT_REHASH_THRESHOLD), |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
77 Qnil, Qnil, Qnil); |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
78 h = XHASH_TABLE (XCHAR_TABLE (table)->extras[1]); |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
79 i = hash_lookup (h, category_set, &hash); |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
80 if (i >= 0) |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
81 return HASH_KEY (h, i); |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
82 hash_put (h, category_set, Qnil, hash); |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
83 return category_set; |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
84 } |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
85 |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
86 |
17052 | 87 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
|
88 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
|
89 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
|
90 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
|
91 those categories. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
92 (categories) |
17052 | 93 Lisp_Object categories; |
94 { | |
95 Lisp_Object val; | |
96 int len; | |
97 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
98 CHECK_STRING (categories); |
17052 | 99 val = MAKE_CATEGORY_SET; |
100 | |
20612
5a0922f8c841
(Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents:
20189
diff
changeset
|
101 if (STRING_MULTIBYTE (categories)) |
63694
8f10ba0f0a86
(Fmake_category_set): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
54091
diff
changeset
|
102 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
|
103 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41643
diff
changeset
|
104 len = SCHARS (categories); |
17052 | 105 while (--len >= 0) |
106 { | |
17369
566b26e1930e
(Fmake_category_set): Use XSETFASTINT.
Karl Heuer <kwzh@gnu.org>
parents:
17324
diff
changeset
|
107 Lisp_Object category; |
17052 | 108 |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
41643
diff
changeset
|
109 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
|
110 CHECK_CATEGORY (category); |
17052 | 111 SET_CATEGORY_SET (val, category, Qt); |
112 } | |
113 return val; | |
114 } | |
115 | |
116 | |
117 /* Category staff. */ | |
118 | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
119 Lisp_Object check_category_table (Lisp_Object table); |
17052 | 120 |
121 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
|
122 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
|
123 CATEGORY should be an ASCII printing character in the range ` ' to `~'. |
99117
2810c8ec19d6
(Fdefine_category): Docstring modified for DOCSTRING.
Kenichi Handa <handa@m17n.org>
parents:
99016
diff
changeset
|
124 DOCSTRING is the documentation string of the category. The first line |
2810c8ec19d6
(Fdefine_category): Docstring modified for DOCSTRING.
Kenichi Handa <handa@m17n.org>
parents:
99016
diff
changeset
|
125 should be a terse text (preferably less than 16 characters), |
2810c8ec19d6
(Fdefine_category): Docstring modified for DOCSTRING.
Kenichi Handa <handa@m17n.org>
parents:
99016
diff
changeset
|
126 and the rest lines should be the full description. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
127 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
|
128 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
|
129 (category, docstring, table) |
17052 | 130 Lisp_Object category, docstring, table; |
131 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
132 CHECK_CATEGORY (category); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
133 CHECK_STRING (docstring); |
17052 | 134 table = check_category_table (table); |
135 | |
136 if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
137 error ("Category `%c' is already defined", XFASTINT (category)); | |
105744
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
138 if (!NILP (Vpurify_flag)) |
b0a732611398
* keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
139 docstring = Fpurecopy (docstring); |
17052 | 140 CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring; |
141 | |
142 return Qnil; | |
143 } | |
144 | |
145 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
|
146 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
|
147 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
|
148 category table. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
149 (category, table) |
17052 | 150 Lisp_Object category, table; |
151 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
152 CHECK_CATEGORY (category); |
17052 | 153 table = check_category_table (table); |
154 | |
155 return CATEGORY_DOCSTRING (table, XFASTINT (category)); | |
156 } | |
157 | |
158 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category, | |
159 0, 1, 0, | |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
160 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
|
161 If no category remains available, return nil. |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
162 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
|
163 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
|
164 (table) |
17052 | 165 Lisp_Object table; |
166 { | |
167 int i; | |
168 | |
169 table = check_category_table (table); | |
170 | |
171 for (i = ' '; i <= '~'; i++) | |
172 if (NILP (CATEGORY_DOCSTRING (table, i))) | |
173 return make_number (i); | |
174 | |
175 return Qnil; | |
176 } | |
177 | |
178 | |
179 /* Category-table staff. */ | |
180 | |
181 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
|
182 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
|
183 (arg) |
17052 | 184 Lisp_Object arg; |
185 { | |
186 if (CHAR_TABLE_P (arg) | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
187 && EQ (XCHAR_TABLE (arg)->purpose, Qcategory_table)) |
17052 | 188 return Qt; |
189 return Qnil; | |
190 } | |
191 | |
192 /* If TABLE is nil, return the current category table. If TABLE is | |
193 not nil, check the validity of TABLE as a category table. If | |
194 valid, return TABLE itself, but if not valid, signal an error of | |
195 wrong-type-argument. */ | |
196 | |
197 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
198 check_category_table (Lisp_Object table) |
17052 | 199 { |
200 if (NILP (table)) | |
201 return current_buffer->category_table; | |
71829
8adcaaf366b4
(check_category_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
202 CHECK_TYPE (!NILP (Fcategory_table_p (table)), Qcategory_table_p, table); |
17052 | 203 return table; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
204 } |
17052 | 205 |
206 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
|
207 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
|
208 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
|
209 () |
17052 | 210 { |
211 return current_buffer->category_table; | |
212 } | |
213 | |
214 DEFUN ("standard-category-table", Fstandard_category_table, | |
215 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
|
216 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
|
217 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
|
218 () |
17052 | 219 { |
220 return Vstandard_category_table; | |
221 } | |
222 | |
88359 | 223 |
224 static void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
225 copy_category_entry (Lisp_Object table, Lisp_Object c, Lisp_Object val) |
88359 | 226 { |
89380
9320c2f4f351
(copy_category_entry): Fix for the case that RANGE is an integer.
Kenichi Handa <handa@m17n.org>
parents:
88850
diff
changeset
|
227 val = Fcopy_sequence (val); |
89483 | 228 if (CONSP (c)) |
229 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
|
230 else |
89483 | 231 char_table_set (table, XINT (c), val); |
88359 | 232 } |
233 | |
17052 | 234 /* Return a copy of category table TABLE. We can't simply use the |
235 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
|
236 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
|
237 binding TABLE to a sub char table. */ |
17052 | 238 |
239 Lisp_Object | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
240 copy_category_table (Lisp_Object table) |
17052 | 241 { |
88359 | 242 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
|
243 |
88359 | 244 if (! NILP (XCHAR_TABLE (table)->defalt)) |
245 XCHAR_TABLE (table)->defalt | |
246 = Fcopy_sequence (XCHAR_TABLE (table)->defalt); | |
247 XCHAR_TABLE (table)->extras[0] | |
248 = Fcopy_sequence (XCHAR_TABLE (table)->extras[0]); | |
89483 | 249 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
|
250 |
17052 | 251 return table; |
252 } | |
253 | |
254 DEFUN ("copy-category-table", Fcopy_category_table, Scopy_category_table, | |
255 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
|
256 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
|
257 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
|
258 (table) |
17052 | 259 Lisp_Object table; |
260 { | |
261 if (!NILP (table)) | |
262 check_category_table (table); | |
263 else | |
264 table = Vstandard_category_table; | |
265 | |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
266 return copy_category_table (table); |
17052 | 267 } |
268 | |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
269 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
|
270 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
|
271 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
|
272 () |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
273 { |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
274 Lisp_Object val; |
88359 | 275 int i; |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
276 |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
277 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
|
278 XCHAR_TABLE (val)->defalt = MAKE_CATEGORY_SET; |
89483 | 279 for (i = 0; i < (1 << CHARTAB_SIZE_BITS_0); i++) |
88359 | 280 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
|
281 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
|
282 Fmake_vector (make_number (95), Qnil)); |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
283 return val; |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
284 } |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
285 |
17052 | 286 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
|
287 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
|
288 Return TABLE. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
289 (table) |
17052 | 290 Lisp_Object table; |
291 { | |
28315
16ed41346de7
(Fset_category_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
26841
diff
changeset
|
292 int idx; |
17052 | 293 table = check_category_table (table); |
294 current_buffer->category_table = table; | |
295 /* Indicate that this buffer now has a specified category table. */ | |
28351 | 296 idx = PER_BUFFER_VAR_IDX (category_table); |
297 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1); | |
17052 | 298 return table; |
299 } | |
300 | |
301 | |
88359 | 302 Lisp_Object |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
303 char_category_set (int c) |
88359 | 304 { |
305 return CHAR_TABLE_REF (current_buffer->category_table, c); | |
306 } | |
307 | |
17052 | 308 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
|
309 doc: /* Return the category set of CHAR. |
e74524ea3f55
(Fchar_category_set): Improve arg/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents:
71829
diff
changeset
|
310 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
|
311 (ch) |
17052 | 312 Lisp_Object ch; |
313 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
314 CHECK_NUMBER (ch); |
17052 | 315 return CATEGORY_SET (XFASTINT (ch)); |
316 } | |
317 | |
318 DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics, | |
319 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
|
320 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
|
321 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
|
322 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
|
323 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
|
324 (category_set) |
17052 | 325 Lisp_Object category_set; |
326 { | |
327 int i, j; | |
328 char str[96]; | |
329 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
330 CHECK_CATEGORY_SET (category_set); |
17052 | 331 |
332 j = 0; | |
333 for (i = 32; i < 127; i++) | |
334 if (CATEGORY_MEMBER (i, category_set)) | |
335 str[j++] = i; | |
336 str[j] = '\0'; | |
337 | |
338 return build_string (str); | |
339 } | |
340 | |
341 void | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
342 set_category_set (Lisp_Object category_set, Lisp_Object category, Lisp_Object val) |
17052 | 343 { |
344 do { | |
345 int idx = XINT (category) / 8; | |
346 unsigned char bits = 1 << (XINT (category) % 8); | |
347 | |
348 if (NILP (val)) | |
349 XCATEGORY_SET (category_set)->data[idx] &= ~bits; | |
350 else | |
351 XCATEGORY_SET (category_set)->data[idx] |= bits; | |
352 } while (0); | |
353 } | |
354 | |
355 DEFUN ("modify-category-entry", Fmodify_category_entry, | |
356 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
|
357 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
|
358 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
|
359 the current buffer's category table. |
6bd578d2b8af
(Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents:
88359
diff
changeset
|
360 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
|
361 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
|
362 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
|
363 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
|
364 (character, category, table, reset) |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
365 Lisp_Object character, category, table, reset; |
17052 | 366 { |
367 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
|
368 Lisp_Object category_set; |
88359 | 369 int start, end; |
370 int from, to; | |
17052 | 371 |
88359 | 372 if (INTEGERP (character)) |
373 { | |
374 CHECK_CHARACTER (character); | |
375 start = end = XFASTINT (character); | |
376 } | |
377 else | |
378 { | |
379 CHECK_CONS (character); | |
89483 | 380 CHECK_CHARACTER_CAR (character); |
381 CHECK_CHARACTER_CDR (character); | |
88359 | 382 start = XFASTINT (XCAR (character)); |
383 end = XFASTINT (XCDR (character)); | |
384 } | |
385 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
386 CHECK_CATEGORY (category); |
17052 | 387 table = check_category_table (table); |
388 | |
389 if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
390 error ("Undefined category: %c", XFASTINT (category)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
391 |
17052 | 392 set_value = NILP (reset) ? Qt : Qnil; |
393 | |
88359 | 394 while (start <= end) |
17052 | 395 { |
99975
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
396 from = start, to = end; |
88359 | 397 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
|
398 if (CATEGORY_MEMBER (XFASTINT (category), category_set) != NILP (reset)) |
88359 | 399 { |
88741
a93a8b796b91
(Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents:
88622
diff
changeset
|
400 category_set = Fcopy_sequence (category_set); |
a93a8b796b91
(Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents:
88622
diff
changeset
|
401 SET_CATEGORY_SET (category_set, category, set_value); |
99975
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
402 category_set = hash_get_category_set (table, category_set); |
dddfb4772d33
(hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents:
99197
diff
changeset
|
403 char_table_set_range (table, start, to, category_set); |
88359 | 404 } |
405 start = to + 1; | |
17052 | 406 } |
407 | |
408 return Qnil; | |
409 } | |
410 | |
411 /* Return 1 if there is a word boundary between two word-constituent | |
412 characters C1 and C2 if they appear in this order, else return 0. | |
413 Use the macro WORD_BOUNDARY_P instead of calling this function | |
414 directly. */ | |
415 | |
416 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
417 word_boundary_p (int c1, int c2) |
17052 | 418 { |
419 Lisp_Object category_set1, category_set2; | |
420 Lisp_Object tail; | |
421 int default_result; | |
422 | |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
423 if (EQ (CHAR_TABLE_REF (Vchar_script_table, c1), |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
424 CHAR_TABLE_REF (Vchar_script_table, c2))) |
17052 | 425 { |
426 tail = Vword_separating_categories; | |
427 default_result = 0; | |
428 } | |
429 else | |
430 { | |
431 tail = Vword_combining_categories; | |
432 default_result = 1; | |
433 } | |
434 | |
435 category_set1 = CATEGORY_SET (c1); | |
436 if (NILP (category_set1)) | |
437 return default_result; | |
438 category_set2 = CATEGORY_SET (c2); | |
439 if (NILP (category_set2)) | |
440 return default_result; | |
441 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
442 for (; CONSP (tail); tail = XCDR (tail)) |
17052 | 443 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
444 Lisp_Object elt = XCAR (tail); |
17052 | 445 |
446 if (CONSP (elt) | |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
447 && (NILP (XCAR (elt)) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
448 || (CATEGORYP (XCAR (elt)) |
105983
0bc34ff12a2d
(word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
449 && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1) |
0bc34ff12a2d
(word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
450 && ! CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set2))) |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
451 && (NILP (XCDR (elt)) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
452 || (CATEGORYP (XCDR (elt)) |
105983
0bc34ff12a2d
(word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
453 && ! CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set1) |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
454 && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2)))) |
17052 | 455 return !default_result; |
456 } | |
457 return default_result; | |
458 } | |
459 | |
460 | |
21514 | 461 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
462 init_category_once (void) |
17052 | 463 { |
464 /* This has to be done here, before we call Fmake_char_table. */ | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
465 Qcategory_table = intern_c_string ("category-table"); |
17052 | 466 staticpro (&Qcategory_table); |
467 | |
468 /* Intern this now in case it isn't already done. | |
469 Setting this variable twice is harmless. | |
470 But don't staticpro it here--that is done in alloc.c. */ | |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
471 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots"); |
17052 | 472 |
473 /* Now we are ready to set up this property, so we can | |
474 create category tables. */ | |
475 Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); | |
476 | |
477 Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
478 /* Set a category set which contains nothing to the default. */ |
17052 | 479 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
|
480 Fset_char_table_extra_slot (Vstandard_category_table, make_number (0), |
17052 | 481 Fmake_vector (make_number (95), Qnil)); |
482 } | |
483 | |
21514 | 484 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
485 syms_of_category (void) |
17052 | 486 { |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
487 Qcategoryp = intern_c_string ("categoryp"); |
17052 | 488 staticpro (&Qcategoryp); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
489 Qcategorysetp = intern_c_string ("categorysetp"); |
17052 | 490 staticpro (&Qcategorysetp); |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105744
diff
changeset
|
491 Qcategory_table_p = intern_c_string ("category-table-p"); |
17052 | 492 staticpro (&Qcategory_table_p); |
493 | |
494 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
|
495 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
|
496 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
497 Emacs treats a sequence of word constituent characters as a single |
78501 | 498 word (i.e. finds no word boundary between them) only if they belong to |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
499 the same script. But, exceptions are allowed in the following cases. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
500 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
501 \(1) The case that characters are in different scripts is controlled |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
502 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
|
503 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
504 Emacs finds no word boundary between characters of different scripts |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
505 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
|
506 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
507 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
|
508 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
|
509 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
|
510 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
511 For instance, to tell that Han characters followed by Hiragana |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
512 characters can form a single word, the element `(?C . ?H)' should be |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
513 in this list. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
514 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
515 \(2) The case that character are in the same script is controlled by |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
516 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
|
517 |
99197
7548cef42245
(syms_of_category): Fix typo in docstring.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
99117
diff
changeset
|
518 Emacs finds a word boundary between characters of the same script |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
519 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
|
520 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
521 More precisely, if an element of this list is a cons of category CAT1 |
105983
0bc34ff12a2d
(word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
522 and CAT2, and a multibyte character C1 which has CAT1 but not CAT2 is |
0bc34ff12a2d
(word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
523 followed by C2 which has CAT2 but not CAT1, there's a word boundary |
0bc34ff12a2d
(word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents:
105877
diff
changeset
|
524 between C1 and C2. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
525 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
526 For instance, to tell that there's a word boundary between Hiragana |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
527 and Katakana (both are in the same script `kana'), |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
528 the element `(?H . ?K) should be in this list. */); |
17052 | 529 |
530 Vword_combining_categories = Qnil; | |
531 | |
532 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
|
533 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
|
534 See the documentation of the variable `word-combining-categories'. */); |
17052 | 535 |
536 Vword_separating_categories = Qnil; | |
537 | |
538 defsubr (&Smake_category_set); | |
539 defsubr (&Sdefine_category); | |
540 defsubr (&Scategory_docstring); | |
541 defsubr (&Sget_unused_category); | |
542 defsubr (&Scategory_table_p); | |
543 defsubr (&Scategory_table); | |
544 defsubr (&Sstandard_category_table); | |
545 defsubr (&Scopy_category_table); | |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
546 defsubr (&Smake_category_table); |
17052 | 547 defsubr (&Sset_category_table); |
548 defsubr (&Schar_category_set); | |
549 defsubr (&Scategory_set_mnemonics); | |
550 defsubr (&Smodify_category_entry); | |
551 | |
552 category_table_version = 0; | |
553 } | |
52401 | 554 |
555 /* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211 | |
556 (do not change this comment) */ |