annotate src/category.c @ 111107:f3721a6253a8

Fix mouse highlight in bidi-reordered continued lines. xdisp.c (row_containing_pos): Don't return too early when CHARPOS is in a bidi-reordered continued line. Return immediately when the first hit is found in a line that is not continued, or when an exact match for CHARPOS is found. (mouse_face_from_buffer_pos): Rewrite to not assume that START_CHARPOS is always in mouse_face_beg_row. If necessary, swap mouse_face_beg_row and mouse_face_end_row so that the former is always above the latter or identical to it. Continued lines that begin or end outside of the visible region still don't work.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 02 Oct 2010 17:05:20 +0200
parents 8cfee7d2955f
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1 /* GNU Emacs routines to deal with category tables.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105983
diff changeset
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
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105983
diff changeset
5 2005, 2006, 2007, 2008, 2009, 2010
67658
547f2b420666 Copyright fixed
Kenichi Handa <handa@m17n.org>
parents: 64084
diff changeset
6 National Institute of Advanced Industrial Science and Technology (AIST)
547f2b420666 Copyright fixed
Kenichi Handa <handa@m17n.org>
parents: 64084
diff changeset
7 Registration Number H14PRO021
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
8 Copyright (C) 2003
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
9 National Institute of Advanced Industrial Science and Technology (AIST)
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
10 Registration Number H13PRO009
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
11
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
12 This file is part of GNU Emacs.
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
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
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
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
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
18
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
19 GNU Emacs is distributed in the hope that it will be useful,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
20 but WITHOUT ANY WARRANTY; without even the implied warranty of
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
22 GNU General Public License for more details.
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
23
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
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
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
26
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
27
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
28 /* Here we handle three objects: category, category set, and category
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
29 table. Read comments in the file category.h to understand them. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
30
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
31 #include <config.h>
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
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
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
34 #include "lisp.h"
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
35 #include "buffer.h"
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
36 #include "character.h"
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
37 #include "charset.h"
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
38 #include "category.h"
39748
42b7a798ff79 Include keymap.h.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 34984
diff changeset
39 #include "keymap.h"
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
40
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
41 /* The version number of the latest category table. Each category
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
42 table has a unique version number. It is assigned a new number
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
43 also when it is modified. When a regular expression is compiled
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
44 into the struct re_pattern_buffer, the version number of the
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
45 category table (of the current buffer) at that moment is also
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
46 embedded in the structure.
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
47
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
48 For the moment, we are not using this feature. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
49 static int category_table_version;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
50
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
51 Lisp_Object Qcategory_table, Qcategoryp, Qcategorysetp, Qcategory_table_p;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
52
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
53 /* Variables to determine word boundary. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
54 Lisp_Object Vword_combining_categories, Vword_separating_categories;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
55
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
56 /* Temporary internal variable used in macro CHAR_HAS_CATEGORY. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
57 Lisp_Object _temp_category_set;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
58
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
59
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
60 /* Category set staff. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
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
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
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. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
92 (Lisp_Object categories)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
93 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
94 Lisp_Object val;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
95 int len;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
96
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
97 CHECK_STRING (categories);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
98 val = MAKE_CATEGORY_SET;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
99
20612
5a0922f8c841 (Fmake_category_set): Don't allow multibyte string.
Richard M. Stallman <rms@gnu.org>
parents: 20189
diff changeset
100 if (STRING_MULTIBYTE (categories))
63694
8f10ba0f0a86 (Fmake_category_set): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents: 54091
diff changeset
101 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
102
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 41643
diff changeset
103 len = SCHARS (categories);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
104 while (--len >= 0)
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
105 {
17369
566b26e1930e (Fmake_category_set): Use XSETFASTINT.
Karl Heuer <kwzh@gnu.org>
parents: 17324
diff changeset
106 Lisp_Object category;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
107
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 41643
diff changeset
108 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
109 CHECK_CATEGORY (category);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
110 SET_CATEGORY_SET (val, category, Qt);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
111 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
112 return val;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
113 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
114
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
115
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116 /* Category staff. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
117
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
118 Lisp_Object check_category_table (Lisp_Object table);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
119
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
120 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
121 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
122 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
123 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
124 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
125 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
126 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
127 the current buffer's category table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
128 (Lisp_Object category, Lisp_Object docstring, Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
129 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
130 CHECK_CATEGORY (category);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
131 CHECK_STRING (docstring);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
132 table = check_category_table (table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
133
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
134 if (!NILP (CATEGORY_DOCSTRING (table, XFASTINT (category))))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
135 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
136 if (!NILP (Vpurify_flag))
b0a732611398 * keymap.c (Fmake_sparse_keymap): Purecopy the name.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
137 docstring = Fpurecopy (docstring);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
138 CATEGORY_DOCSTRING (table, XFASTINT (category)) = docstring;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
139
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
140 return Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
141 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
142
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
143 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
144 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
145 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
146 category table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
147 (Lisp_Object category, Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
148 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
149 CHECK_CATEGORY (category);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
150 table = check_category_table (table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
151
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
152 return CATEGORY_DOCSTRING (table, XFASTINT (category));
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
153 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
154
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
155 DEFUN ("get-unused-category", Fget_unused_category, Sget_unused_category,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
156 0, 1, 0,
54091
15dabc5988ff (Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
157 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
158 If no category remains available, return nil.
54091
15dabc5988ff (Fdefine_category, Fcategory_docstring)
Luc Teirlinck <teirllm@auburn.edu>
parents: 52401
diff changeset
159 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
160 it defaults to the current buffer's category table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
161 (Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
162 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
163 int i;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
164
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
165 table = check_category_table (table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
166
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
167 for (i = ' '; i <= '~'; i++)
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
168 if (NILP (CATEGORY_DOCSTRING (table, i)))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
169 return make_number (i);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
170
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
171 return Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
172 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
173
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
174
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
175 /* Category-table staff. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
176
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
177 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
178 doc: /* Return t if ARG is a category table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
179 (Lisp_Object arg)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
180 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
181 if (CHAR_TABLE_P (arg)
17324
ed53084a1655 (category-table-p): Check only type and purpose.
Kenichi Handa <handa@m17n.org>
parents: 17187
diff changeset
182 && EQ (XCHAR_TABLE (arg)->purpose, Qcategory_table))
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
183 return Qt;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
184 return Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
185 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
186
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
187 /* If TABLE is nil, return the current category table. If TABLE is
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
188 not nil, check the validity of TABLE as a category table. If
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
189 valid, return TABLE itself, but if not valid, signal an error of
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
190 wrong-type-argument. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
191
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
192 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
193 check_category_table (Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
194 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
195 if (NILP (table))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
196 return current_buffer->category_table;
71829
8adcaaf366b4 (check_category_table): Use CHECK_TYPE.
Kim F. Storm <storm@cua.dk>
parents: 68651
diff changeset
197 CHECK_TYPE (!NILP (Fcategory_table_p (table)), Qcategory_table_p, table);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
198 return table;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
199 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
200
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
201 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
202 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
203 This is the one specified by the current buffer. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
204 (void)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
205 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
206 return current_buffer->category_table;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
207 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
208
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
209 DEFUN ("standard-category-table", Fstandard_category_table,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
210 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
211 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
212 This is the one used for new buffers. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
213 (void)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
214 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215 return Vstandard_category_table;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
216 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
217
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
218
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
219 static void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
220 copy_category_entry (Lisp_Object table, Lisp_Object c, Lisp_Object val)
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
221 {
89380
9320c2f4f351 (copy_category_entry): Fix for the case that RANGE is an integer.
Kenichi Handa <handa@m17n.org>
parents: 88850
diff changeset
222 val = Fcopy_sequence (val);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
223 if (CONSP (c))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
224 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
225 else
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
226 char_table_set (table, XINT (c), val);
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
227 }
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
228
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
229 /* Return a copy of category table TABLE. We can't simply use the
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
230 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
231 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
232 binding TABLE to a sub char table. */
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
233
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
234 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
235 copy_category_table (Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
236 {
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
237 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
238
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
239 if (! NILP (XCHAR_TABLE (table)->defalt))
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
240 XCHAR_TABLE (table)->defalt
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
241 = Fcopy_sequence (XCHAR_TABLE (table)->defalt);
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
242 XCHAR_TABLE (table)->extras[0]
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
243 = Fcopy_sequence (XCHAR_TABLE (table)->extras[0]);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
244 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
245
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
246 return table;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
247 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
248
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
249 DEFUN ("copy-category-table", Fcopy_category_table, Scopy_category_table,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
250 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
251 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
252 It is a copy of the TABLE, which defaults to the standard category table. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
253 (Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
254 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
255 if (!NILP (table))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
256 check_category_table (table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
257 else
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
258 table = Vstandard_category_table;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
259
20189
16f5b56c2f68 (copy_category_table): Copy also the first extra slot
Kenichi Handa <handa@m17n.org>
parents: 19659
diff changeset
260 return copy_category_table (table);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
261 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
262
26841
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
263 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
264 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
265 doc: /* Construct a new and empty category table and return it. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
266 (void)
26841
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
267 {
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
268 Lisp_Object val;
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
269 int i;
26841
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
270
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
271 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
272 XCHAR_TABLE (val)->defalt = MAKE_CATEGORY_SET;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
273 for (i = 0; i < (1 << CHARTAB_SIZE_BITS_0); i++)
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
274 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
275 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
276 Fmake_vector (make_number (95), Qnil));
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
277 return val;
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
278 }
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
279
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
280 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
281 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
282 Return TABLE. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
283 (Lisp_Object table)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
284 {
28315
16ed41346de7 (Fset_category_table): Use new macros for per-buffer
Gerd Moellmann <gerd@gnu.org>
parents: 26841
diff changeset
285 int idx;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
286 table = check_category_table (table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
287 current_buffer->category_table = table;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
288 /* Indicate that this buffer now has a specified category table. */
28351
e3d57f7fba49 Use new macro names
Gerd Moellmann <gerd@gnu.org>
parents: 28315
diff changeset
289 idx = PER_BUFFER_VAR_IDX (category_table);
e3d57f7fba49 Use new macro names
Gerd Moellmann <gerd@gnu.org>
parents: 28315
diff changeset
290 SET_PER_BUFFER_VALUE_P (current_buffer, idx, 1);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
291 return table;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
292 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
293
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
294
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
295 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
296 char_category_set (int c)
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
297 {
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
298 return CHAR_TABLE_REF (current_buffer->category_table, c);
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
299 }
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
300
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
301 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
302 doc: /* Return the category set of CHAR.
e74524ea3f55 (Fchar_category_set): Improve arg/docstring consistency.
Juanma Barranquero <lekktu@gmail.com>
parents: 71829
diff changeset
303 usage: (char-category-set CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
304 (Lisp_Object ch)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
305 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
306 CHECK_NUMBER (ch);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
307 return CATEGORY_SET (XFASTINT (ch));
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
308 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
309
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
310 DEFUN ("category-set-mnemonics", Fcategory_set_mnemonics,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
311 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
312 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
313 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
314 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
315 The return value is a string containing those same categories. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
316 (Lisp_Object category_set)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
318 int i, j;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
319 char str[96];
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
320
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
321 CHECK_CATEGORY_SET (category_set);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
322
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
323 j = 0;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
324 for (i = 32; i < 127; i++)
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
325 if (CATEGORY_MEMBER (i, category_set))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 str[j++] = i;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
327 str[j] = '\0';
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
328
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
329 return build_string (str);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
330 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
331
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
332 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
333 set_category_set (Lisp_Object category_set, Lisp_Object category, Lisp_Object val)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
334 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
335 do {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
336 int idx = XINT (category) / 8;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
337 unsigned char bits = 1 << (XINT (category) % 8);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
338
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
339 if (NILP (val))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
340 XCATEGORY_SET (category_set)->data[idx] &= ~bits;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
341 else
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
342 XCATEGORY_SET (category_set)->data[idx] |= bits;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
343 } while (0);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
344 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
345
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
346 DEFUN ("modify-category-entry", Fmodify_category_entry,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
347 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
348 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
349 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
350 the current buffer's category table.
6bd578d2b8af (Fmodify_category_entry): Doc fix. Remove unused
Dave Love <fx@gnu.org>
parents: 88359
diff changeset
351 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
352 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
353 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
354 then delete CATEGORY from the category set instead of adding it. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109126
diff changeset
355 (Lisp_Object character, Lisp_Object category, Lisp_Object table, Lisp_Object reset)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
356 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
357 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
358 Lisp_Object category_set;
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
359 int start, end;
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
360 int from, to;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
361
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
362 if (INTEGERP (character))
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
363 {
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
364 CHECK_CHARACTER (character);
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
365 start = end = XFASTINT (character);
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
366 }
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
367 else
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
368 {
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
369 CHECK_CONS (character);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
370 CHECK_CHARACTER_CAR (character);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89380
diff changeset
371 CHECK_CHARACTER_CDR (character);
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
372 start = XFASTINT (XCAR (character));
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
373 end = XFASTINT (XCDR (character));
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
374 }
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
375
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40103
diff changeset
376 CHECK_CATEGORY (category);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
377 table = check_category_table (table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
378
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
379 if (NILP (CATEGORY_DOCSTRING (table, XFASTINT (category))))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
380 error ("Undefined category: %c", XFASTINT (category));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
381
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
382 set_value = NILP (reset) ? Qt : Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
383
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
384 while (start <= end)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
385 {
99975
dddfb4772d33 (hash_get_category_set): New function.
Kenichi Handa <handa@m17n.org>
parents: 99197
diff changeset
386 from = start, to = end;
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
387 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
388 if (CATEGORY_MEMBER (XFASTINT (category), category_set) != NILP (reset))
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
389 {
88741
a93a8b796b91 (Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents: 88622
diff changeset
390 category_set = Fcopy_sequence (category_set);
a93a8b796b91 (Fmodify_category_entry): Don't modify the contents
Kenichi Handa <handa@m17n.org>
parents: 88622
diff changeset
391 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
392 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
393 char_table_set_range (table, start, to, category_set);
88359
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
394 }
e7224dffd53f Include "character.h".
Kenichi Handa <handa@m17n.org>
parents: 41643
diff changeset
395 start = to + 1;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
396 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
397
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
398 return Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
399 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
400
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
401 /* Return 1 if there is a word boundary between two word-constituent
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
402 characters C1 and C2 if they appear in this order, else return 0.
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
403 Use the macro WORD_BOUNDARY_P instead of calling this function
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
404 directly. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
405
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
406 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
407 word_boundary_p (int c1, int c2)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
408 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
409 Lisp_Object category_set1, category_set2;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
410 Lisp_Object tail;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
411 int default_result;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
412
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
413 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
414 CHAR_TABLE_REF (Vchar_script_table, c2)))
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
415 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
416 tail = Vword_separating_categories;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
417 default_result = 0;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
418 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
419 else
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
420 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
421 tail = Vword_combining_categories;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
422 default_result = 1;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
423 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
424
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
425 category_set1 = CATEGORY_SET (c1);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
426 if (NILP (category_set1))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
427 return default_result;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
428 category_set2 = CATEGORY_SET (c2);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
429 if (NILP (category_set2))
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
430 return default_result;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
431
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 23755
diff changeset
432 for (; CONSP (tail); tail = XCDR (tail))
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
433 {
25662
0a7261c1d487 Use XCAR, XCDR, and XFLOAT_DATA instead of explicit member access.
Ken Raeburn <raeburn@raeburn.org>
parents: 23755
diff changeset
434 Lisp_Object elt = XCAR (tail);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
435
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
436 if (CONSP (elt)
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
437 && (NILP (XCAR (elt))
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
438 || (CATEGORYP (XCAR (elt))
105983
0bc34ff12a2d (word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents: 105877
diff changeset
439 && 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
440 && ! 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
441 && (NILP (XCDR (elt))
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
442 || (CATEGORYP (XCDR (elt))
105983
0bc34ff12a2d (word_boundary_p): Adjusted for the change of the
Kenichi Handa <handa@m17n.org>
parents: 105877
diff changeset
443 && ! 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
444 && CATEGORY_MEMBER (XFASTINT (XCDR (elt)), category_set2))))
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
445 return !default_result;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
446 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
447 return default_result;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
448 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
449
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
450
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
451 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
452 init_category_once (void)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
453 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
454 /* 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
455 Qcategory_table = intern_c_string ("category-table");
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
456 staticpro (&Qcategory_table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
457
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
458 /* Intern this now in case it isn't already done.
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
459 Setting this variable twice is harmless.
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
460 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
461 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
462
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
463 /* Now we are ready to set up this property, so we can
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
464 create category tables. */
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
465 Fput (Qcategory_table, Qchar_table_extra_slots, make_number (2));
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
466
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
467 Vstandard_category_table = Fmake_char_table (Qcategory_table, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 46370
diff changeset
468 /* Set a category set which contains nothing to the default. */
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
469 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
470 Fset_char_table_extra_slot (Vstandard_category_table, make_number (0),
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
471 Fmake_vector (make_number (95), Qnil));
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
472 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
473
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21244
diff changeset
474 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109100
diff changeset
475 syms_of_category (void)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
476 {
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105744
diff changeset
477 Qcategoryp = intern_c_string ("categoryp");
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
478 staticpro (&Qcategoryp);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105744
diff changeset
479 Qcategorysetp = intern_c_string ("categorysetp");
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
480 staticpro (&Qcategorysetp);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105744
diff changeset
481 Qcategory_table_p = intern_c_string ("category-table-p");
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
482 staticpro (&Qcategory_table_p);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
483
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
484 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
485 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
486
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39748
diff changeset
487 Emacs treats a sequence of word constituent characters as a single
78501
1677cf1c2509 Replace `iff' in comments.
Glenn Morris <rgm@gnu.org>
parents: 78313
diff changeset
488 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
489 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
490
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
491 \(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
492 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
493
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
494 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
495 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
496
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39748
diff changeset
497 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
498 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
499 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
500
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
501 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
502 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
503 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
504
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
505 \(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
506 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
507
99197
7548cef42245 (syms_of_category): Fix typo in docstring.
Reiner Steib <Reiner.Steib@gmx.de>
parents: 99117
diff changeset
508 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
509 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
510
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39748
diff changeset
511 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
512 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
513 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
514 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
515
99016
3092df1e1b8a (word_boundary_p): Check scripts instead of charset.
Kenichi Handa <handa@m17n.org>
parents: 94963
diff changeset
516 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
517 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
518 the element `(?H . ?K) should be in this list. */);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
519
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
520 Vword_combining_categories = Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
521
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
522 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
523 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
524 See the documentation of the variable `word-combining-categories'. */);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
525
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
526 Vword_separating_categories = Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
527
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
528 defsubr (&Smake_category_set);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
529 defsubr (&Sdefine_category);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
530 defsubr (&Scategory_docstring);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
531 defsubr (&Sget_unused_category);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
532 defsubr (&Scategory_table_p);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
533 defsubr (&Scategory_table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
534 defsubr (&Sstandard_category_table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
535 defsubr (&Scopy_category_table);
26841
dfead1ef574c (word_boundary_p): Delete codes for a composite
Kenichi Handa <handa@m17n.org>
parents: 25835
diff changeset
536 defsubr (&Smake_category_table);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
537 defsubr (&Sset_category_table);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
538 defsubr (&Schar_category_set);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
539 defsubr (&Scategory_set_mnemonics);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
540 defsubr (&Smodify_category_entry);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
541
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
542 category_table_version = 0;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
543 }
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
544
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
545 /* arch-tag: 74ebf524-121b-4d9c-bd68-07f8d708b211
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 49600
diff changeset
546 (do not change this comment) */