annotate src/charset.c @ 111713:812a929d6b55

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