Mercurial > emacs
annotate src/category.c @ 99139:8fa7ef477c04
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-format-agenda-item)
(org-agenda-filter-make-matcher): Make sure tags are stored and
compared donwcased.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-insert-todo-heading): Fix bug with force-heading
argument.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-exp.el (org-export-as-ascii): Handle the case that we are
bulishing from an indirect buffer.
* org-table.el (org-table-copy-down): Fix bug with time stamp
increment.
* org-mouse.el (org-mouse-features): New option.
(org-mode-hook): Turn on features depending on
`org-mouse-features'.
* org.el (org-insert-heading-respect-content): Force heading
creation.
(org-insert-heading): keep the folding state of the heading before
the inserted one.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-archive.el (org-archive-to-archive-sibling): Handle top
level headlines better.
2008-10-26 Bastien Guerry <bzg@altern.org>
* org-export-latex.el (org-export-latex-classes): Added
\usepackage{graphicx} to the default list of packages.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-agenda-filter): Renamed from
`org-agenda-filter-tags'.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-entry-properties): Add CATEGORY property, iven if it
is not defined as a property in this entry.
(org-add-log-note): Mask prefix argument when immediately storing
the note.
* org-agenda.el (org-agenda-filter-effort-default-operator): New
option.
2008-10-26 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-add-log-setup): Bugfix; code to find insertion point
after drawers was skipping ahead one line too many, so notes were
inserted after the first note instead of before it.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-agenda.el (org-agenda-filter-tags,org-agenda-filter-form):
New variables.
(org-prepare-agenda): Reset the filter tags.
(org-agenda-filter-by-tag, org-agenda-filter-by-tag-show-all):
Show filter tags in mode line.
* org-table.el (orgtbl-to-html): Bind `html-table-tag' for the
formatter.
* org-export-latex.el (org-latex-entities-regexp): New constant.
(org-export-as-pdf): Use two calls to `shell-command'.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-export-latex.el (org-export-latex-treat-sub-super-char):
Honor the {} value of the subsuperscript setting. Make sure that
longer subsuperscripts are typeset in a roman font.
* org.el (org-clock-update-time-maybe): Compute negative clock
intervals correctly.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org.el (org-add-log-setup): Respect
`org-log-state-notes-insert-after-drawers'.
(org-log-state-notes-insert-after-drawers): New option.
(org-todo-trigger-tag-changes): New function.
(org-todo): Call `org-todo-trigger-tag-changes'.
2008-10-26 James TD Smith <ahktenzero@mohorovi.cc>
* org.el (org-add-log-setup): Only skip drawers if the are
immediately after the scheduling keywords.
* org-clock.el (org-clock-in-switch-to-state): Allow this to be a
function
(org-clock-in): If `org-clock-in-switch-to-state' is a function,
call it with the current todo state to get the state to switch to
when clocking in.
(org-clock-in): Use org-indent-line-function to indent clock lines.
(org-clock-find-position): Fix indentation of empty clock drawers.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-publish.el (org-publish-org-to): Handle case when
org-export-to-pdf does return a file name, not a buffer.
(org-publish-org-to-pdf): New function.
* org-export-latex.el (org-export-as-pdf)
(org-export-as-pdf-and-open): New commands.
* org-table.el (org-table-eval-formula): Avoid parsing Calc's HMS
forms as ranges.
* org-export-latex.el (org-export-latex-lists): Ignore lists-like
things in protexted regions.
2008-10-26 Carsten Dominik <dominik@science.uva.nl>
* org-export-latex.el (org-export-latex-preprocess): Improve
quoting of LaTeX environments.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sat, 25 Oct 2008 21:32:46 +0000 |
parents | 2810c8ec19d6 |
children | 7548cef42245 |
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 `~'. |
99117
2810c8ec19d6
(Fdefine_category): Docstring modified for DOCSTRING.
Kenichi Handa <handa@m17n.org>
parents:
99016
diff
changeset
|
98 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
|
99 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
|
100 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
|
101 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
|
102 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
|
103 (category, docstring, table) |
17052 | 104 Lisp_Object category, docstring, table; |
105 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
106 CHECK_CATEGORY (category); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
107 CHECK_STRING (docstring); |
17052 | 108 table = check_category_table (table); |
109 | |
110 if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
111 error ("Category `%c' is already defined", XFASTINT (category)); | |
112 CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring; | |
113 | |
114 return Qnil; | |
115 } | |
116 | |
117 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
|
118 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
|
119 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
|
120 category table. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
121 (category, table) |
17052 | 122 Lisp_Object category, table; |
123 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
124 CHECK_CATEGORY (category); |
17052 | 125 table = check_category_table (table); |
126 | |
127 return CATEGORY_DOCSTRING (table, XFASTINT (category)); | |
128 } | |
129 | |
130 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category, | |
131 0, 1, 0, | |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
132 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
|
133 If no category remains available, return nil. |
54091
15dabc5988ff
(Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents:
52401
diff
changeset
|
134 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
|
135 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
|
136 (table) |
17052 | 137 Lisp_Object table; |
138 { | |
139 int i; | |
140 | |
141 table = check_category_table (table); | |
142 | |
143 for (i = ' '; i <= '~'; i++) | |
144 if (NILP (CATEGORY_DOCSTRING (table, i))) | |
145 return make_number (i); | |
146 | |
147 return Qnil; | |
148 } | |
149 | |
150 | |
151 /* Category-table staff. */ | |
152 | |
153 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
|
154 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
|
155 (arg) |
17052 | 156 Lisp_Object arg; |
157 { | |
158 if (CHAR_TABLE_P (arg) | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
159 && EQ (XCHAR_TABLE (arg)->purpose, Qcategory_table)) |
17052 | 160 return Qt; |
161 return Qnil; | |
162 } | |
163 | |
164 /* If TABLE is nil, return the current category table. If TABLE is | |
165 not nil, check the validity of TABLE as a category table. If | |
166 valid, return TABLE itself, but if not valid, signal an error of | |
167 wrong-type-argument. */ | |
168 | |
169 Lisp_Object | |
170 check_category_table (table) | |
171 Lisp_Object table; | |
172 { | |
173 if (NILP (table)) | |
174 return current_buffer->category_table; | |
71829
8adcaaf366b4
(check_category_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
175 CHECK_TYPE (!NILP (Fcategory_table_p (table)), Qcategory_table_p, table); |
17052 | 176 return table; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
177 } |
17052 | 178 |
179 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
|
180 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
|
181 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
|
182 () |
17052 | 183 { |
184 return current_buffer->category_table; | |
185 } | |
186 | |
187 DEFUN ("standard-category-table", Fstandard_category_table, | |
188 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
|
189 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
|
190 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
|
191 () |
17052 | 192 { |
193 return Vstandard_category_table; | |
194 } | |
195 | |
88359 | 196 |
197 static void | |
89483 | 198 copy_category_entry (table, c, val) |
199 Lisp_Object table, c, val; | |
88359 | 200 { |
89380
9320c2f4f351
(copy_category_entry): Fix for the case that RANGE is an integer.
Kenichi Handa <handa@m17n.org>
parents:
88850
diff
changeset
|
201 val = Fcopy_sequence (val); |
89483 | 202 if (CONSP (c)) |
203 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
|
204 else |
89483 | 205 char_table_set (table, XINT (c), val); |
88359 | 206 } |
207 | |
17052 | 208 /* Return a copy of category table TABLE. We can't simply use the |
209 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
|
210 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
|
211 binding TABLE to a sub char table. */ |
17052 | 212 |
213 Lisp_Object | |
17324
ed53084a1655
(category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents:
17187
diff
changeset
|
214 copy_category_table (table) |
17052 | 215 Lisp_Object table; |
216 { | |
88359 | 217 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
|
218 |
88359 | 219 if (! NILP (XCHAR_TABLE (table)->defalt)) |
220 XCHAR_TABLE (table)->defalt | |
221 = Fcopy_sequence (XCHAR_TABLE (table)->defalt); | |
222 XCHAR_TABLE (table)->extras[0] | |
223 = Fcopy_sequence (XCHAR_TABLE (table)->extras[0]); | |
89483 | 224 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
|
225 |
17052 | 226 return table; |
227 } | |
228 | |
229 DEFUN ("copy-category-table", Fcopy_category_table, Scopy_category_table, | |
230 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
|
231 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
|
232 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
|
233 (table) |
17052 | 234 Lisp_Object table; |
235 { | |
236 if (!NILP (table)) | |
237 check_category_table (table); | |
238 else | |
239 table = Vstandard_category_table; | |
240 | |
20189
16f5b56c2f68
(copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents:
19659
diff
changeset
|
241 return copy_category_table (table); |
17052 | 242 } |
243 | |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
244 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
|
245 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
|
246 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
|
247 () |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
248 { |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
249 Lisp_Object val; |
88359 | 250 int i; |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
251 |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
252 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
|
253 XCHAR_TABLE (val)->defalt = MAKE_CATEGORY_SET; |
89483 | 254 for (i = 0; i < (1 << CHARTAB_SIZE_BITS_0); i++) |
88359 | 255 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
|
256 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
|
257 Fmake_vector (make_number (95), Qnil)); |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
258 return val; |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
259 } |
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
260 |
17052 | 261 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
|
262 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
|
263 Return TABLE. */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
264 (table) |
17052 | 265 Lisp_Object table; |
266 { | |
28315
16ed41346de7
(Fset_category_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents:
26841
diff
changeset
|
267 int idx; |
17052 | 268 table = check_category_table (table); |
269 current_buffer->category_table = table; | |
270 /* Indicate that this buffer now has a specified category table. */ | |
28351 | 271 idx = PER_BUFFER_VAR_IDX (category_table); |
272 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1); | |
17052 | 273 return table; |
274 } | |
275 | |
276 | |
88359 | 277 Lisp_Object |
278 char_category_set (c) | |
279 int c; | |
280 { | |
281 return CHAR_TABLE_REF (current_buffer->category_table, c); | |
282 } | |
283 | |
17052 | 284 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
|
285 doc: /* Return the category set of CHAR. |
e74524ea3f55
(Fchar_category_set): Improve arg/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents:
71829
diff
changeset
|
286 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
|
287 (ch) |
17052 | 288 Lisp_Object ch; |
289 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
290 CHECK_NUMBER (ch); |
17052 | 291 return CATEGORY_SET (XFASTINT (ch)); |
292 } | |
293 | |
294 DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics, | |
295 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
|
296 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
|
297 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
|
298 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
|
299 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
|
300 (category_set) |
17052 | 301 Lisp_Object category_set; |
302 { | |
303 int i, j; | |
304 char str[96]; | |
305 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
306 CHECK_CATEGORY_SET (category_set); |
17052 | 307 |
308 j = 0; | |
309 for (i = 32; i < 127; i++) | |
310 if (CATEGORY_MEMBER (i, category_set)) | |
311 str[j++] = i; | |
312 str[j] = '\0'; | |
313 | |
314 return build_string (str); | |
315 } | |
316 | |
317 void | |
318 set_category_set (category_set, category, val) | |
319 Lisp_Object category_set, category, val; | |
320 { | |
321 do { | |
322 int idx = XINT (category) / 8; | |
323 unsigned char bits = 1 << (XINT (category) % 8); | |
324 | |
325 if (NILP (val)) | |
326 XCATEGORY_SET (category_set)->data[idx] &= ~bits; | |
327 else | |
328 XCATEGORY_SET (category_set)->data[idx] |= bits; | |
329 } while (0); | |
330 } | |
331 | |
332 DEFUN ("modify-category-entry", Fmodify_category_entry, | |
333 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
|
334 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
|
335 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
|
336 the current buffer's category table. |
6bd578d2b8af
(Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents:
88359
diff
changeset
|
337 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
|
338 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
|
339 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
|
340 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
|
341 (character, category, table, reset) |
20825
1b98a0ab1bee
(Fmodify_category_entry): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
20612
diff
changeset
|
342 Lisp_Object character, category, table, reset; |
17052 | 343 { |
344 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
|
345 Lisp_Object category_set; |
88359 | 346 int start, end; |
347 int from, to; | |
17052 | 348 |
88359 | 349 if (INTEGERP (character)) |
350 { | |
351 CHECK_CHARACTER (character); | |
352 start = end = XFASTINT (character); | |
353 } | |
354 else | |
355 { | |
356 CHECK_CONS (character); | |
89483 | 357 CHECK_CHARACTER_CAR (character); |
358 CHECK_CHARACTER_CDR (character); | |
88359 | 359 start = XFASTINT (XCAR (character)); |
360 end = XFASTINT (XCDR (character)); | |
361 } | |
362 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40103
diff
changeset
|
363 CHECK_CATEGORY (category); |
17052 | 364 table = check_category_table (table); |
365 | |
366 if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category)))) | |
367 error ("Undefined category: %c", XFASTINT (category)); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
368 |
17052 | 369 set_value = NILP (reset) ? Qt : Qnil; |
370 | |
88359 | 371 while (start <= end) |
17052 | 372 { |
88359 | 373 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
|
374 if (CATEGORY_MEMBER (XFASTINT (category), category_set) != NILP (reset)) |
88359 | 375 { |
88741
a93a8b796b91
(Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents:
88622
diff
changeset
|
376 category_set = Fcopy_sequence (category_set); |
a93a8b796b91
(Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents:
88622
diff
changeset
|
377 SET_CATEGORY_SET (category_set, category, set_value); |
88359 | 378 if (to > end) |
379 char_table_set_range (table, start, end, category_set); | |
380 else | |
381 char_table_set_range (table, start, to, category_set); | |
382 } | |
383 start = to + 1; | |
17052 | 384 } |
385 | |
386 return Qnil; | |
387 } | |
388 | |
389 /* Return 1 if there is a word boundary between two word-constituent | |
390 characters C1 and C2 if they appear in this order, else return 0. | |
391 Use the macro WORD_BOUNDARY_P instead of calling this function | |
392 directly. */ | |
393 | |
394 int | |
395 word_boundary_p (c1, c2) | |
396 int c1, c2; | |
397 { | |
398 Lisp_Object category_set1, category_set2; | |
399 Lisp_Object tail; | |
400 int default_result; | |
401 | |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
402 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
|
403 CHAR_TABLE_REF (Vchar_script_table, c2))) |
17052 | 404 { |
405 tail = Vword_separating_categories; | |
406 default_result = 0; | |
407 } | |
408 else | |
409 { | |
410 tail = Vword_combining_categories; | |
411 default_result = 1; | |
412 } | |
413 | |
414 category_set1 = CATEGORY_SET (c1); | |
415 if (NILP (category_set1)) | |
416 return default_result; | |
417 category_set2 = CATEGORY_SET (c2); | |
418 if (NILP (category_set2)) | |
419 return default_result; | |
420 | |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
421 for (; CONSP (tail); tail = XCDR (tail)) |
17052 | 422 { |
25662
0a7261c1d487
Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents:
23755
diff
changeset
|
423 Lisp_Object elt = XCAR (tail); |
17052 | 424 |
425 if (CONSP (elt) | |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
426 && (NILP (XCAR (elt)) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
427 || (CATEGORYP (XCAR (elt)) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
428 && CATEGORY_MEMBER (XFASTINT (XCAR (elt)), category_set1))) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
429 && (NILP (XCDR (elt)) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
430 || (CATEGORYP (XCDR (elt)) |
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
431 && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2)))) |
17052 | 432 return !default_result; |
433 } | |
434 return default_result; | |
435 } | |
436 | |
437 | |
21514 | 438 void |
17052 | 439 init_category_once () |
440 { | |
441 /* This has to be done here, before we call Fmake_char_table. */ | |
442 Qcategory_table = intern ("category-table"); | |
443 staticpro (&Qcategory_table); | |
444 | |
445 /* Intern this now in case it isn't already done. | |
446 Setting this variable twice is harmless. | |
447 But don't staticpro it here--that is done in alloc.c. */ | |
448 Qchar_table_extra_slots = intern ("char-table-extra-slots"); | |
449 | |
450 /* Now we are ready to set up this property, so we can | |
451 create category tables. */ | |
452 Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2)); | |
453 | |
454 Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46370
diff
changeset
|
455 /* Set a category set which contains nothing to the default. */ |
17052 | 456 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
|
457 Fset_char_table_extra_slot (Vstandard_category_table, make_number (0), |
17052 | 458 Fmake_vector (make_number (95), Qnil)); |
459 } | |
460 | |
21514 | 461 void |
17052 | 462 syms_of_category () |
463 { | |
464 Qcategoryp = intern ("categoryp"); | |
465 staticpro (&Qcategoryp); | |
466 Qcategorysetp = intern ("categorysetp"); | |
467 staticpro (&Qcategorysetp); | |
468 Qcategory_table_p = intern ("category-table-p"); | |
469 staticpro (&Qcategory_table_p); | |
470 | |
471 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
|
472 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
|
473 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
474 Emacs treats a sequence of word constituent characters as a single |
78501 | 475 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
|
476 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
|
477 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
478 \(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
|
479 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
|
480 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
481 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
|
482 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
|
483 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
484 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
|
485 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
|
486 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
|
487 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
488 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
|
489 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
|
490 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
|
491 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
492 \(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
|
493 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
|
494 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
495 Emacs find 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
|
496 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
|
497 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39748
diff
changeset
|
498 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
|
499 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
|
500 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
|
501 |
99016
3092df1e1b8a
(word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents:
94963
diff
changeset
|
502 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
|
503 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
|
504 the element `(?H . ?K) should be in this list. */); |
17052 | 505 |
506 Vword_combining_categories = Qnil; | |
507 | |
508 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
|
509 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
|
510 See the documentation of the variable `word-combining-categories'. */); |
17052 | 511 |
512 Vword_separating_categories = Qnil; | |
513 | |
514 defsubr (&Smake_category_set); | |
515 defsubr (&Sdefine_category); | |
516 defsubr (&Scategory_docstring); | |
517 defsubr (&Sget_unused_category); | |
518 defsubr (&Scategory_table_p); | |
519 defsubr (&Scategory_table); | |
520 defsubr (&Sstandard_category_table); | |
521 defsubr (&Scopy_category_table); | |
26841
dfead1ef574c
(word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents:
25835
diff
changeset
|
522 defsubr (&Smake_category_table); |
17052 | 523 defsubr (&Sset_category_table); |
524 defsubr (&Schar_category_set); | |
525 defsubr (&Scategory_set_mnemonics); | |
526 defsubr (&Smodify_category_entry); | |
527 | |
528 category_table_version = 0; | |
529 } | |
52401 | 530 |
531 /* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211 | |
532 (do not change this comment) */ |