Mercurial > emacs
annotate src/charset.c @ 112429:6e50030da731
Some copyright.el updates.
* lisp/emacs-lisp/copyright.el (copyright-find-copyright): New function,
split out from copyright-update-year.
(copyright-update): Don't mess with the GPL version if we don't own the
copyright. Update license regexp, and remove no longer needed
Esperanto stuff.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 22 Jan 2011 14:09:09 -0800 |
parents | 42e22c4f06b7 |
children | 9de5a68b57e1 |
rev | line source |
---|---|
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1 /* Basic character set support. |
98152
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
111743
diff
changeset
|
3 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
74605
6ee41fdd69ff
Update AIST copyright years.
Kenichi Handa <handa@m17n.org>
parents:
68651
diff
changeset
|
4 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
111743
diff
changeset
|
5 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
67658 | 6 National Institute of Advanced Industrial Science and Technology (AIST) |
7 Registration Number H14PRO021 | |
17052 | 8 |
89943
4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Miles Bader <miles@gnu.org>
diff
changeset
|
9 Copyright (C) 2003, 2004 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
10 National Institute of Advanced Industrial Science and Technology (AIST) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
11 Registration Number H13PRO009 |
17052 | 12 |
17071 | 13 This file is part of GNU Emacs. |
14 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94921
diff
changeset
|
15 GNU Emacs is free software: you can redistribute it and/or modify |
17071 | 16 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:
94921
diff
changeset
|
17 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:
94921
diff
changeset
|
18 (at your option) any later version. |
17052 | 19 |
17071 | 20 GNU Emacs is distributed in the hope that it will be useful, |
21 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
23 GNU General Public License for more details. | |
17052 | 24 |
17071 | 25 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:
94921
diff
changeset
|
26 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
17052 | 27 |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25611
diff
changeset
|
28 #include <config.h> |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25611
diff
changeset
|
29 |
17052 | 30 #include <stdio.h> |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
31 #include <unistd.h> |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
32 #include <ctype.h> |
17052 | 33 #include <sys/types.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105661
diff
changeset
|
34 #include <setjmp.h> |
17052 | 35 #include "lisp.h" |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
36 #include "character.h" |
17052 | 37 #include "charset.h" |
38 #include "coding.h" | |
17843 | 39 #include "disptab.h" |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
40 #include "buffer.h" |
17052 | 41 |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
42 /*** GENERAL NOTES on CODED CHARACTER SETS (CHARSETS) *** |
17052 | 43 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
44 A coded character set ("charset" hereafter) is a meaningful |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
45 collection (i.e. language, culture, functionality, etc.) of |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
46 characters. Emacs handles multiple charsets at once. In Emacs Lisp |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
47 code, a charset is represented by a symbol. In C code, a charset is |
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
48 represented by its ID number or by a pointer to a struct charset. |
17052 | 49 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
50 The actual information about each charset is stored in two places. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
51 Lispy information is stored in the hash table Vcharset_hash_table as |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
52 a vector (charset attributes). The other information is stored in |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
53 charset_table as a struct charset. |
17052 | 54 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
55 */ |
17052 | 56 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
57 /* Hash table that contains attributes of each charset. Keys are |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
58 charset symbols, and values are vectors of charset attributes. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
59 Lisp_Object Vcharset_hash_table; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
60 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
61 /* Table of struct charset. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
62 struct charset *charset_table; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
63 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
64 static int charset_table_size; |
89683
d3302f68a7cf
(charset_table_used): Make it static.
Kenichi Handa <handa@m17n.org>
parents:
89645
diff
changeset
|
65 static int charset_table_used; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
66 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
67 Lisp_Object Qcharsetp; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
68 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
69 /* Special charset symbols. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
70 Lisp_Object Qascii; |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
71 Lisp_Object Qeight_bit; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
72 Lisp_Object Qiso_8859_1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
73 Lisp_Object Qunicode; |
95260
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
74 Lisp_Object Qemacs; |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
75 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
76 /* The corresponding charsets. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
77 int charset_ascii; |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
78 int charset_eight_bit; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
79 int charset_iso_8859_1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
80 int charset_unicode; |
95260
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
81 int charset_emacs; |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
82 |
88683
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
83 /* The other special charsets. */ |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
84 int charset_jisx0201_roman; |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
85 int charset_jisx0208_1978; |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
86 int charset_jisx0208; |
102986
02685d936706
(charset_ksc5601): New variable.
Kenichi Handa <handa@m17n.org>
parents:
102955
diff
changeset
|
87 int charset_ksc5601; |
88683
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
88 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
89 /* Value of charset attribute `charset-iso-plane'. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
90 Lisp_Object Qgl, Qgr; |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
91 |
88985
cafb04d00ef2
(charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents:
88957
diff
changeset
|
92 /* Charset of unibyte characters. */ |
cafb04d00ef2
(charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents:
88957
diff
changeset
|
93 int charset_unibyte; |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
94 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
95 /* List of charsets ordered by the priority. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
96 Lisp_Object Vcharset_ordered_list; |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
97 |
94921
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
98 /* Sub-list of Vcharset_ordered_list that contains all non-preferred |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
99 charsets. */ |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
100 Lisp_Object Vcharset_non_preferred_head; |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
101 |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
102 /* Incremented everytime we change Vcharset_ordered_list. This is |
88927
cd7645c9842b
Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents:
88881
diff
changeset
|
103 unsigned short so that it fits in Lisp_Int and never matches |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
104 -1. */ |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
105 unsigned short charset_ordered_list_tick; |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
106 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
107 /* List of iso-2022 charsets. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
108 Lisp_Object Viso_2022_charset_list; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
109 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
110 /* List of emacs-mule charsets. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
111 Lisp_Object Vemacs_mule_charset_list; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
112 |
111743
913b779aa4ee
Fix decoding of emacs-mule coding system.
Kenichi Handa <handa@m17n.org>
parents:
109710
diff
changeset
|
113 int emacs_mule_charset[256]; |
17052 | 114 |
115 /* Mapping table from ISO2022's charset (specified by DIMENSION, | |
116 CHARS, and FINAL-CHAR) to Emacs' charset. */ | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
117 int iso_charset_table[ISO_MAX_DIMENSION][ISO_MAX_CHARS][ISO_MAX_FINAL]; |
17052 | 118 |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
119 #define CODE_POINT_TO_INDEX(charset, code) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
120 ((charset)->code_linear_p \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
121 ? (code) - (charset)->min_code \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
122 : (((charset)->code_space_mask[(code) >> 24] & 0x8) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
123 && ((charset)->code_space_mask[((code) >> 16) & 0xFF] & 0x4) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
124 && ((charset)->code_space_mask[((code) >> 8) & 0xFF] & 0x2) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
125 && ((charset)->code_space_mask[(code) & 0xFF] & 0x1)) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
126 ? (((((code) >> 24) - (charset)->code_space[12]) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
127 * (charset)->code_space[11]) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
128 + (((((code) >> 16) & 0xFF) - (charset)->code_space[8]) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
129 * (charset)->code_space[7]) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
130 + (((((code) >> 8) & 0xFF) - (charset)->code_space[4]) \ |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
131 * (charset)->code_space[3]) \ |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
132 + (((code) & 0xFF) - (charset)->code_space[0]) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
133 - ((charset)->char_index_offset)) \ |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
134 : -1) |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
135 |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
136 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
137 /* Convert the character index IDX to code-point CODE for CHARSET. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
138 It is assumed that IDX is in a valid range. */ |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
139 |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
140 #define INDEX_TO_CODE_POINT(charset, idx) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
141 ((charset)->code_linear_p \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
142 ? (idx) + (charset)->min_code \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
143 : (idx += (charset)->char_index_offset, \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
144 (((charset)->code_space[0] + (idx) % (charset)->code_space[2]) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
145 | (((charset)->code_space[4] \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
146 + ((idx) / (charset)->code_space[3] % (charset)->code_space[6])) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
147 << 8) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
148 | (((charset)->code_space[8] \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
149 + ((idx) / (charset)->code_space[7] % (charset)->code_space[10])) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
150 << 16) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
151 | (((charset)->code_space[12] + ((idx) / (charset)->code_space[11])) \ |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
152 << 24)))) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
153 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
154 /* Structure to hold mapping tables for a charset. Used by temacs |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
155 invoked for dumping. */ |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
156 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
157 static struct |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
158 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
159 /* The current charset for which the following tables are setup. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
160 struct charset *current; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
161 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
162 /* 1 iff the following table is used for encoder. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
163 short for_encoder; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
164 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
165 /* When the following table is used for encoding, mininum and |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
166 maxinum character of the current charset. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
167 int min_char, max_char; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
168 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
169 /* A Unicode character correspoinding to the code indice 0 (i.e. the |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
170 minimum code-point) of the current charset, or -1 if the code |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
171 indice 0 is not a Unicode character. This is checked when |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
172 table.encoder[CHAR] is zero. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
173 int zero_index_char; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
174 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
175 union { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
176 /* Table mapping code-indices (not code-points) of the current |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
177 charset to Unicode characters. If decoder[CHAR] is -1, CHAR |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
178 doesn't belong to the current charset. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
179 int decoder[0x10000]; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
180 /* Table mapping Unicode characters to code-indices of the current |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
181 charset. The first 0x10000 elements are for BMP (0..0xFFFF), |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
182 and the last 0x10000 are for SMP (0x10000..0x1FFFF) or SIP |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
183 (0x20000..0x2FFFF). Note that there is no charset map that |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
184 uses both SMP and SIP. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
185 unsigned short encoder[0x20000]; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
186 } table; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
187 } *temp_charset_work; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
188 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
189 #define SET_TEMP_CHARSET_WORK_ENCODER(C, CODE) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
190 do { \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
191 if ((CODE) == 0) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
192 temp_charset_work->zero_index_char = (C); \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
193 else if ((C) < 0x20000) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
194 temp_charset_work->table.encoder[(C)] = (CODE); \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
195 else \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
196 temp_charset_work->table.encoder[(C) - 0x10000] = (CODE); \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
197 } while (0) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
198 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
199 #define GET_TEMP_CHARSET_WORK_ENCODER(C) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
200 ((C) == temp_charset_work->zero_index_char ? 0 \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
201 : (C) < 0x20000 ? (temp_charset_work->table.encoder[(C)] \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
202 ? (int) temp_charset_work->table.encoder[(C)] : -1) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
203 : temp_charset_work->table.encoder[(C) - 0x10000] \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
204 ? temp_charset_work->table.encoder[(C) - 0x10000] : -1) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
205 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
206 #define SET_TEMP_CHARSET_WORK_DECODER(C, CODE) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
207 (temp_charset_work->table.decoder[(CODE)] = (C)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
208 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
209 #define GET_TEMP_CHARSET_WORK_DECODER(CODE) \ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
210 (temp_charset_work->table.decoder[(CODE)]) |
19384 | 211 |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
212 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
213 /* Set to 1 to warn that a charset map is loaded and thus a buffer |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
214 text and a string data may be relocated. */ |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
215 int charset_map_loaded; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
216 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
217 struct charset_map_entries |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
218 { |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
219 struct { |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
220 unsigned from, to; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
221 int c; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
222 } entry[0x10000]; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
223 struct charset_map_entries *next; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
224 }; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
225 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
226 /* Load the mapping information of CHARSET from ENTRIES for |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
227 initializing (CONTROL_FLAG == 0), decoding (CONTROL_FLAG == 1), and |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
228 encoding (CONTROL_FLAG == 2). |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
229 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
230 If CONTROL_FLAG is 0, setup CHARSET->min_char, CHARSET->max_char, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
231 and CHARSET->fast_map. |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
232 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
233 If CONTROL_FLAG is 1, setup the following tables according to |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
234 CHARSET->method and inhibit_load_charset_map. |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
235 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
236 CHARSET->method | inhibit_lcm == 0 | inhibit_lcm == 1 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
237 ----------------------+--------------------+--------------------------- |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
238 CHARSET_METHOD_MAP | CHARSET->decoder | temp_charset_work->decoder |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
239 ----------------------+--------------------+--------------------------- |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
240 CHARSET_METHOD_OFFSET | Vchar_unify_table | temp_charset_work->decoder |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
241 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
242 If CONTROL_FLAG is 2, setup the following tables. |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
243 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
244 CHARSET->method | inhibit_lcm == 0 | inhibit_lcm == 1 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
245 ----------------------+--------------------+--------------------------- |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
246 CHARSET_METHOD_MAP | CHARSET->encoder | temp_charset_work->encoder |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
247 ----------------------+--------------------+-------------------------- |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
248 CHARSET_METHOD_OFFSET | CHARSET->deunifier | temp_charset_work->encoder |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
249 */ |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
250 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
251 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
252 load_charset_map (struct charset *charset, struct charset_map_entries *entries, int n_entries, int control_flag) |
17052 | 253 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
254 Lisp_Object vec, table; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
255 unsigned max_code = CHARSET_MAX_CODE (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
256 int ascii_compatible_p = charset->ascii_compatible_p; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
257 int min_char, max_char, nonascii_min_char; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
258 int i; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
259 unsigned char *fast_map = charset->fast_map; |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
260 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
261 if (n_entries <= 0) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
262 return; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
263 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
264 if (control_flag) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
265 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
266 if (! inhibit_load_charset_map) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
267 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
268 if (control_flag == 1) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
269 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
270 if (charset->method == CHARSET_METHOD_MAP) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
271 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
272 int n = CODE_POINT_TO_INDEX (charset, max_code) + 1; |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
273 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
274 vec = CHARSET_DECODER (charset) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
275 = Fmake_vector (make_number (n), make_number (-1)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
276 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
277 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
278 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
279 char_table_set_range (Vchar_unify_table, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
280 charset->min_char, charset->max_char, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
281 Qnil); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
282 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
283 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
284 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
285 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
286 table = Fmake_char_table (Qnil, Qnil); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
287 if (charset->method == CHARSET_METHOD_MAP) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
288 CHARSET_ENCODER (charset) = table; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
289 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
290 CHARSET_DEUNIFIER (charset) = table; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
291 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
292 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
293 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
294 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
295 if (! temp_charset_work) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
296 temp_charset_work = malloc (sizeof (*temp_charset_work)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
297 if (control_flag == 1) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
298 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
299 memset (temp_charset_work->table.decoder, -1, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
300 sizeof (int) * 0x10000); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
301 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
302 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
303 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
304 memset (temp_charset_work->table.encoder, 0, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
305 sizeof (unsigned short) * 0x20000); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
306 temp_charset_work->zero_index_char = -1; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
307 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
308 temp_charset_work->current = charset; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
309 temp_charset_work->for_encoder = (control_flag == 2); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
310 control_flag += 2; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
311 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
312 charset_map_loaded = 1; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
313 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48317
diff
changeset
|
314 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
315 min_char = max_char = entries->entry[0].c; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
316 nonascii_min_char = MAX_CHAR; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
317 for (i = 0; i < n_entries; i++) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
318 { |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
319 unsigned from, to; |
88696
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
320 int from_index, to_index; |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
321 int from_c, to_c; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
322 int idx = i % 0x10000; |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
323 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
324 if (i > 0 && idx == 0) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
325 entries = entries->next; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
326 from = entries->entry[idx].from; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
327 to = entries->entry[idx].to; |
88696
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
328 from_c = entries->entry[idx].c; |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
329 from_index = CODE_POINT_TO_INDEX (charset, from); |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
330 if (from == to) |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
331 { |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
332 to_index = from_index; |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
333 to_c = from_c; |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
334 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
335 else |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
336 { |
88696
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
337 to_index = CODE_POINT_TO_INDEX (charset, to); |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
338 to_c = from_c + (to_index - from_index); |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
339 } |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
340 if (from_index < 0 || to_index < 0) |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
341 continue; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
342 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
343 if (to_c > max_char) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
344 max_char = to_c; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
345 else if (from_c < min_char) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
346 min_char = from_c; |
88696
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
347 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
348 if (control_flag == 1) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
349 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
350 if (charset->method == CHARSET_METHOD_MAP) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
351 for (; from_index <= to_index; from_index++, from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
352 ASET (vec, from_index, make_number (from_c)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
353 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
354 for (; from_index <= to_index; from_index++, from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
355 CHAR_TABLE_SET (Vchar_unify_table, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
356 CHARSET_CODE_OFFSET (charset) + from_index, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
357 make_number (from_c)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
358 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
359 else if (control_flag == 2) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
360 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
361 if (charset->method == CHARSET_METHOD_MAP |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
362 && CHARSET_COMPACT_CODES_P (charset)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
363 for (; from_index <= to_index; from_index++, from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
364 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
365 unsigned code = INDEX_TO_CODE_POINT (charset, from_index); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
366 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
367 if (NILP (CHAR_TABLE_REF (table, from_c))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
368 CHAR_TABLE_SET (table, from_c, make_number (code)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
369 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
370 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
371 for (; from_index <= to_index; from_index++, from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
372 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
373 if (NILP (CHAR_TABLE_REF (table, from_c))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
374 CHAR_TABLE_SET (table, from_c, make_number (from_index)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
375 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
376 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
377 else if (control_flag == 3) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
378 for (; from_index <= to_index; from_index++, from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
379 SET_TEMP_CHARSET_WORK_DECODER (from_c, from_index); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
380 else if (control_flag == 4) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
381 for (; from_index <= to_index; from_index++, from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
382 SET_TEMP_CHARSET_WORK_ENCODER (from_c, from_index); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
383 else /* control_flag == 0 */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
384 { |
88696
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
385 if (ascii_compatible_p) |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
386 { |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
387 if (! ASCII_BYTE_P (from_c)) |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
388 { |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
389 if (from_c < nonascii_min_char) |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
390 nonascii_min_char = from_c; |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
391 } |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
392 else if (! ASCII_BYTE_P (to_c)) |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
393 { |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
394 nonascii_min_char = 0x80; |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
395 } |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
396 } |
8646a672489b
(load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents:
88683
diff
changeset
|
397 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
398 for (; from_c <= to_c; from_c++) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
399 CHARSET_FAST_MAP_SET (from_c, fast_map); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
400 } |
23767
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
401 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
402 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
403 if (control_flag == 0) |
17052 | 404 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
405 CHARSET_MIN_CHAR (charset) = (ascii_compatible_p |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
406 ? nonascii_min_char : min_char); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
407 CHARSET_MAX_CHAR (charset) = max_char; |
17052 | 408 } |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
409 else if (control_flag == 4) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
410 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
411 temp_charset_work->min_char = min_char; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
412 temp_charset_work->max_char = max_char; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
413 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
414 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
415 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
416 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
417 /* Read a hexadecimal number (preceded by "0x") from the file FP while |
110361
4d54e23aa31e
Fix typos in comments and ChangeLogs.
Juanma Barranquero <lekktu@gmail.com>
parents:
109718
diff
changeset
|
418 paying attention to comment character '#'. */ |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
419 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
420 static INLINE unsigned |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
421 read_hex (FILE *fp, int *eof) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
422 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
423 int c; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
424 unsigned n; |
17052 | 425 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
426 while ((c = getc (fp)) != EOF) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
427 { |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
428 if (c == '#') |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
429 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
430 while ((c = getc (fp)) != EOF && c != '\n'); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
431 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
432 else if (c == '0') |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
433 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
434 if ((c = getc (fp)) == EOF || c == 'x') |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
435 break; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
436 } |
89483 | 437 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
438 if (c == EOF) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
439 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
440 *eof = 1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
441 return 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
442 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
443 *eof = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
444 n = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
445 if (c == 'x') |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
446 while ((c = getc (fp)) != EOF && isxdigit (c)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
447 n = ((n << 4) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
448 | (c <= '9' ? c - '0' : c <= 'F' ? c - 'A' + 10 : c - 'a' + 10)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
449 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
450 while ((c = getc (fp)) != EOF && isdigit (c)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
451 n = (n * 10) + c - '0'; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
452 if (c != EOF) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
453 ungetc (c, fp); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
454 return n; |
17052 | 455 } |
456 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
457 /* Return a mapping vector for CHARSET loaded from MAPFILE. |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
458 Each line of MAPFILE has this form |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
459 0xAAAA 0xCCCC |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
460 where 0xAAAA is a code-point and 0xCCCC is the corresponding |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
461 character code, or this form |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
462 0xAAAA-0xBBBB 0xCCCC |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
463 where 0xAAAA and 0xBBBB are code-points specifying a range, and |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
464 0xCCCC is the first character code of the range. |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
465 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
466 The returned vector has this form: |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
467 [ CODE1 CHAR1 CODE2 CHAR2 .... ] |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
468 where CODE1 is a code-point or a cons of code-points specifying a |
102451
d05149e3855d
(Qfile_name_handler_alist): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
101778
diff
changeset
|
469 range. |
d05149e3855d
(Qfile_name_handler_alist): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
101778
diff
changeset
|
470 |
102454
1c91e99dcfe7
Fix typos in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
102451
diff
changeset
|
471 Note that this function uses `openp' to open MAPFILE but ignores |
1c91e99dcfe7
Fix typos in comment.
Juanma Barranquero <lekktu@gmail.com>
parents:
102451
diff
changeset
|
472 `file-name-handler-alist' to avoid running any Lisp code. */ |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
473 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
474 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
475 load_charset_map_from_file (struct charset *charset, Lisp_Object mapfile, int control_flag) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
476 { |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
477 unsigned min_code = CHARSET_MIN_CODE (charset); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
478 unsigned max_code = CHARSET_MAX_CODE (charset); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
479 int fd; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
480 FILE *fp; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
481 int eof; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
482 Lisp_Object suffixes; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
483 struct charset_map_entries *head, *entries; |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
484 int n_entries, count; |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
485 USE_SAFE_ALLOCA; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
486 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
487 suffixes = Fcons (build_string (".map"), |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
488 Fcons (build_string (".TXT"), Qnil)); |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
489 |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
490 count = SPECPDL_INDEX (); |
102451
d05149e3855d
(Qfile_name_handler_alist): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
101778
diff
changeset
|
491 specbind (Qfile_name_handler_alist, Qnil); |
89787
cbb58e8c4481
(Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
89758
diff
changeset
|
492 fd = openp (Vcharset_map_path, mapfile, suffixes, NULL, Qnil); |
102451
d05149e3855d
(Qfile_name_handler_alist): Extern it.
Kenichi Handa <handa@m17n.org>
parents:
101778
diff
changeset
|
493 unbind_to (count, Qnil); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
494 if (fd < 0 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
495 || ! (fp = fdopen (fd, "r"))) |
102636
b9092d75665a
(load_charset_map_from_file): When a mapfile can't be loaded, signal
Kenichi Handa <handa@m17n.org>
parents:
102454
diff
changeset
|
496 error ("Failure in loading charset map: %S", SDATA (mapfile)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
497 |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
498 /* Use SAFE_ALLOCA instead of alloca, as `charset_map_entries' is |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
499 large (larger than MAX_ALLOCA). */ |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
500 SAFE_ALLOCA (head, struct charset_map_entries *, |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
501 sizeof (struct charset_map_entries)); |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
502 entries = head; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
503 memset (entries, 0, sizeof (struct charset_map_entries)); |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
504 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
505 n_entries = 0; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
506 eof = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
507 while (1) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
508 { |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
509 unsigned from, to; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
510 int c; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
511 int idx; |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
512 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
513 from = read_hex (fp, &eof); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
514 if (eof) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
515 break; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
516 if (getc (fp) == '-') |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
517 to = read_hex (fp, &eof); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
518 else |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
519 to = from; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
520 c = (int) read_hex (fp, &eof); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
521 |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
522 if (from < min_code || to > max_code || from > to || c > MAX_CHAR) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
523 continue; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
524 |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
525 if (n_entries > 0 && (n_entries % 0x10000) == 0) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
526 { |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
527 SAFE_ALLOCA (entries->next, struct charset_map_entries *, |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
528 sizeof (struct charset_map_entries)); |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
529 entries = entries->next; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
530 memset (entries, 0, sizeof (struct charset_map_entries)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
531 } |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
532 idx = n_entries % 0x10000; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
533 entries->entry[idx].from = from; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
534 entries->entry[idx].to = to; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
535 entries->entry[idx].c = c; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
536 n_entries++; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
537 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
538 fclose (fp); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
539 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
540 load_charset_map (charset, head, n_entries, control_flag); |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
541 SAFE_FREE (); |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
542 } |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
543 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
544 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
545 load_charset_map_from_vector (struct charset *charset, Lisp_Object vec, int control_flag) |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
546 { |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
547 unsigned min_code = CHARSET_MIN_CODE (charset); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
548 unsigned max_code = CHARSET_MAX_CODE (charset); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
549 struct charset_map_entries *head, *entries; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
550 int n_entries; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
551 int len = ASIZE (vec); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
552 int i; |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
553 USE_SAFE_ALLOCA; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
554 |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
555 if (len % 2 == 1) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
556 { |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
557 add_to_log ("Failure in loading charset map: %V", vec, Qnil); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
558 return; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
559 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
560 |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
561 /* Use SAFE_ALLOCA instead of alloca, as `charset_map_entries' is |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
562 large (larger than MAX_ALLOCA). */ |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
563 SAFE_ALLOCA (head, struct charset_map_entries *, |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
564 sizeof (struct charset_map_entries)); |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
565 entries = head; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
566 memset (entries, 0, sizeof (struct charset_map_entries)); |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
567 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
568 n_entries = 0; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
569 for (i = 0; i < len; i += 2) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
570 { |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
571 Lisp_Object val, val2; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
572 unsigned from, to; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
573 int c; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
574 int idx; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
575 |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
576 val = AREF (vec, i); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
577 if (CONSP (val)) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
578 { |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
579 val2 = XCDR (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
580 val = XCAR (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
581 CHECK_NATNUM (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
582 CHECK_NATNUM (val2); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
583 from = XFASTINT (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
584 to = XFASTINT (val2); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
585 } |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
586 else |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
587 { |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
588 CHECK_NATNUM (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
589 from = to = XFASTINT (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
590 } |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
591 val = AREF (vec, i + 1); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
592 CHECK_NATNUM (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
593 c = XFASTINT (val); |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
594 |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
595 if (from < min_code || to > max_code || from > to || c > MAX_CHAR) |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
596 continue; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
597 |
90153
e29d4e885eca
(load_charset_map_from_vector): Fix for the first
Kenichi Handa <handa@m17n.org>
parents:
90021
diff
changeset
|
598 if (n_entries > 0 && (n_entries % 0x10000) == 0) |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
599 { |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
600 SAFE_ALLOCA (entries->next, struct charset_map_entries *, |
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
601 sizeof (struct charset_map_entries)); |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
602 entries = entries->next; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
603 memset (entries, 0, sizeof (struct charset_map_entries)); |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
604 } |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
605 idx = n_entries % 0x10000; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
606 entries->entry[idx].from = from; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
607 entries->entry[idx].to = to; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
608 entries->entry[idx].c = c; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
609 n_entries++; |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
610 } |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
611 |
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
612 load_charset_map (charset, head, n_entries, control_flag); |
107099
6d6a455af77b
* charset.c (load_charset_map_from_file)
Chong Yidong <cyd@stupidchicken.com>
parents:
107088
diff
changeset
|
613 SAFE_FREE (); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
614 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
615 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
616 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
617 /* Load a mapping table for CHARSET. CONTROL-FLAG tells what kind of |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
618 map it is (see the comment of load_charset_map for the detail). */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
619 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
620 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
621 load_charset (struct charset *charset, int control_flag) |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
622 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
623 Lisp_Object map; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
624 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
625 if (inhibit_load_charset_map |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
626 && temp_charset_work |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
627 && charset == temp_charset_work->current |
103124
661fea081562
(load_charset): Reformat X==Y==Z to (X==Y)==Z.
Kenichi Handa <handa@m17n.org>
parents:
102986
diff
changeset
|
628 && ((control_flag == 2) == temp_charset_work->for_encoder)) |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
629 return; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
630 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
631 if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
632 map = CHARSET_MAP (charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
633 else if (CHARSET_UNIFIED_P (charset)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
634 map = CHARSET_UNIFY_MAP (charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
635 if (STRINGP (map)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
636 load_charset_map_from_file (charset, map, control_flag); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
637 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
638 load_charset_map_from_vector (charset, map, control_flag); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
639 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
640 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
641 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
642 DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
643 doc: /* Return non-nil if and only if OBJECT is a charset.*/) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
644 (Lisp_Object object) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
645 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
646 return (CHARSETP (object) ? Qt : Qnil); |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
647 } |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
648 |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
649 |
109100
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108645
diff
changeset
|
650 void map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108645
diff
changeset
|
651 Lisp_Object function, Lisp_Object arg, |
2bc9a0c04c87
Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents:
108645
diff
changeset
|
652 unsigned from, unsigned to); |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
653 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
654 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
655 map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object function, Lisp_Object arg, unsigned int from, unsigned int to) |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
656 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
657 int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
658 int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
659 Lisp_Object range; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
660 int c, stop; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
661 struct gcpro gcpro1; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
662 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
663 range = Fcons (Qnil, Qnil); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
664 GCPRO1 (range); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
665 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
666 c = temp_charset_work->min_char; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
667 stop = (temp_charset_work->max_char < 0x20000 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
668 ? temp_charset_work->max_char : 0xFFFF); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
669 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
670 while (1) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
671 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
672 int index = GET_TEMP_CHARSET_WORK_ENCODER (c); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
673 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
674 if (index >= from_idx && index <= to_idx) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
675 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
676 if (NILP (XCAR (range))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
677 XSETCAR (range, make_number (c)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
678 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
679 else if (! NILP (XCAR (range))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
680 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
681 XSETCDR (range, make_number (c - 1)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
682 if (c_function) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
683 (*c_function) (arg, range); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
684 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
685 call2 (function, range, arg); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
686 XSETCAR (range, Qnil); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
687 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
688 if (c == stop) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
689 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
690 if (c == temp_charset_work->max_char) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
691 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
692 if (! NILP (XCAR (range))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
693 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
694 XSETCDR (range, make_number (c)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
695 if (c_function) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
696 (*c_function) (arg, range); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
697 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
698 call2 (function, range, arg); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
699 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
700 break; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
701 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
702 c = 0x1FFFF; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
703 stop = temp_charset_work->max_char; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
704 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
705 c++; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
706 } |
102798
6f4fe5de62c8
(map_charset_for_dump): Add missing UNGCPRO.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102636
diff
changeset
|
707 UNGCPRO; |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
708 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
709 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
710 void |
109360
f37b85834f7e
Convert more function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
711 map_charset_chars (void (*c_function)(Lisp_Object, Lisp_Object), Lisp_Object function, |
f37b85834f7e
Convert more function definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109179
diff
changeset
|
712 Lisp_Object arg, struct charset *charset, unsigned from, unsigned to) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
713 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
714 Lisp_Object range; |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
715 int partial; |
22185
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
716 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
717 partial = (from > CHARSET_MIN_CODE (charset) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
718 || to < CHARSET_MAX_CODE (charset)); |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
719 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
720 if (CHARSET_METHOD (charset) == CHARSET_METHOD_OFFSET) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
721 { |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
722 int from_idx = CODE_POINT_TO_INDEX (charset, from); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
723 int to_idx = CODE_POINT_TO_INDEX (charset, to); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
724 int from_c = from_idx + CHARSET_CODE_OFFSET (charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
725 int to_c = to_idx + CHARSET_CODE_OFFSET (charset); |
17052 | 726 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
727 if (CHARSET_UNIFIED_P (charset)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
728 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
729 if (! CHAR_TABLE_P (CHARSET_DEUNIFIER (charset))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
730 load_charset (charset, 2); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
731 if (CHAR_TABLE_P (CHARSET_DEUNIFIER (charset))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
732 map_char_table_for_charset (c_function, function, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
733 CHARSET_DEUNIFIER (charset), arg, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
734 partial ? charset : NULL, from, to); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
735 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
736 map_charset_for_dump (c_function, function, arg, from, to); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
737 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
738 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
739 range = Fcons (make_number (from_c), make_number (to_c)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
740 if (NILP (function)) |
89683
d3302f68a7cf
(charset_table_used): Make it static.
Kenichi Handa <handa@m17n.org>
parents:
89645
diff
changeset
|
741 (*c_function) (arg, range); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
742 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
743 call2 (function, range, arg); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
744 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
745 else if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
746 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
747 if (! CHAR_TABLE_P (CHARSET_ENCODER (charset))) |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
748 load_charset (charset, 2); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
749 if (CHAR_TABLE_P (CHARSET_ENCODER (charset))) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
750 map_char_table_for_charset (c_function, function, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
751 CHARSET_ENCODER (charset), arg, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
752 partial ? charset : NULL, from, to); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
753 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
754 map_charset_for_dump (c_function, function, arg, from, to); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
755 } |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
756 else if (CHARSET_METHOD (charset) == CHARSET_METHOD_SUBSET) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
757 { |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
758 Lisp_Object subset_info; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
759 int offset; |
17052 | 760 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
761 subset_info = CHARSET_SUBSET (charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
762 charset = CHARSET_FROM_ID (XFASTINT (AREF (subset_info, 0))); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
763 offset = XINT (AREF (subset_info, 3)); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
764 from -= offset; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
765 if (from < XFASTINT (AREF (subset_info, 1))) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
766 from = XFASTINT (AREF (subset_info, 1)); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
767 to -= offset; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
768 if (to > XFASTINT (AREF (subset_info, 2))) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
769 to = XFASTINT (AREF (subset_info, 2)); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
770 map_charset_chars (c_function, function, arg, charset, from, to); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
771 } |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
772 else /* i.e. CHARSET_METHOD_SUPERSET */ |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
773 { |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
774 Lisp_Object parents; |
17052 | 775 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
776 for (parents = CHARSET_SUPERSET (charset); CONSP (parents); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
777 parents = XCDR (parents)) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
778 { |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
779 int offset; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
780 unsigned this_from, this_to; |
17052 | 781 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
782 charset = CHARSET_FROM_ID (XFASTINT (XCAR (XCAR (parents)))); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
783 offset = XINT (XCDR (XCAR (parents))); |
102899
5ebc155eeeed
(map_charset_chars): For a charset of `superset'
Kenichi Handa <handa@m17n.org>
parents:
102798
diff
changeset
|
784 this_from = from > offset ? from - offset : 0; |
5ebc155eeeed
(map_charset_chars): For a charset of `superset'
Kenichi Handa <handa@m17n.org>
parents:
102798
diff
changeset
|
785 this_to = to > offset ? to - offset : 0; |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
786 if (this_from < CHARSET_MIN_CODE (charset)) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
787 this_from = CHARSET_MIN_CODE (charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
788 if (this_to > CHARSET_MAX_CODE (charset)) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
789 this_to = CHARSET_MAX_CODE (charset); |
89758
b07ce3d8fc4e
(map_charset_chars): Fix arg to map_charset_chars in
Kenichi Handa <handa@m17n.org>
parents:
89683
diff
changeset
|
790 map_charset_chars (c_function, function, arg, charset, |
b07ce3d8fc4e
(map_charset_chars): Fix arg to map_charset_chars in
Kenichi Handa <handa@m17n.org>
parents:
89683
diff
changeset
|
791 this_from, this_to); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
792 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
793 } |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
794 } |
17052 | 795 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
796 DEFUN ("map-charset-chars", Fmap_charset_chars, Smap_charset_chars, 2, 5, 0, |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
797 doc: /* Call FUNCTION for all characters in CHARSET. |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
798 FUNCTION is called with an argument RANGE and the optional 3rd |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
799 argument ARG. |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
800 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
801 RANGE is a cons (FROM . TO), where FROM and TO indicate a range of |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
802 characters contained in CHARSET. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48317
diff
changeset
|
803 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
804 The optional 4th and 5th arguments FROM-CODE and TO-CODE specify the |
103356
1cb659089fb6
(Fmap_charset_chars): In docstring, state clear that
Kenichi Handa <handa@m17n.org>
parents:
103126
diff
changeset
|
805 range of code points (in CHARSET) of target characters. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
806 (Lisp_Object function, Lisp_Object charset, Lisp_Object arg, Lisp_Object from_code, Lisp_Object to_code) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
807 { |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
808 struct charset *cs; |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
809 unsigned from, to; |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
810 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
811 CHECK_CHARSET_GET_CHARSET (charset, cs); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
812 if (NILP (from_code)) |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
813 from = CHARSET_MIN_CODE (cs); |
88881
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
814 else |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
815 { |
88881
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
816 CHECK_NATNUM (from_code); |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
817 from = XINT (from_code); |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
818 if (from < CHARSET_MIN_CODE (cs)) |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
819 from = CHARSET_MIN_CODE (cs); |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
820 } |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
821 if (NILP (to_code)) |
88881
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
822 to = CHARSET_MAX_CODE (cs); |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
823 else |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
824 { |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
825 CHECK_NATNUM (to_code); |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
826 to = XINT (to_code); |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
827 if (to > CHARSET_MAX_CODE (cs)) |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
828 to = CHARSET_MAX_CODE (cs); |
7702a9d9edff
(Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents:
88874
diff
changeset
|
829 } |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
830 map_charset_chars (NULL, function, arg, cs, from, to); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
831 return Qnil; |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
832 } |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
833 |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
834 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
835 /* Define a charset according to the arguments. The Nth argument is |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
836 the Nth attribute of the charset (the last attribute `charset-id' |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
837 is not included). See the docstring of `define-charset' for the |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
838 detail. */ |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
839 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
840 DEFUN ("define-charset-internal", Fdefine_charset_internal, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
841 Sdefine_charset_internal, charset_arg_max, MANY, 0, |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
842 doc: /* For internal use only. |
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
843 usage: (define-charset-internal ...) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
844 (int nargs, Lisp_Object *args) |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
845 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
846 /* Charset attr vector. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
847 Lisp_Object attrs; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
848 Lisp_Object val; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
849 unsigned hash_code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
850 struct Lisp_Hash_Table *hash_table = XHASH_TABLE (Vcharset_hash_table); |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
851 int i, j; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
852 struct charset charset; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
853 int id; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
854 int dimension; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
855 int new_definition_p; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
856 int nchars; |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
857 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
858 if (nargs != charset_arg_max) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
859 return Fsignal (Qwrong_number_of_arguments, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
860 Fcons (intern ("define-charset-internal"), |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
861 make_number (nargs))); |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
862 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
863 attrs = Fmake_vector (make_number (charset_attr_max), Qnil); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
864 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
865 CHECK_SYMBOL (args[charset_arg_name]); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
866 ASET (attrs, charset_name, args[charset_arg_name]); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
867 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
868 val = args[charset_arg_code_space]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
869 for (i = 0, dimension = 0, nchars = 1; i < 4; i++) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
870 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
871 int min_byte, max_byte; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
872 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
873 min_byte = XINT (Faref (val, make_number (i * 2))); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
874 max_byte = XINT (Faref (val, make_number (i * 2 + 1))); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
875 if (min_byte < 0 || min_byte > max_byte || max_byte >= 256) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
876 error ("Invalid :code-space value"); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
877 charset.code_space[i * 4] = min_byte; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
878 charset.code_space[i * 4 + 1] = max_byte; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
879 charset.code_space[i * 4 + 2] = max_byte - min_byte + 1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
880 nchars *= charset.code_space[i * 4 + 2]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
881 charset.code_space[i * 4 + 3] = nchars; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
882 if (max_byte > 0) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
883 dimension = i + 1; |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
884 } |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
885 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
886 val = args[charset_arg_dimension]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
887 if (NILP (val)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
888 charset.dimension = dimension; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
889 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
890 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
891 CHECK_NATNUM (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
892 charset.dimension = XINT (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
893 if (charset.dimension < 1 || charset.dimension > 4) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
894 args_out_of_range_3 (val, make_number (1), make_number (4)); |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
895 } |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
896 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
897 charset.code_linear_p |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
898 = (charset.dimension == 1 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
899 || (charset.code_space[2] == 256 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
900 && (charset.dimension == 2 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
901 || (charset.code_space[6] == 256 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
902 && (charset.dimension == 3 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
903 || charset.code_space[10] == 256))))); |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
904 |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
905 if (! charset.code_linear_p) |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
906 { |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
907 charset.code_space_mask = (unsigned char *) xmalloc (256); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
908 memset (charset.code_space_mask, 0, 256); |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
909 for (i = 0; i < 4; i++) |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
910 for (j = charset.code_space[i * 4]; j <= charset.code_space[i * 4 + 1]; |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
911 j++) |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
912 charset.code_space_mask[j] |= (1 << i); |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
913 } |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
914 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
915 charset.iso_chars_96 = charset.code_space[2] == 96; |
17052 | 916 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
917 charset.min_code = (charset.code_space[0] |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
918 | (charset.code_space[4] << 8) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
919 | (charset.code_space[8] << 16) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
920 | (charset.code_space[12] << 24)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
921 charset.max_code = (charset.code_space[1] |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
922 | (charset.code_space[5] << 8) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
923 | (charset.code_space[9] << 16) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
924 | (charset.code_space[13] << 24)); |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
925 charset.char_index_offset = 0; |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
926 |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
927 val = args[charset_arg_min_code]; |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
928 if (! NILP (val)) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
929 { |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
930 unsigned code; |
17052 | 931 |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
932 if (INTEGERP (val)) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
933 code = XINT (val); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
934 else |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
935 { |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
936 CHECK_CONS (val); |
89483 | 937 CHECK_NUMBER_CAR (val); |
938 CHECK_NUMBER_CDR (val); | |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
939 code = (XINT (XCAR (val)) << 16) | (XINT (XCDR (val))); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
940 } |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
941 if (code < charset.min_code |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
942 || code > charset.max_code) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
943 args_out_of_range_3 (make_number (charset.min_code), |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
944 make_number (charset.max_code), val); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
945 charset.char_index_offset = CODE_POINT_TO_INDEX (&charset, code); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
946 charset.min_code = code; |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
947 } |
17052 | 948 |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
949 val = args[charset_arg_max_code]; |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
950 if (! NILP (val)) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
951 { |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
952 unsigned code; |
17052 | 953 |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
954 if (INTEGERP (val)) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
955 code = XINT (val); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
956 else |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
957 { |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
958 CHECK_CONS (val); |
89483 | 959 CHECK_NUMBER_CAR (val); |
960 CHECK_NUMBER_CDR (val); | |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
961 code = (XINT (XCAR (val)) << 16) | (XINT (XCDR (val))); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
962 } |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
963 if (code < charset.min_code |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
964 || code > charset.max_code) |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
965 args_out_of_range_3 (make_number (charset.min_code), |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
966 make_number (charset.max_code), val); |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
967 charset.max_code = code; |
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
968 } |
29139
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
969 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
970 charset.compact_codes_p = charset.max_code < 0x10000; |
88455
bae0bd953f61
(struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents:
88433
diff
changeset
|
971 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
972 val = args[charset_arg_invalid_code]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
973 if (NILP (val)) |
17052 | 974 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
975 if (charset.min_code > 0) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
976 charset.invalid_code = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
977 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
978 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
979 XSETINT (val, charset.max_code + 1); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
980 if (XINT (val) == charset.max_code + 1) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
981 charset.invalid_code = charset.max_code + 1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
982 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
983 error ("Attribute :invalid-code must be specified"); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
984 } |
17052 | 985 } |
986 else | |
987 { | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
988 CHECK_NATNUM (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
989 charset.invalid_code = XFASTINT (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
990 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
991 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
992 val = args[charset_arg_iso_final]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
993 if (NILP (val)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
994 charset.iso_final = -1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
995 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
996 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
997 CHECK_NUMBER (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
998 if (XINT (val) < '0' || XINT (val) > 127) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
999 error ("Invalid iso-final-char: %d", XINT (val)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1000 charset.iso_final = XINT (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1001 } |
89483 | 1002 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1003 val = args[charset_arg_iso_revision]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1004 if (NILP (val)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1005 charset.iso_revision = -1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1006 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1007 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1008 CHECK_NUMBER (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1009 if (XINT (val) > 63) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1010 args_out_of_range (make_number (63), val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1011 charset.iso_revision = XINT (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1012 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1013 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1014 val = args[charset_arg_emacs_mule_id]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1015 if (NILP (val)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1016 charset.emacs_mule_id = -1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1017 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1018 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1019 CHECK_NATNUM (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1020 if ((XINT (val) > 0 && XINT (val) <= 128) || XINT (val) >= 256) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1021 error ("Invalid emacs-mule-id: %d", XINT (val)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1022 charset.emacs_mule_id = XINT (val); |
29538
c0c34d18e8a0
(update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents:
29269
diff
changeset
|
1023 } |
23628
4a0a107fac9e
(string_to_non_ascii_char): Change the check for the
Kenichi Handa <handa@m17n.org>
parents:
23576
diff
changeset
|
1024 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1025 charset.ascii_compatible_p = ! NILP (args[charset_arg_ascii_compatible_p]); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1026 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1027 charset.supplementary_p = ! NILP (args[charset_arg_supplementary_p]); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1028 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1029 charset.unified_p = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1030 |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1031 memset (charset.fast_map, 0, sizeof (charset.fast_map)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1032 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1033 if (! NILP (args[charset_arg_code_offset])) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1034 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1035 val = args[charset_arg_code_offset]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1036 CHECK_NUMBER (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1037 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1038 charset.method = CHARSET_METHOD_OFFSET; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1039 charset.code_offset = XINT (val); |
17052 | 1040 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1041 i = CODE_POINT_TO_INDEX (&charset, charset.min_code); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1042 charset.min_char = i + charset.code_offset; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1043 i = CODE_POINT_TO_INDEX (&charset, charset.max_code); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1044 charset.max_char = i + charset.code_offset; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1045 if (charset.max_char > MAX_CHAR) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1046 error ("Unsupported max char: %d", charset.max_char); |
17052 | 1047 |
89313
1991025c6bc2
(Fdefine_charset_internal): Setup charset.fast_map correctly.
Kenichi Handa <handa@m17n.org>
parents:
89263
diff
changeset
|
1048 i = (charset.min_char >> 7) << 7; |
1991025c6bc2
(Fdefine_charset_internal): Setup charset.fast_map correctly.
Kenichi Handa <handa@m17n.org>
parents:
89263
diff
changeset
|
1049 for (; i < 0x10000 && i <= charset.max_char; i += 128) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1050 CHARSET_FAST_MAP_SET (i, charset.fast_map); |
89313
1991025c6bc2
(Fdefine_charset_internal): Setup charset.fast_map correctly.
Kenichi Handa <handa@m17n.org>
parents:
89263
diff
changeset
|
1051 i = (i >> 12) << 12; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1052 for (; i <= charset.max_char; i += 0x1000) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1053 CHARSET_FAST_MAP_SET (i, charset.fast_map); |
102955
e59697cf4141
(Fdefine_charset_internal): Make charset
Kenichi Handa <handa@m17n.org>
parents:
102899
diff
changeset
|
1054 if (charset.code_offset == 0 && charset.max_char >= 0x80) |
e59697cf4141
(Fdefine_charset_internal): Make charset
Kenichi Handa <handa@m17n.org>
parents:
102899
diff
changeset
|
1055 charset.ascii_compatible_p = 1; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1056 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1057 else if (! NILP (args[charset_arg_map])) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1058 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1059 val = args[charset_arg_map]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1060 ASET (attrs, charset_map, val); |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1061 charset.method = CHARSET_METHOD_MAP; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1062 } |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1063 else if (! NILP (args[charset_arg_subset])) |
17052 | 1064 { |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1065 Lisp_Object parent; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1066 Lisp_Object parent_min_code, parent_max_code, parent_code_offset; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1067 struct charset *parent_charset; |
17052 | 1068 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1069 val = args[charset_arg_subset]; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1070 parent = Fcar (val); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1071 CHECK_CHARSET_GET_CHARSET (parent, parent_charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1072 parent_min_code = Fnth (make_number (1), val); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1073 CHECK_NATNUM (parent_min_code); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1074 parent_max_code = Fnth (make_number (2), val); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1075 CHECK_NATNUM (parent_max_code); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1076 parent_code_offset = Fnth (make_number (3), val); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1077 CHECK_NUMBER (parent_code_offset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1078 val = Fmake_vector (make_number (4), Qnil); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1079 ASET (val, 0, make_number (parent_charset->id)); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1080 ASET (val, 1, parent_min_code); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1081 ASET (val, 2, parent_max_code); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1082 ASET (val, 3, parent_code_offset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1083 ASET (attrs, charset_subset, val); |
17052 | 1084 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1085 charset.method = CHARSET_METHOD_SUBSET; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1086 /* Here, we just copy the parent's fast_map. It's not accurate, |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1087 but at least it works for quickly detecting which character |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1088 DOESN'T belong to this charset. */ |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1089 for (i = 0; i < 190; i++) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1090 charset.fast_map[i] = parent_charset->fast_map[i]; |
17052 | 1091 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1092 /* We also copy these for parents. */ |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1093 charset.min_char = parent_charset->min_char; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1094 charset.max_char = parent_charset->max_char; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1095 } |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1096 else if (! NILP (args[charset_arg_superset])) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1097 { |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1098 val = args[charset_arg_superset]; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1099 charset.method = CHARSET_METHOD_SUPERSET; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1100 val = Fcopy_sequence (val); |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1101 ASET (attrs, charset_superset, val); |
17052 | 1102 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1103 charset.min_char = MAX_CHAR; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1104 charset.max_char = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1105 for (; ! NILP (val); val = Fcdr (val)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1106 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1107 Lisp_Object elt, car_part, cdr_part; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1108 int this_id, offset; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1109 struct charset *this_charset; |
17052 | 1110 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1111 elt = Fcar (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1112 if (CONSP (elt)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1113 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1114 car_part = XCAR (elt); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1115 cdr_part = XCDR (elt); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1116 CHECK_CHARSET_GET_ID (car_part, this_id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1117 CHECK_NUMBER (cdr_part); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1118 offset = XINT (cdr_part); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1119 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1120 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1121 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1122 CHECK_CHARSET_GET_ID (elt, this_id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1123 offset = 0; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1124 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1125 XSETCAR (val, Fcons (make_number (this_id), make_number (offset))); |
17052 | 1126 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1127 this_charset = CHARSET_FROM_ID (this_id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1128 if (charset.min_char > this_charset->min_char) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1129 charset.min_char = this_charset->min_char; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1130 if (charset.max_char < this_charset->max_char) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1131 charset.max_char = this_charset->max_char; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1132 for (i = 0; i < 190; i++) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1133 charset.fast_map[i] |= this_charset->fast_map[i]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1134 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1135 } |
43144
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
1136 else |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1137 error ("None of :code-offset, :map, :parents are specified"); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1138 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1139 val = args[charset_arg_unify_map]; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1140 if (! NILP (val) && !STRINGP (val)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1141 CHECK_VECTOR (val); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1142 ASET (attrs, charset_unify_map, val); |
17052 | 1143 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1144 CHECK_LIST (args[charset_arg_plist]); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1145 ASET (attrs, charset_plist, args[charset_arg_plist]); |
17052 | 1146 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1147 charset.hash_index = hash_lookup (hash_table, args[charset_arg_name], |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1148 &hash_code); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1149 if (charset.hash_index >= 0) |
17052 | 1150 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1151 new_definition_p = 0; |
88584
f4f7b1532dc3
(Fdefine_charset_internal): Fix bug for the case of re-defining a
Kenichi Handa <handa@m17n.org>
parents:
88543
diff
changeset
|
1152 id = XFASTINT (CHARSET_SYMBOL_ID (args[charset_arg_name])); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1153 HASH_VALUE (hash_table, charset.hash_index) = attrs; |
17052 | 1154 } |
1155 else | |
1156 { | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1157 charset.hash_index = hash_put (hash_table, args[charset_arg_name], attrs, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1158 hash_code); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1159 if (charset_table_used == charset_table_size) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1160 { |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1161 struct charset *new_table |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1162 = (struct charset *) xmalloc (sizeof (struct charset) |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1163 * (charset_table_size + 16)); |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1164 memcpy (new_table, charset_table, |
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
1165 sizeof (struct charset) * charset_table_size); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1166 charset_table_size += 16; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1167 charset_table = new_table; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1168 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1169 id = charset_table_used++; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1170 new_definition_p = 1; |
17052 | 1171 } |
1172 | |
88584
f4f7b1532dc3
(Fdefine_charset_internal): Fix bug for the case of re-defining a
Kenichi Handa <handa@m17n.org>
parents:
88543
diff
changeset
|
1173 ASET (attrs, charset_id, make_number (id)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1174 charset.id = id; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1175 charset_table[id] = charset; |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1176 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1177 if (charset.method == CHARSET_METHOD_MAP) |
100019
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1178 { |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1179 load_charset (&charset, 0); |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1180 charset_table[id] = charset; |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1181 } |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1182 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1183 if (charset.iso_final >= 0) |
17052 | 1184 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1185 ISO_CHARSET_TABLE (charset.dimension, charset.iso_chars_96, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1186 charset.iso_final) = id; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1187 if (new_definition_p) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1188 Viso_2022_charset_list = nconc2 (Viso_2022_charset_list, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1189 Fcons (make_number (id), Qnil)); |
88683
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
1190 if (ISO_CHARSET_TABLE (1, 0, 'J') == id) |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
1191 charset_jisx0201_roman = id; |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
1192 else if (ISO_CHARSET_TABLE (2, 0, '@') == id) |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
1193 charset_jisx0208_1978 = id; |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
1194 else if (ISO_CHARSET_TABLE (2, 0, 'B') == id) |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
1195 charset_jisx0208 = id; |
102986
02685d936706
(charset_ksc5601): New variable.
Kenichi Handa <handa@m17n.org>
parents:
102955
diff
changeset
|
1196 else if (ISO_CHARSET_TABLE (2, 0, 'C') == id) |
02685d936706
(charset_ksc5601): New variable.
Kenichi Handa <handa@m17n.org>
parents:
102955
diff
changeset
|
1197 charset_ksc5601 = id; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1198 } |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
1199 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1200 if (charset.emacs_mule_id >= 0) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1201 { |
111743
913b779aa4ee
Fix decoding of emacs-mule coding system.
Kenichi Handa <handa@m17n.org>
parents:
109710
diff
changeset
|
1202 emacs_mule_charset[charset.emacs_mule_id] = id; |
88584
f4f7b1532dc3
(Fdefine_charset_internal): Fix bug for the case of re-defining a
Kenichi Handa <handa@m17n.org>
parents:
88543
diff
changeset
|
1203 if (charset.emacs_mule_id < 0xA0) |
f4f7b1532dc3
(Fdefine_charset_internal): Fix bug for the case of re-defining a
Kenichi Handa <handa@m17n.org>
parents:
88543
diff
changeset
|
1204 emacs_mule_bytes[charset.emacs_mule_id] = charset.dimension + 1; |
90371
383ada7eac9c
(Fdefine_charset_internal): Fix setting of
Kenichi Handa <handa@m17n.org>
parents:
90312
diff
changeset
|
1205 else |
383ada7eac9c
(Fdefine_charset_internal): Fix setting of
Kenichi Handa <handa@m17n.org>
parents:
90312
diff
changeset
|
1206 emacs_mule_bytes[charset.emacs_mule_id] = charset.dimension + 2; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1207 if (new_definition_p) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1208 Vemacs_mule_charset_list = nconc2 (Vemacs_mule_charset_list, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1209 Fcons (make_number (id), Qnil)); |
17052 | 1210 } |
1211 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1212 if (new_definition_p) |
17052 | 1213 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1214 Vcharset_list = Fcons (args[charset_arg_name], Vcharset_list); |
91193
f93f0b835e32
(Fdefine_charset_internal): Record a supplementary
Kenichi Handa <handa@m17n.org>
parents:
90996
diff
changeset
|
1215 if (charset.supplementary_p) |
f93f0b835e32
(Fdefine_charset_internal): Record a supplementary
Kenichi Handa <handa@m17n.org>
parents:
90996
diff
changeset
|
1216 Vcharset_ordered_list = nconc2 (Vcharset_ordered_list, |
f93f0b835e32
(Fdefine_charset_internal): Record a supplementary
Kenichi Handa <handa@m17n.org>
parents:
90996
diff
changeset
|
1217 Fcons (make_number (id), Qnil)); |
f93f0b835e32
(Fdefine_charset_internal): Record a supplementary
Kenichi Handa <handa@m17n.org>
parents:
90996
diff
changeset
|
1218 else |
93288
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1219 { |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1220 Lisp_Object tail; |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1221 |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1222 for (tail = Vcharset_ordered_list; CONSP (tail); tail = XCDR (tail)) |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1223 { |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1224 struct charset *cs = CHARSET_FROM_ID (XINT (XCAR (tail))); |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1225 |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1226 if (cs->supplementary_p) |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1227 break; |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1228 } |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1229 if (EQ (tail, Vcharset_ordered_list)) |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1230 Vcharset_ordered_list = Fcons (make_number (id), |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1231 Vcharset_ordered_list); |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1232 else if (NILP (tail)) |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1233 Vcharset_ordered_list = nconc2 (Vcharset_ordered_list, |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1234 Fcons (make_number (id), Qnil)); |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1235 else |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1236 { |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1237 val = Fcons (XCAR (tail), XCDR (tail)); |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1238 XSETCDR (tail, val); |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1239 XSETCAR (tail, make_number (id)); |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1240 } |
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
1241 } |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1242 charset_ordered_list_tick++; |
17052 | 1243 } |
1244 | |
1245 return Qnil; | |
1246 } | |
1247 | |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1248 |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1249 /* Same as Fdefine_charset_internal but arguments are more convenient |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1250 to call from C (typically in syms_of_charset). This can define a |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1251 charset of `offset' method only. Return the ID of the new |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1252 charset. */ |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1253 |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1254 static int |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1255 define_charset_internal (Lisp_Object name, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1256 int dimension, |
109717
8949aad5e992
Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109573
diff
changeset
|
1257 const unsigned char *code_space, |
109139
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1258 unsigned min_code, unsigned max_code, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1259 int iso_final, int iso_revision, int emacs_mule_id, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1260 int ascii_compatible, int supplementary, |
c25c24812fb1
Convert declarations or definitions to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109126
diff
changeset
|
1261 int code_offset) |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1262 { |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1263 Lisp_Object args[charset_arg_max]; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1264 Lisp_Object plist[14]; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1265 Lisp_Object val; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1266 int i; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1267 |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1268 args[charset_arg_name] = name; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1269 args[charset_arg_dimension] = make_number (dimension); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1270 val = Fmake_vector (make_number (8), make_number (0)); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1271 for (i = 0; i < 8; i++) |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1272 ASET (val, i, make_number (code_space[i])); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1273 args[charset_arg_code_space] = val; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1274 args[charset_arg_min_code] = make_number (min_code); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1275 args[charset_arg_max_code] = make_number (max_code); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1276 args[charset_arg_iso_final] |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1277 = (iso_final < 0 ? Qnil : make_number (iso_final)); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1278 args[charset_arg_iso_revision] = make_number (iso_revision); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1279 args[charset_arg_emacs_mule_id] |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1280 = (emacs_mule_id < 0 ? Qnil : make_number (emacs_mule_id)); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1281 args[charset_arg_ascii_compatible_p] = ascii_compatible ? Qt : Qnil; |
89171
d7ce536898bf
(define_charset_internal): Rename `supprementary'.
Dave Love <fx@gnu.org>
parents:
89055
diff
changeset
|
1282 args[charset_arg_supplementary_p] = supplementary ? Qt : Qnil; |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1283 args[charset_arg_invalid_code] = Qnil; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1284 args[charset_arg_code_offset] = make_number (code_offset); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1285 args[charset_arg_map] = Qnil; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1286 args[charset_arg_subset] = Qnil; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1287 args[charset_arg_superset] = Qnil; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1288 args[charset_arg_unify_map] = Qnil; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1289 |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1290 plist[0] = intern_c_string (":name"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1291 plist[1] = args[charset_arg_name]; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1292 plist[2] = intern_c_string (":dimension"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1293 plist[3] = args[charset_arg_dimension]; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1294 plist[4] = intern_c_string (":code-space"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1295 plist[5] = args[charset_arg_code_space]; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1296 plist[6] = intern_c_string (":iso-final-char"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1297 plist[7] = args[charset_arg_iso_final]; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1298 plist[8] = intern_c_string (":emacs-mule-id"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1299 plist[9] = args[charset_arg_emacs_mule_id]; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1300 plist[10] = intern_c_string (":ascii-compatible-p"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1301 plist[11] = args[charset_arg_ascii_compatible_p]; |
105877
21bdda3ded62
* xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105669
diff
changeset
|
1302 plist[12] = intern_c_string (":code-offset"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1303 plist[13] = args[charset_arg_code_offset]; |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1304 |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1305 args[charset_arg_plist] = Flist (14, plist); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1306 Fdefine_charset_internal (charset_arg_max, args); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1307 |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1308 return XINT (CHARSET_SYMBOL_ID (name)); |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1309 } |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1310 |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
1311 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1312 DEFUN ("define-charset-alias", Fdefine_charset_alias, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1313 Sdefine_charset_alias, 2, 2, 0, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1314 doc: /* Define ALIAS as an alias for charset CHARSET. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1315 (Lisp_Object alias, Lisp_Object charset) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1316 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1317 Lisp_Object attr; |
17052 | 1318 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1319 CHECK_CHARSET_GET_ATTR (charset, attr); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1320 Fputhash (alias, attr, Vcharset_hash_table); |
88634
ad7c09ee6cf9
(Fdefine_charset_alias): Update Vcharset_list.
Dave Love <fx@gnu.org>
parents:
88626
diff
changeset
|
1321 Vcharset_list = Fcons (alias, Vcharset_list); |
17052 | 1322 return Qnil; |
1323 } | |
1324 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1325 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1326 DEFUN ("charset-plist", Fcharset_plist, Scharset_plist, 1, 1, 0, |
88817 | 1327 doc: /* Return the property list of CHARSET. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1328 (Lisp_Object charset) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1329 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1330 Lisp_Object attrs; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1331 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1332 CHECK_CHARSET_GET_ATTR (charset, attrs); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1333 return CHARSET_ATTR_PLIST (attrs); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1334 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1335 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1336 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1337 DEFUN ("set-charset-plist", Fset_charset_plist, Sset_charset_plist, 2, 2, 0, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1338 doc: /* Set CHARSET's property list to PLIST. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1339 (Lisp_Object charset, Lisp_Object plist) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1340 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1341 Lisp_Object attrs; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1342 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1343 CHECK_CHARSET_GET_ATTR (charset, attrs); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1344 CHARSET_ATTR_PLIST (attrs) = plist; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1345 return plist; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1346 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1347 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1348 |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1349 DEFUN ("unify-charset", Funify_charset, Sunify_charset, 1, 3, 0, |
88817 | 1350 doc: /* Unify characters of CHARSET with Unicode. |
1351 This means reading the relevant file and installing the table defined | |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1352 by CHARSET's `:unify-map' property. |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1353 |
88927
cd7645c9842b
Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents:
88881
diff
changeset
|
1354 Optional second arg UNIFY-MAP is a file name string or a vector. It has |
cd7645c9842b
Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents:
88881
diff
changeset
|
1355 the same meaning as the `:unify-map' attribute in the function |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1356 `define-charset' (which see). |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1357 |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1358 Optional third argument DEUNIFY, if non-nil, means to de-unify CHARSET. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1359 (Lisp_Object charset, Lisp_Object unify_map, Lisp_Object deunify) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1360 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1361 int id; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1362 struct charset *cs; |
89483 | 1363 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1364 CHECK_CHARSET_GET_ID (charset, id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1365 cs = CHARSET_FROM_ID (id); |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1366 if (NILP (deunify) |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1367 ? CHARSET_UNIFIED_P (cs) && ! NILP (CHARSET_DEUNIFIER (cs)) |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1368 : ! CHARSET_UNIFIED_P (cs)) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1369 return Qnil; |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1370 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1371 CHARSET_UNIFIED_P (cs) = 0; |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1372 if (NILP (deunify)) |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1373 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1374 if (CHARSET_METHOD (cs) != CHARSET_METHOD_OFFSET |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1375 || CHARSET_CODE_OFFSET (cs) < 0x110000) |
89483 | 1376 error ("Can't unify charset: %s", SDATA (SYMBOL_NAME (charset))); |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1377 if (NILP (unify_map)) |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1378 unify_map = CHARSET_UNIFY_MAP (cs); |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1379 else |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1380 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1381 if (! STRINGP (unify_map) && ! VECTORP (unify_map)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1382 signal_error ("Bad unify-map", unify_map); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1383 CHARSET_UNIFY_MAP (cs) = unify_map; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1384 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1385 if (NILP (Vchar_unify_table)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1386 Vchar_unify_table = Fmake_char_table (Qnil, Qnil); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1387 char_table_set_range (Vchar_unify_table, |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1388 cs->min_char, cs->max_char, charset); |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1389 CHARSET_UNIFIED_P (cs) = 1; |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1390 } |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1391 else if (CHAR_TABLE_P (Vchar_unify_table)) |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1392 { |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1393 int min_code = CHARSET_MIN_CODE (cs); |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1394 int max_code = CHARSET_MAX_CODE (cs); |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1395 int min_char = DECODE_CHAR (cs, min_code); |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1396 int max_char = DECODE_CHAR (cs, max_code); |
89483 | 1397 |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1398 char_table_set_range (Vchar_unify_table, min_char, max_char, Qnil); |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1399 } |
89483 | 1400 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1401 return Qnil; |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1402 } |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1403 |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1404 DEFUN ("get-unused-iso-final-char", Fget_unused_iso_final_char, |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1405 Sget_unused_iso_final_char, 2, 2, 0, |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1406 doc: /* |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
1407 Return an unused ISO final char for a charset of DIMENSION and CHARS. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1408 DIMENSION is the number of bytes to represent a character: 1 or 2. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1409 CHARS is the number of characters in a dimension: 94 or 96. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1410 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1411 This final char is for private use, thus the range is `0' (48) .. `?' (63). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1412 If there's no unused final char for the specified kind of charset, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1413 return nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1414 (Lisp_Object dimension, Lisp_Object chars) |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1415 { |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1416 int final_char; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1417 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1418 CHECK_NUMBER (dimension); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1419 CHECK_NUMBER (chars); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1420 if (XINT (dimension) != 1 && XINT (dimension) != 2 && XINT (dimension) != 3) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1421 args_out_of_range_3 (dimension, make_number (1), make_number (3)); |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1422 if (XINT (chars) != 94 && XINT (chars) != 96) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1423 args_out_of_range_3 (chars, make_number (94), make_number (96)); |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1424 for (final_char = '0'; final_char <= '?'; final_char++) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1425 if (ISO_CHARSET_TABLE (XINT (dimension), XINT (chars), final_char) < 0) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1426 break; |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1427 return (final_char <= '?' ? make_number (final_char) : Qnil); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1428 } |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1429 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1430 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1431 check_iso_charset_parameter (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1432 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1433 CHECK_NATNUM (dimension); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1434 CHECK_NATNUM (chars); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1435 CHECK_NATNUM (final_char); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1436 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1437 if (XINT (dimension) > 3) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1438 error ("Invalid DIMENSION %d, it should be 1, 2, or 3", XINT (dimension)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1439 if (XINT (chars) != 94 && XINT (chars) != 96) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1440 error ("Invalid CHARS %d, it should be 94 or 96", XINT (chars)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1441 if (XINT (final_char) < '0' || XINT (final_char) > '~') |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1442 error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1443 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1444 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1445 |
17052 | 1446 DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset, |
1447 4, 4, 0, | |
53528
dbd73534e01e
(Fdeclare_equiv_charset): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1448 doc: /* Declare an equivalent charset for ISO-2022 decoding. |
dbd73534e01e
(Fdeclare_equiv_charset): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1449 |
dbd73534e01e
(Fdeclare_equiv_charset): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1450 On decoding by an ISO-2022 base coding system, when a charset |
dbd73534e01e
(Fdeclare_equiv_charset): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1451 specified by DIMENSION, CHARS, and FINAL-CHAR is designated, behave as |
dbd73534e01e
(Fdeclare_equiv_charset): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents:
52401
diff
changeset
|
1452 if CHARSET is designated instead. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1453 (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char, Lisp_Object charset) |
17052 | 1454 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1455 int id; |
89962
77df4a7f419a
(Fdeclare_equiv_charset): Fix handing of CHARS.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
1456 int chars_flag; |
17052 | 1457 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1458 CHECK_CHARSET_GET_ID (charset, id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1459 check_iso_charset_parameter (dimension, chars, final_char); |
89962
77df4a7f419a
(Fdeclare_equiv_charset): Fix handing of CHARS.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
1460 chars_flag = XINT (chars) == 96; |
77df4a7f419a
(Fdeclare_equiv_charset): Fix handing of CHARS.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
1461 ISO_CHARSET_TABLE (XINT (dimension), chars_flag, XINT (final_char)) = id; |
17052 | 1462 return Qnil; |
1463 } | |
1464 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1465 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1466 /* Return information about charsets in the text at PTR of NBYTES |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1467 bytes, which are NCHARS characters. The value is: |
29094
8b1a19b318e9
Fix comment for find_charset_in_text.
Kenichi Handa <handa@m17n.org>
parents:
29003
diff
changeset
|
1468 |
29095
39e94c12f469
Fix previous change (typo).
Kenichi Handa <handa@m17n.org>
parents:
29094
diff
changeset
|
1469 0: Each character is represented by one byte. This is always |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1470 true for a unibyte string. For a multibyte string, true if |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1471 it contains only ASCII characters. |
22168
2156ac6d054f
(find_charset_in_str): New arg CMPCHARP.
Kenichi Handa <handa@m17n.org>
parents:
22121
diff
changeset
|
1472 |
88860 | 1473 1: No charsets other than ascii, control-1, and latin-1 are |
1474 found. | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1475 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1476 2: Otherwise. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1477 */ |
17052 | 1478 |
1479 int | |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1480 string_xstring_p (Lisp_Object string) |
17052 | 1481 { |
89483 | 1482 const unsigned char *p = SDATA (string); |
1483 const unsigned char *endp = p + SBYTES (string); | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1484 |
89483 | 1485 if (SCHARS (string) == SBYTES (string)) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1486 return 0; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1487 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1488 while (p < endp) |
17052 | 1489 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1490 int c = STRING_CHAR_ADVANCE (p); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1491 |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1492 if (c >= 0x100) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1493 return 2; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1494 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1495 return 1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1496 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1497 |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
1498 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1499 /* Find charsets in the string at PTR of NCHARS and NBYTES. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1500 |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1501 CHARSETS is a vector. If Nth element is non-nil, it means the |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1502 charset whose id is N is already found. |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1503 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1504 It may lookup a translation table TABLE if supplied. */ |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
1505 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1506 static void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1507 find_charsets_in_text (const unsigned char *ptr, EMACS_INT nchars, EMACS_INT nbytes, Lisp_Object charsets, Lisp_Object table, int multibyte) |
17052 | 1508 { |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1509 const unsigned char *pend = ptr + nbytes; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1510 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1511 if (nchars == nbytes) |
23883 | 1512 { |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1513 if (multibyte) |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1514 ASET (charsets, charset_ascii, Qt); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1515 else |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1516 while (ptr < pend) |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1517 { |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1518 int c = *ptr++; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1519 |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1520 if (!NILP (table)) |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1521 c = translate_char (table, c); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1522 if (ASCII_BYTE_P (c)) |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1523 ASET (charsets, charset_ascii, Qt); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1524 else |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1525 ASET (charsets, charset_eight_bit, Qt); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1526 } |
23883 | 1527 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1528 else |
17052 | 1529 { |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1530 while (ptr < pend) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
1531 { |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1532 int c = STRING_CHAR_ADVANCE (ptr); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1533 struct charset *charset; |
17052 | 1534 |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1535 if (!NILP (table)) |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1536 c = translate_char (table, c); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1537 charset = CHAR_CHARSET (c); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1538 ASET (charsets, CHARSET_ID (charset), Qt); |
17052 | 1539 } |
1540 } | |
1541 } | |
1542 | |
1543 DEFUN ("find-charset-region", Ffind_charset_region, Sfind_charset_region, | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
1544 2, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1545 doc: /* Return a list of charsets in the region between BEG and END. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1546 BEG and END are buffer positions. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1547 Optional arg TABLE if non-nil is a translation table to look up. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1548 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1549 If the current buffer is unibyte, the returned list may contain |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1550 only `ascii', `eight-bit-control', and `eight-bit-graphic'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1551 (Lisp_Object beg, Lisp_Object end, Lisp_Object table) |
17052 | 1552 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1553 Lisp_Object charsets; |
89544
36913565de8a
(syms_of_charset): Remove unused var p.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1554 EMACS_INT from, from_byte, to, stop, stop_byte; |
36913565de8a
(syms_of_charset): Remove unused var p.
Dave Love <fx@gnu.org>
parents:
89483
diff
changeset
|
1555 int i; |
17052 | 1556 Lisp_Object val; |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1557 int multibyte = ! NILP (current_buffer->enable_multibyte_characters); |
17052 | 1558 |
1559 validate_region (&beg, &end); | |
1560 from = XFASTINT (beg); | |
1561 stop = to = XFASTINT (end); | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1562 |
17052 | 1563 if (from < GPT && GPT < to) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1564 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1565 stop = GPT; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1566 stop_byte = GPT_BYTE; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1567 } |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1568 else |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1569 stop_byte = CHAR_TO_BYTE (stop); |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1570 |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1571 from_byte = CHAR_TO_BYTE (from); |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1572 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1573 charsets = Fmake_vector (make_number (charset_table_used), Qnil); |
17052 | 1574 while (1) |
1575 { | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1576 find_charsets_in_text (BYTE_POS_ADDR (from_byte), stop - from, |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1577 stop_byte - from_byte, charsets, table, |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1578 multibyte); |
17052 | 1579 if (stop < to) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1580 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1581 from = stop, from_byte = stop_byte; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1582 stop = to, stop_byte = CHAR_TO_BYTE (stop); |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1583 } |
17052 | 1584 else |
1585 break; | |
1586 } | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1587 |
17052 | 1588 val = Qnil; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1589 for (i = charset_table_used - 1; i >= 0; i--) |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1590 if (!NILP (AREF (charsets, i))) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1591 val = Fcons (CHARSET_NAME (charset_table + i), val); |
17052 | 1592 return val; |
1593 } | |
1594 | |
1595 DEFUN ("find-charset-string", Ffind_charset_string, Sfind_charset_string, | |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
1596 1, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1597 doc: /* Return a list of charsets in STR. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1598 Optional arg TABLE if non-nil is a translation table to look up. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1599 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1600 If STR is unibyte, the returned list may contain |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1601 only `ascii', `eight-bit-control', and `eight-bit-graphic'. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1602 (Lisp_Object str, Lisp_Object table) |
17052 | 1603 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1604 Lisp_Object charsets; |
17052 | 1605 int i; |
1606 Lisp_Object val; | |
1607 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1608 CHECK_STRING (str); |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1609 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1610 charsets = Fmake_vector (make_number (charset_table_used), Qnil); |
89483 | 1611 find_charsets_in_text (SDATA (str), SCHARS (str), SBYTES (str), |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1612 charsets, table, |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1613 STRING_MULTIBYTE (str)); |
17052 | 1614 val = Qnil; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1615 for (i = charset_table_used - 1; i >= 0; i--) |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
1616 if (!NILP (AREF (charsets, i))) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1617 val = Fcons (CHARSET_NAME (charset_table + i), val); |
17052 | 1618 return val; |
1619 } | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1620 |
17052 | 1621 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1622 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1623 /* Return a unified character code for C (>= 0x110000). VAL is a |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1624 value of Vchar_unify_table for C; i.e. it is nil, an integer, or a |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1625 charset symbol. */ |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1626 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1627 maybe_unify_char (int c, Lisp_Object val) |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1628 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1629 struct charset *charset; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1630 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1631 if (INTEGERP (val)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1632 return XINT (val); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1633 if (NILP (val)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1634 return c; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1635 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1636 CHECK_CHARSET_GET_CHARSET (val, charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1637 load_charset (charset, 1); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1638 if (! inhibit_load_charset_map) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1639 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1640 val = CHAR_TABLE_REF (Vchar_unify_table, c); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1641 if (! NILP (val)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1642 c = XINT (val); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1643 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1644 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1645 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1646 int code_index = c - CHARSET_CODE_OFFSET (charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1647 int unified = GET_TEMP_CHARSET_WORK_DECODER (code_index); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1648 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1649 if (unified > 0) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1650 c = unified; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1651 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1652 return c; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1653 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1654 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1655 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1656 /* Return a character correponding to the code-point CODE of |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1657 CHARSET. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1658 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1659 int |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1660 decode_char (struct charset *charset, unsigned int code) |
17052 | 1661 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1662 int c, char_index; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1663 enum charset_method method = CHARSET_METHOD (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1664 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1665 if (code < CHARSET_MIN_CODE (charset) || code > CHARSET_MAX_CODE (charset)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1666 return -1; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1667 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1668 if (method == CHARSET_METHOD_SUBSET) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1669 { |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1670 Lisp_Object subset_info; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1671 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1672 subset_info = CHARSET_SUBSET (charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1673 charset = CHARSET_FROM_ID (XFASTINT (AREF (subset_info, 0))); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1674 code -= XINT (AREF (subset_info, 3)); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1675 if (code < XFASTINT (AREF (subset_info, 1)) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1676 || code > XFASTINT (AREF (subset_info, 2))) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1677 c = -1; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1678 else |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1679 c = DECODE_CHAR (charset, code); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1680 } |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1681 else if (method == CHARSET_METHOD_SUPERSET) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1682 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1683 Lisp_Object parents; |
17052 | 1684 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1685 parents = CHARSET_SUPERSET (charset); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1686 c = -1; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1687 for (; CONSP (parents); parents = XCDR (parents)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1688 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1689 int id = XINT (XCAR (XCAR (parents))); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1690 int code_offset = XINT (XCDR (XCAR (parents))); |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1691 unsigned this_code = code - code_offset; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1692 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1693 charset = CHARSET_FROM_ID (id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1694 if ((c = DECODE_CHAR (charset, this_code)) >= 0) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1695 break; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1696 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1697 } |
17052 | 1698 else |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1699 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1700 char_index = CODE_POINT_TO_INDEX (charset, code); |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
1701 if (char_index < 0) |
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
1702 return -1; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1703 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1704 if (method == CHARSET_METHOD_MAP) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1705 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1706 Lisp_Object decoder; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1707 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1708 decoder = CHARSET_DECODER (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1709 if (! VECTORP (decoder)) |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1710 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1711 load_charset (charset, 1); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1712 decoder = CHARSET_DECODER (charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1713 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1714 if (VECTORP (decoder)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1715 c = XINT (AREF (decoder, char_index)); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1716 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1717 c = GET_TEMP_CHARSET_WORK_DECODER (char_index); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1718 } |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1719 else /* method == CHARSET_METHOD_OFFSET */ |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1720 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1721 c = char_index + CHARSET_CODE_OFFSET (charset); |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1722 if (CHARSET_UNIFIED_P (charset) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1723 && c > MAX_UNICODE_CHAR) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1724 MAYBE_UNIFY_CHAR (c); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1725 } |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1726 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1727 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1728 return c; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1729 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1730 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1731 /* Variable used temporarily by the macro ENCODE_CHAR. */ |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1732 Lisp_Object charset_work; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1733 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1734 /* Return a code-point of CHAR in CHARSET. If CHAR doesn't belong to |
88860 | 1735 CHARSET, return CHARSET_INVALID_CODE (CHARSET). If STRICT is true, |
1736 use CHARSET's strict_max_char instead of max_char. */ | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1737 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1738 unsigned |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1739 encode_char (struct charset *charset, int c) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1740 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1741 unsigned code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1742 enum charset_method method = CHARSET_METHOD (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1743 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1744 if (CHARSET_UNIFIED_P (charset)) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1745 { |
103742
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
1746 Lisp_Object deunifier; |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1747 int code_index = -1; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1748 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1749 deunifier = CHARSET_DEUNIFIER (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1750 if (! CHAR_TABLE_P (deunifier)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1751 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1752 load_charset (charset, 2); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1753 deunifier = CHARSET_DEUNIFIER (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1754 } |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1755 if (CHAR_TABLE_P (deunifier)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1756 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1757 Lisp_Object deunified = CHAR_TABLE_REF (deunifier, c); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1758 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1759 if (INTEGERP (deunified)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1760 code_index = XINT (deunified); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1761 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1762 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1763 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1764 code_index = GET_TEMP_CHARSET_WORK_ENCODER (c); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1765 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1766 if (code_index >= 0) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1767 c = CHARSET_CODE_OFFSET (charset) + code_index; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1768 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1769 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1770 if (method == CHARSET_METHOD_SUBSET) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1771 { |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1772 Lisp_Object subset_info; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1773 struct charset *this_charset; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1774 |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1775 subset_info = CHARSET_SUBSET (charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1776 this_charset = CHARSET_FROM_ID (XFASTINT (AREF (subset_info, 0))); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1777 code = ENCODE_CHAR (this_charset, c); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1778 if (code == CHARSET_INVALID_CODE (this_charset) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1779 || code < XFASTINT (AREF (subset_info, 1)) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1780 || code > XFASTINT (AREF (subset_info, 2))) |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1781 return CHARSET_INVALID_CODE (charset); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1782 code += XINT (AREF (subset_info, 3)); |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1783 return code; |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1784 } |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1785 |
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1786 if (method == CHARSET_METHOD_SUPERSET) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1787 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1788 Lisp_Object parents; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1789 |
88745
f247f70ed2c3
(load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents:
88696
diff
changeset
|
1790 parents = CHARSET_SUPERSET (charset); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1791 for (; CONSP (parents); parents = XCDR (parents)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1792 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1793 int id = XINT (XCAR (XCAR (parents))); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1794 int code_offset = XINT (XCDR (XCAR (parents))); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1795 struct charset *this_charset = CHARSET_FROM_ID (id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1796 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1797 code = ENCODE_CHAR (this_charset, c); |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1798 if (code != CHARSET_INVALID_CODE (this_charset)) |
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
1799 return code + code_offset; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1800 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1801 return CHARSET_INVALID_CODE (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1802 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1803 |
89365
110a171821db
(encode_char): Fix handling of methods SUBSET and SUPERSET.
Kenichi Handa <handa@m17n.org>
parents:
89313
diff
changeset
|
1804 if (! CHARSET_FAST_MAP_REF ((c), charset->fast_map) |
110a171821db
(encode_char): Fix handling of methods SUBSET and SUPERSET.
Kenichi Handa <handa@m17n.org>
parents:
89313
diff
changeset
|
1805 || c < CHARSET_MIN_CHAR (charset) || c > CHARSET_MAX_CHAR (charset)) |
110a171821db
(encode_char): Fix handling of methods SUBSET and SUPERSET.
Kenichi Handa <handa@m17n.org>
parents:
89313
diff
changeset
|
1806 return CHARSET_INVALID_CODE (charset); |
110a171821db
(encode_char): Fix handling of methods SUBSET and SUPERSET.
Kenichi Handa <handa@m17n.org>
parents:
89313
diff
changeset
|
1807 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1808 if (method == CHARSET_METHOD_MAP) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1809 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1810 Lisp_Object encoder; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1811 Lisp_Object val; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1812 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1813 encoder = CHARSET_ENCODER (charset); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1814 if (! CHAR_TABLE_P (CHARSET_ENCODER (charset))) |
100019
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1815 { |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1816 load_charset (charset, 2); |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1817 encoder = CHARSET_ENCODER (charset); |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1818 } |
b25e28d70fad
(Fdefine_charset_internal): After calculating
Kenichi Handa <handa@m17n.org>
parents:
99977
diff
changeset
|
1819 if (CHAR_TABLE_P (encoder)) |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1820 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1821 val = CHAR_TABLE_REF (encoder, c); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1822 if (NILP (val)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1823 return CHARSET_INVALID_CODE (charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1824 code = XINT (val); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1825 if (! CHARSET_COMPACT_CODES_P (charset)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1826 code = INDEX_TO_CODE_POINT (charset, code); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1827 } |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1828 else |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1829 { |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1830 code = GET_TEMP_CHARSET_WORK_ENCODER (c); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1831 code = INDEX_TO_CODE_POINT (charset, code); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1832 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1833 } |
88678
7e7e9519784d
(CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents:
88641
diff
changeset
|
1834 else /* method == CHARSET_METHOD_OFFSET */ |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1835 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1836 int code_index = c - CHARSET_CODE_OFFSET (charset); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1837 |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
1838 code = INDEX_TO_CODE_POINT (charset, code_index); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1839 } |
17052 | 1840 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1841 return code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1842 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1843 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1844 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1845 DEFUN ("decode-char", Fdecode_char, Sdecode_char, 2, 3, 0, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1846 doc: /* Decode the pair of CHARSET and CODE-POINT into a character. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1847 Return nil if CODE-POINT is not valid in CHARSET. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1848 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1849 CODE-POINT may be a cons (HIGHER-16-BIT-VALUE . LOWER-16-BIT-VALUE). |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1850 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1851 Optional argument RESTRICTION specifies a way to map the pair of CCS |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
1852 and CODE-POINT to a character. Currently not supported and just ignored. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1853 (Lisp_Object charset, Lisp_Object code_point, Lisp_Object restriction) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1854 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1855 int c, id; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1856 unsigned code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1857 struct charset *charsetp; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1858 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1859 CHECK_CHARSET_GET_ID (charset, id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1860 if (CONSP (code_point)) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1861 { |
89483 | 1862 CHECK_NATNUM_CAR (code_point); |
1863 CHECK_NATNUM_CDR (code_point); | |
88475
9d54c1d6cd0a
(load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88455
diff
changeset
|
1864 code = (XINT (XCAR (code_point)) << 16) | (XINT (XCDR (code_point))); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1865 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1866 else |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1867 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1868 CHECK_NATNUM (code_point); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1869 code = XINT (code_point); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1870 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1871 charsetp = CHARSET_FROM_ID (id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1872 c = DECODE_CHAR (charsetp, code); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1873 return (c >= 0 ? make_number (c) : Qnil); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1874 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1875 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1876 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1877 DEFUN ("encode-char", Fencode_char, Sencode_char, 2, 3, 0, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1878 doc: /* Encode the character CH into a code-point of CHARSET. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1879 Return nil if CHARSET doesn't include CH. |
17052 | 1880 |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
1881 Optional argument RESTRICTION specifies a way to map CH to a |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1882 code-point in CCS. Currently not supported and just ignored. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1883 (Lisp_Object ch, Lisp_Object charset, Lisp_Object restriction) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1884 { |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
1885 int id; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1886 unsigned code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1887 struct charset *charsetp; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1888 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1889 CHECK_CHARSET_GET_ID (charset, id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1890 CHECK_NATNUM (ch); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1891 charsetp = CHARSET_FROM_ID (id); |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
1892 code = ENCODE_CHAR (charsetp, XINT (ch)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1893 if (code == CHARSET_INVALID_CODE (charsetp)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1894 return Qnil; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1895 if (code > 0x7FFFFFF) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1896 return Fcons (make_number (code >> 16), make_number (code & 0xFFFF)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1897 return make_number (code); |
17052 | 1898 } |
1899 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1900 |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1901 DEFUN ("make-char", Fmake_char, Smake_char, 1, 5, 0, |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1902 doc: |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1903 /* Return a character of CHARSET whose position codes are CODEn. |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1904 |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1905 CODE1 through CODE4 are optional, but if you don't supply sufficient |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1906 position codes, it is assumed that the minimum code in each dimension |
88543
f14d2bf6caa4
(load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents:
88524
diff
changeset
|
1907 is specified. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
1908 (Lisp_Object charset, Lisp_Object code1, Lisp_Object code2, Lisp_Object code3, Lisp_Object code4) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1909 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1910 int id, dimension; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1911 struct charset *charsetp; |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1912 unsigned code; |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1913 int c; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1914 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1915 CHECK_CHARSET_GET_ID (charset, id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1916 charsetp = CHARSET_FROM_ID (id); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1917 |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1918 dimension = CHARSET_DIMENSION (charsetp); |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1919 if (NILP (code1)) |
88590
ac9b0ae4c5a0
If CODE1 is nil, use the minimum code of the charset.
Kenichi Handa <handa@m17n.org>
parents:
88584
diff
changeset
|
1920 code = (CHARSET_ASCII_COMPATIBLE_P (charsetp) |
ac9b0ae4c5a0
If CODE1 is nil, use the minimum code of the charset.
Kenichi Handa <handa@m17n.org>
parents:
88584
diff
changeset
|
1921 ? 0 : CHARSET_MIN_CODE (charsetp)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1922 else |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1923 { |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1924 CHECK_NATNUM (code1); |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1925 if (XFASTINT (code1) >= 0x100) |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1926 args_out_of_range (make_number (0xFF), code1); |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1927 code = XFASTINT (code1); |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1928 |
88592
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1929 if (dimension > 1) |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1930 { |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1931 code <<= 8; |
88592
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1932 if (NILP (code2)) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1933 code |= charsetp->code_space[(dimension - 2) * 4]; |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1934 else |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1935 { |
88592
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1936 CHECK_NATNUM (code2); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1937 if (XFASTINT (code2) >= 0x100) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1938 args_out_of_range (make_number (0xFF), code2); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1939 code |= XFASTINT (code2); |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1940 } |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1941 |
88592
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1942 if (dimension > 2) |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1943 { |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1944 code <<= 8; |
88592
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1945 if (NILP (code3)) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1946 code |= charsetp->code_space[(dimension - 3) * 4]; |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1947 else |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1948 { |
88592
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1949 CHECK_NATNUM (code3); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1950 if (XFASTINT (code3) >= 0x100) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1951 args_out_of_range (make_number (0xFF), code3); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1952 code |= XFASTINT (code3); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1953 } |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1954 |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1955 if (dimension > 3) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1956 { |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1957 code <<= 8; |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1958 if (NILP (code4)) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1959 code |= charsetp->code_space[0]; |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1960 else |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1961 { |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1962 CHECK_NATNUM (code4); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1963 if (XFASTINT (code4) >= 0x100) |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1964 args_out_of_range (make_number (0xFF), code4); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1965 code |= XFASTINT (code4); |
46a07af4f6e0
(Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88590
diff
changeset
|
1966 } |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1967 } |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1968 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1969 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1970 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1971 |
88490
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1972 if (CHARSET_ISO_FINAL (charsetp) >= 0) |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1973 code &= 0x7F7F7F7F; |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1974 c = DECODE_CHAR (charsetp, code); |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1975 if (c < 0) |
9c3255b975cc
(Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents:
88475
diff
changeset
|
1976 error ("Invalid code(s)"); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1977 return make_number (c); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1978 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1979 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1980 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1981 /* Return the first charset in CHARSET_LIST that contains C. |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1982 CHARSET_LIST is a list of charset IDs. If it is nil, use |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1983 Vcharset_ordered_list. */ |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1984 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1985 struct charset * |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
1986 char_charset (int c, Lisp_Object charset_list, unsigned int *code_return) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1987 { |
95493
c118c1277047
(char_charset): Return NULL if the arg charset_list is
Kenichi Handa <handa@m17n.org>
parents:
95430
diff
changeset
|
1988 int maybe_null = 0; |
c118c1277047
(char_charset): Return NULL if the arg charset_list is
Kenichi Handa <handa@m17n.org>
parents:
95430
diff
changeset
|
1989 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1990 if (NILP (charset_list)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1991 charset_list = Vcharset_ordered_list; |
95493
c118c1277047
(char_charset): Return NULL if the arg charset_list is
Kenichi Handa <handa@m17n.org>
parents:
95430
diff
changeset
|
1992 else |
c118c1277047
(char_charset): Return NULL if the arg charset_list is
Kenichi Handa <handa@m17n.org>
parents:
95430
diff
changeset
|
1993 maybe_null = 1; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1994 |
95260
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
1995 while (CONSP (charset_list)) |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1996 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1997 struct charset *charset = CHARSET_FROM_ID (XINT (XCAR (charset_list))); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1998 unsigned code = ENCODE_CHAR (charset, c); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
1999 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2000 if (code != CHARSET_INVALID_CODE (charset)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2001 { |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2002 if (code_return) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2003 *code_return = code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2004 return charset; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2005 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2006 charset_list = XCDR (charset_list); |
107986
8a09d4206862
charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2007 if (! maybe_null |
8a09d4206862
charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2008 && c <= MAX_UNICODE_CHAR |
8a09d4206862
charset.c (char_charset): Consider Vcharset_non_preferred_head only when the arg CHARSET_LIST is nil.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2009 && EQ (charset_list, Vcharset_non_preferred_head)) |
95260
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
2010 return CHARSET_FROM_ID (charset_unicode); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2011 } |
95493
c118c1277047
(char_charset): Return NULL if the arg charset_list is
Kenichi Handa <handa@m17n.org>
parents:
95430
diff
changeset
|
2012 return (maybe_null ? NULL |
c118c1277047
(char_charset): Return NULL if the arg charset_list is
Kenichi Handa <handa@m17n.org>
parents:
95430
diff
changeset
|
2013 : c <= MAX_5_BYTE_CHAR ? CHARSET_FROM_ID (charset_emacs) |
94921
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2014 : CHARSET_FROM_ID (charset_eight_bit)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2015 } |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2016 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2017 |
17052 | 2018 DEFUN ("split-char", Fsplit_char, Ssplit_char, 1, 1, 0, |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2019 doc: |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
2020 /*Return list of charset and one to four position-codes of CH. |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2021 The charset is decided by the current priority order of charsets. |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2022 A position-code is a byte value of each dimension of the code-point of |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
2023 CH in the charset. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2024 (Lisp_Object ch) |
17052 | 2025 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2026 struct charset *charset; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2027 int c, dimension; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2028 unsigned code; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2029 Lisp_Object val; |
17052 | 2030 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2031 CHECK_CHARACTER (ch); |
23883 | 2032 c = XFASTINT (ch); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2033 charset = CHAR_CHARSET (c); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2034 if (! charset) |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2035 abort (); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2036 code = ENCODE_CHAR (charset, c); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2037 if (code == CHARSET_INVALID_CODE (charset)) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2038 abort (); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2039 dimension = CHARSET_DIMENSION (charset); |
89568
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2040 for (val = Qnil; dimension > 0; dimension--) |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2041 { |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2042 val = Fcons (make_number (code & 0xFF), val); |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2043 code >>= 8; |
320914f34a77
(string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents:
89544
diff
changeset
|
2044 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2045 return Fcons (CHARSET_NAME (charset), val); |
17052 | 2046 } |
2047 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2048 |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2049 DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 2, 0, |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2050 doc: /* Return the charset of highest priority that contains CH. |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2051 If optional 2nd arg RESTRICTION is non-nil, it is a list of charsets |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2052 from which to find the charset. It may also be a coding system. In |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2053 that case, find the charset from what supported by that coding system. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2054 (Lisp_Object ch, Lisp_Object restriction) |
17052 | 2055 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2056 struct charset *charset; |
17052 | 2057 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2058 CHECK_CHARACTER (ch); |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2059 if (NILP (restriction)) |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2060 charset = CHAR_CHARSET (XINT (ch)); |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2061 else |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2062 { |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2063 if (CONSP (restriction)) |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2064 { |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2065 int c = XFASTINT (ch); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2066 |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2067 for (; CONSP (restriction); restriction = XCDR (restriction)) |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2068 { |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2069 struct charset *charset; |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2070 |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2071 CHECK_CHARSET_GET_CHARSET (XCAR (restriction), charset); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2072 if (ENCODE_CHAR (charset, c) != CHARSET_INVALID_CODE (charset)) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2073 return XCAR (restriction); |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2074 } |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2075 return Qnil; |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2076 } |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2077 restriction = coding_system_charset_list (restriction); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2078 charset = char_charset (XINT (ch), restriction, NULL); |
101778
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2079 if (! charset) |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2080 return Qnil; |
33994495e60c
(Fchar_charset): New optional arg restriction.
Kenichi Handa <handa@m17n.org>
parents:
100951
diff
changeset
|
2081 } |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2082 return (CHARSET_NAME (charset)); |
17052 | 2083 } |
2084 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2085 |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
2086 DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0, |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2087 doc: /* |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2088 Return charset of a character in the current buffer at position POS. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2089 If POS is nil, it defauls to the current point. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2090 If POS is out of range, the value is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2091 (Lisp_Object pos) |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
2092 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2093 Lisp_Object ch; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2094 struct charset *charset; |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
2095 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2096 ch = Fchar_after (pos); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2097 if (! INTEGERP (ch)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2098 return ch; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2099 charset = CHAR_CHARSET (XINT (ch)); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2100 return (CHARSET_NAME (charset)); |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
2101 } |
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
2102 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2103 |
17052 | 2104 DEFUN ("iso-charset", Fiso_charset, Siso_charset, 3, 3, 0, |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2105 doc: /* |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2106 Return charset of ISO's specification DIMENSION, CHARS, and FINAL-CHAR. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2107 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2108 ISO 2022's designation sequence (escape sequence) distinguishes charsets |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2109 by their DIMENSION, CHARS, and FINAL-CHAR, |
95254
0221518ac261
(Fencode_char, Fsplit_char): Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
94963
diff
changeset
|
2110 whereas Emacs distinguishes them by charset symbol. |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2111 See the documentation of the function `charset-info' for the meanings of |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
2112 DIMENSION, CHARS, and FINAL-CHAR. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2113 (Lisp_Object dimension, Lisp_Object chars, Lisp_Object final_char) |
17052 | 2114 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2115 int id; |
89962
77df4a7f419a
(Fdeclare_equiv_charset): Fix handing of CHARS.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2116 int chars_flag; |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
2117 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2118 check_iso_charset_parameter (dimension, chars, final_char); |
89962
77df4a7f419a
(Fdeclare_equiv_charset): Fix handing of CHARS.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2119 chars_flag = XFASTINT (chars) == 96; |
77df4a7f419a
(Fdeclare_equiv_charset): Fix handing of CHARS.
Kenichi Handa <handa@m17n.org>
parents:
89943
diff
changeset
|
2120 id = ISO_CHARSET_TABLE (XFASTINT (dimension), chars_flag, |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2121 XFASTINT (final_char)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2122 return (id >= 0 ? CHARSET_NAME (CHARSET_FROM_ID (id)) : Qnil); |
17052 | 2123 } |
2124 | |
2125 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2126 DEFUN ("clear-charset-maps", Fclear_charset_maps, Sclear_charset_maps, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2127 0, 0, 0, |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2128 doc: /* |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2129 Internal use only. |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2130 Clear temporary charset mapping tables. |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2131 It should be called only from temacs invoked for dumping. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2132 (void) |
17052 | 2133 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2134 if (temp_charset_work) |
31420 | 2135 { |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2136 free (temp_charset_work); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2137 temp_charset_work = NULL; |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
2138 } |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
2139 |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2140 if (CHAR_TABLE_P (Vchar_unify_table)) |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2141 Foptimize_char_table (Vchar_unify_table, Qnil); |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
2142 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2143 return Qnil; |
17052 | 2144 } |
2145 | |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2146 DEFUN ("charset-priority-list", Fcharset_priority_list, |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2147 Scharset_priority_list, 0, 1, 0, |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2148 doc: /* Return the list of charsets ordered by priority. |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2149 HIGHESTP non-nil means just return the highest priority one. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2150 (Lisp_Object highestp) |
31420 | 2151 { |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2152 Lisp_Object val = Qnil, list = Vcharset_ordered_list; |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
2153 |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2154 if (!NILP (highestp)) |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
2155 return CHARSET_NAME (CHARSET_FROM_ID (XINT (Fcar (list)))); |
17052 | 2156 |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2157 while (!NILP (list)) |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
2158 { |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
2159 val = Fcons (CHARSET_NAME (CHARSET_FROM_ID (XINT (XCAR (list)))), val); |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2160 list = XCDR (list); |
31420 | 2161 } |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2162 return Fnreverse (val); |
19384 | 2163 } |
2164 | |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2165 DEFUN ("set-charset-priority", Fset_charset_priority, Sset_charset_priority, |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2166 1, MANY, 0, |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2167 doc: /* Assign higher priority to the charsets given as arguments. |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2168 usage: (set-charset-priority &rest charsets) */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2169 (int nargs, Lisp_Object *args) |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
2170 { |
89471
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2171 Lisp_Object new_head, old_list, arglist[2]; |
89645
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2172 Lisp_Object list_2022, list_emacs_mule; |
88855
0382604a03ea
(Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents:
88817
diff
changeset
|
2173 int i, id; |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
2174 |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2175 old_list = Fcopy_sequence (Vcharset_ordered_list); |
89471
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2176 new_head = Qnil; |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2177 for (i = 0; i < nargs; i++) |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2178 { |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2179 CHECK_CHARSET_GET_ID (args[i], id); |
89471
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2180 if (! NILP (Fmemq (make_number (id), old_list))) |
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2181 { |
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2182 old_list = Fdelq (make_number (id), old_list); |
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2183 new_head = Fcons (make_number (id), new_head); |
31ac7465ef51
(Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents:
89452
diff
changeset
|
2184 } |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2185 } |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2186 arglist[0] = Fnreverse (new_head); |
94921
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2187 arglist[1] = Vcharset_non_preferred_head = old_list; |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2188 Vcharset_ordered_list = Fnconc (2, arglist); |
88874
82c5e4f67e4a
(charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents:
88860
diff
changeset
|
2189 charset_ordered_list_tick++; |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
2190 |
103742
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2191 charset_unibyte = -1; |
89645
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2192 for (old_list = Vcharset_ordered_list, list_2022 = list_emacs_mule = Qnil; |
89261
86acab1ffbe2
(Fset_charset_priority): Update Viso_2022_charset_list.
Kenichi Handa <handa@m17n.org>
parents:
89171
diff
changeset
|
2193 CONSP (old_list); old_list = XCDR (old_list)) |
86acab1ffbe2
(Fset_charset_priority): Update Viso_2022_charset_list.
Kenichi Handa <handa@m17n.org>
parents:
89171
diff
changeset
|
2194 { |
89263
208b5b32e08c
(Fset_charset_priority): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
89261
diff
changeset
|
2195 if (! NILP (Fmemq (XCAR (old_list), Viso_2022_charset_list))) |
89645
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2196 list_2022 = Fcons (XCAR (old_list), list_2022); |
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2197 if (! NILP (Fmemq (XCAR (old_list), Vemacs_mule_charset_list))) |
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2198 list_emacs_mule = Fcons (XCAR (old_list), list_emacs_mule); |
103742
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2199 if (charset_unibyte < 0) |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2200 { |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2201 struct charset *charset = CHARSET_FROM_ID (XINT (XCAR (old_list))); |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2202 |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2203 if (CHARSET_DIMENSION (charset) == 1 |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2204 && CHARSET_ASCII_COMPATIBLE_P (charset) |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2205 && CHARSET_MAX_CHAR (charset) >= 0x80) |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2206 charset_unibyte = CHARSET_ID (charset); |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2207 } |
89261
86acab1ffbe2
(Fset_charset_priority): Update Viso_2022_charset_list.
Kenichi Handa <handa@m17n.org>
parents:
89171
diff
changeset
|
2208 } |
89645
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2209 Viso_2022_charset_list = Fnreverse (list_2022); |
17d1d4813c04
(find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents:
89568
diff
changeset
|
2210 Vemacs_mule_charset_list = Fnreverse (list_emacs_mule); |
103742
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2211 if (charset_unibyte < 0) |
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2212 charset_unibyte = charset_iso_8859_1; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2213 |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2214 return Qnil; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2215 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2216 |
89375
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2217 DEFUN ("charset-id-internal", Fcharset_id_internal, Scharset_id_internal, |
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2218 0, 1, 0, |
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2219 doc: /* Internal use only. |
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2220 Return charset identification number of CHARSET. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109165
diff
changeset
|
2221 (Lisp_Object charset) |
35950
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
2222 { |
89375
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2223 int id; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2224 |
89375
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2225 CHECK_CHARSET_GET_ID (charset, id); |
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2226 return make_number (id); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2227 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2228 |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2229 struct charset_sort_data |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2230 { |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2231 Lisp_Object charset; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2232 int id; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2233 int priority; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2234 }; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2235 |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2236 static int |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2237 charset_compare (const void *d1, const void *d2) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2238 { |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2239 const struct charset_sort_data *data1 = d1, *data2 = d2; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2240 return (data1->priority - data2->priority); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2241 } |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2242 |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2243 DEFUN ("sort-charsets", Fsort_charsets, Ssort_charsets, 1, 1, 0, |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2244 doc: /* Sort charset list CHARSETS by a priority of each charset. |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2245 Return the sorted list. CHARSETS is modified by side effects. |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2246 See also `charset-priority-list' and `set-charset-priority'. */) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2247 (Lisp_Object charsets) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2248 { |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2249 Lisp_Object len = Flength (charsets); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2250 int n = XFASTINT (len), i, j, done; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2251 Lisp_Object tail, elt, attrs; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2252 struct charset_sort_data *sort_data; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2253 int id, min_id, max_id; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2254 USE_SAFE_ALLOCA; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2255 |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2256 if (n == 0) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2257 return Qnil; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2258 SAFE_ALLOCA (sort_data, struct charset_sort_data *, sizeof (*sort_data) * n); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2259 for (tail = charsets, i = 0; CONSP (tail); tail = XCDR (tail), i++) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2260 { |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2261 elt = XCAR (tail); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2262 CHECK_CHARSET_GET_ATTR (elt, attrs); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2263 sort_data[i].charset = elt; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2264 sort_data[i].id = id = XINT (CHARSET_ATTR_ID (attrs)); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2265 if (i == 0) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2266 min_id = max_id = id; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2267 else if (id < min_id) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2268 min_id = id; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2269 else if (id > max_id) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2270 max_id = id; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2271 } |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2272 for (done = 0, tail = Vcharset_ordered_list, i = 0; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2273 done < n && CONSP (tail); tail = XCDR (tail), i++) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2274 { |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2275 elt = XCAR (tail); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2276 id = XFASTINT (elt); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2277 if (id >= min_id && id <= max_id) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2278 for (j = 0; j < n; j++) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2279 if (sort_data[j].id == id) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2280 { |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2281 sort_data[j].priority = i; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2282 done++; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2283 } |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2284 } |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2285 qsort (sort_data, n, sizeof *sort_data, charset_compare); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2286 for (i = 0, tail = charsets; CONSP (tail); tail = XCDR (tail), i++) |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2287 XSETCAR (tail, sort_data[i].charset); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2288 SAFE_FREE (); |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2289 return charsets; |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2290 } |
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2291 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2292 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2293 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2294 init_charset (void) |
17052 | 2295 { |
98152
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2296 Lisp_Object tempdir; |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2297 tempdir = Fexpand_file_name (build_string ("charsets"), Vdata_directory); |
103742
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2298 if (access ((char *) SDATA (tempdir), 0) < 0) |
98152
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2299 { |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2300 dir_warning ("Error: charsets directory (%s) does not exist.\n\ |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2301 Emacs will not function correctly without the character map files.\n\ |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2302 Please check your installation!\n", |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2303 tempdir); |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2304 /* TODO should this be a fatal error? (Bug#909) */ |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2305 } |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2306 |
d8cad3d1e47c
(init_charset): Warn if etc/charsets not found. (Bug#909)
Glenn Morris <rgm@gnu.org>
parents:
98138
diff
changeset
|
2307 Vcharset_map_path = Fcons (tempdir, Qnil); |
17052 | 2308 } |
2309 | |
2310 | |
21514 | 2311 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2312 init_charset_once (void) |
17052 | 2313 { |
2314 int i, j, k; | |
2315 | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2316 for (i = 0; i < ISO_MAX_DIMENSION; i++) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2317 for (j = 0; j < ISO_MAX_CHARS; j++) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2318 for (k = 0; k < ISO_MAX_FINAL; k++) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2319 iso_charset_table[i][j][k] = -1; |
17052 | 2320 |
23656
031653c4634a
(init_charset_once): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
23654
diff
changeset
|
2321 for (i = 0; i < 256; i++) |
111743
913b779aa4ee
Fix decoding of emacs-mule coding system.
Kenichi Handa <handa@m17n.org>
parents:
109710
diff
changeset
|
2322 emacs_mule_charset[i] = -1; |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2323 |
88683
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
2324 charset_jisx0201_roman = -1; |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
2325 charset_jisx0208_1978 = -1; |
39ba56532289
(charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents:
88678
diff
changeset
|
2326 charset_jisx0208 = -1; |
102986
02685d936706
(charset_ksc5601): New variable.
Kenichi Handa <handa@m17n.org>
parents:
102955
diff
changeset
|
2327 charset_ksc5601 = -1; |
17052 | 2328 } |
2329 | |
2330 #ifdef emacs | |
2331 | |
21514 | 2332 void |
109126
aec1143e8d85
Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109100
diff
changeset
|
2333 syms_of_charset (void) |
17052 | 2334 { |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2335 DEFSYM (Qcharsetp, "charsetp"); |
17052 | 2336 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2337 DEFSYM (Qascii, "ascii"); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2338 DEFSYM (Qunicode, "unicode"); |
95260
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
2339 DEFSYM (Qemacs, "emacs"); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2340 DEFSYM (Qeight_bit, "eight-bit"); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2341 DEFSYM (Qiso_8859_1, "iso-8859-1"); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2342 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2343 DEFSYM (Qgl, "gl"); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2344 DEFSYM (Qgr, "gr"); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2345 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2346 staticpro (&Vcharset_ordered_list); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2347 Vcharset_ordered_list = Qnil; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2348 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2349 staticpro (&Viso_2022_charset_list); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2350 Viso_2022_charset_list = Qnil; |
17052 | 2351 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2352 staticpro (&Vemacs_mule_charset_list); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2353 Vemacs_mule_charset_list = Qnil; |
17052 | 2354 |
91577
0d4efe9869a2
(syms_of_charset): Set QCtest and Qeq.
Kenichi Handa <handa@m17n.org>
parents:
91327
diff
changeset
|
2355 /* Don't staticpro them here. It's done in syms_of_fns. */ |
110678
7e83565f8d0e
Use intern_c_string instead of intern.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
110361
diff
changeset
|
2356 QCtest = intern_c_string (":test"); |
7e83565f8d0e
Use intern_c_string instead of intern.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
110361
diff
changeset
|
2357 Qeq = intern_c_string ("eq"); |
91577
0d4efe9869a2
(syms_of_charset): Set QCtest and Qeq.
Kenichi Handa <handa@m17n.org>
parents:
91327
diff
changeset
|
2358 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2359 staticpro (&Vcharset_hash_table); |
89483 | 2360 { |
2361 Lisp_Object args[2]; | |
2362 args[0] = QCtest; | |
2363 args[1] = Qeq; | |
2364 Vcharset_hash_table = Fmake_hash_table (2, args); | |
2365 } | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2366 |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2367 charset_table_size = 128; |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2368 charset_table = ((struct charset *) |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2369 xmalloc (sizeof (struct charset) * charset_table_size)); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2370 charset_table_used = 0; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
2371 |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2372 defsubr (&Scharsetp); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2373 defsubr (&Smap_charset_chars); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2374 defsubr (&Sdefine_charset_internal); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2375 defsubr (&Sdefine_charset_alias); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2376 defsubr (&Scharset_plist); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2377 defsubr (&Sset_charset_plist); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2378 defsubr (&Sunify_charset); |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
2379 defsubr (&Sget_unused_iso_final_char); |
17052 | 2380 defsubr (&Sdeclare_equiv_charset); |
2381 defsubr (&Sfind_charset_region); | |
2382 defsubr (&Sfind_charset_string); | |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2383 defsubr (&Sdecode_char); |
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2384 defsubr (&Sencode_char); |
17052 | 2385 defsubr (&Ssplit_char); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2386 defsubr (&Smake_char); |
17052 | 2387 defsubr (&Schar_charset); |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
2388 defsubr (&Scharset_after); |
17052 | 2389 defsubr (&Siso_charset); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2390 defsubr (&Sclear_charset_maps); |
88641
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2391 defsubr (&Scharset_priority_list); |
203bb5221b98
(Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents:
88634
diff
changeset
|
2392 defsubr (&Sset_charset_priority); |
89375
4b653615bbe4
(Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents:
89365
diff
changeset
|
2393 defsubr (&Scharset_id_internal); |
109710
62d9702eb261
Improve the encoding by compound-text-with-extensions.
Kenichi Handa <handa@etlken>
parents:
107257
diff
changeset
|
2394 defsubr (&Ssort_charsets); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2395 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2396 DEFVAR_LISP ("charset-map-path", Vcharset_map_path, |
98138 | 2397 doc: /* *List of directories to search for charset map files. */); |
89787
cbb58e8c4481
(Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents:
89758
diff
changeset
|
2398 Vcharset_map_path = Qnil; |
17052 | 2399 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2400 DEFVAR_BOOL ("inhibit-load-charset-map", inhibit_load_charset_map, |
99977
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2401 doc: /* Inhibit loading of charset maps. Used when dumping Emacs. */); |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2402 inhibit_load_charset_map = 0; |
b9e04d1588d7
(Vchar_unified_charset_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents:
98152
diff
changeset
|
2403 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2404 DEFVAR_LISP ("charset-list", Vcharset_list, |
88634
ad7c09ee6cf9
(Fdefine_charset_alias): Update Vcharset_list.
Dave Love <fx@gnu.org>
parents:
88626
diff
changeset
|
2405 doc: /* List of all charsets ever defined. */); |
88364
f6557aebe110
Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents:
43144
diff
changeset
|
2406 Vcharset_list = Qnil; |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
2407 |
112364
42e22c4f06b7
Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents:
112278
diff
changeset
|
2408 DEFVAR_LISP ("current-iso639-language", Vcurrent_iso639_language, |
94921
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2409 doc: /* ISO639 language mnemonic symbol for the current language environment. |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2410 If the current language environment is for multiple languages (e.g. "Latin-1"), |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2411 the value may be a list of mnemonics. */); |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2412 Vcurrent_iso639_language = Qnil; |
c2449f1de3ac
(Vcharset_non_preferred_head): New variable.
Kenichi Handa <handa@m17n.org>
parents:
93473
diff
changeset
|
2413 |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2414 charset_ascii |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2415 = define_charset_internal (Qascii, 1, "\x00\x7F\x00\x00\x00\x00", |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2416 0, 127, 'B', -1, 0, 1, 0, 0); |
89055
77ff0866e8b1
(Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents:
88985
diff
changeset
|
2417 charset_iso_8859_1 |
77ff0866e8b1
(Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents:
88985
diff
changeset
|
2418 = define_charset_internal (Qiso_8859_1, 1, "\x00\xFF\x00\x00\x00\x00", |
77ff0866e8b1
(Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents:
88985
diff
changeset
|
2419 0, 255, -1, -1, -1, 1, 0, 0); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2420 charset_unicode |
88957
afdff51dae58
(syms_of_charset): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
88948
diff
changeset
|
2421 = define_charset_internal (Qunicode, 3, "\x00\xFF\x00\xFF\x00\x10", |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2422 0, MAX_UNICODE_CHAR, -1, 0, -1, 1, 0, 0); |
95260
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
2423 charset_emacs |
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
2424 = define_charset_internal (Qemacs, 3, "\x00\xFF\x00\xFF\x00\x3F", |
b1fb1a9bf2c2
(Qemacs, charset_emacs): New variables.
Kenichi Handa <handa@m17n.org>
parents:
95254
diff
changeset
|
2425 0, MAX_5_BYTE_CHAR, -1, 0, -1, 1, 1, 0); |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2426 charset_eight_bit |
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2427 = define_charset_internal (Qeight_bit, 1, "\x80\xFF\x00\x00\x00\x00", |
93288
afe160d77eb3
(Fdefine_charset_internal): Change the way of
Kenichi Handa <handa@m17n.org>
parents:
91577
diff
changeset
|
2428 128, 255, -1, 0, -1, 0, 1, |
88948
1ff7f42f40ad
(charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents:
88927
diff
changeset
|
2429 MAX_5_BYTE_CHAR + 1); |
103742
ffed171dcaeb
(Fset_charset_priority): Update charset_unibyte.
Kenichi Handa <handa@m17n.org>
parents:
103356
diff
changeset
|
2430 charset_unibyte = charset_iso_8859_1; |
17052 | 2431 } |
2432 | |
2433 #endif /* emacs */ | |
52401 | 2434 |