annotate src/charset.c @ 89787:cbb58e8c4481

(Vcharset_map_directory): Deleted. (Vcharset_map_path): New variable (load_charset_map_from_file): Use Vcharset_map_path instead. (init_charset): Initialize Vcharset_map_path. (syms_of_charset): Delete declaration of "charset-map-directory", add declaration of "charset-map-path".
author Kenichi Handa <handa@m17n.org>
date Fri, 30 Jan 2004 02:14:46 +0000
parents b07ce3d8fc4e
children c4c848b80f86
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.
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2 Copyright (C) 1995, 97, 98, 2000, 2001 Electrotechnical Laboratory, JAPAN.
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
3 Licensed to the Free Software Foundation.
38394
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
4 Copyright (C) 2001 Free Software Foundation, Inc.
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
5 Copyright (C) 2003
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
6 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
7 Registration Number H13PRO009
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
8
17071
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
9 This file is part of GNU Emacs.
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
10
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
11 GNU Emacs is free software; you can redistribute it and/or modify
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
12 it under the terms of the GNU General Public License as published by
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
13 the Free Software Foundation; either version 2, or (at your option)
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
14 any later version.
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
15
17071
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
16 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
17 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
18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
19 GNU General Public License for more details.
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
20
17071
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
21 You should have received a copy of the GNU General Public License
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
22 along with GNU Emacs; see the file COPYING. If not, write to
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
23 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
70194012fb3a Fix FSF address in comment.
Karl Heuer <kwzh@gnu.org>
parents: 17052
diff changeset
24 Boston, MA 02111-1307, USA. */
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
25
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25611
diff changeset
26 #include <config.h>
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 25611
diff changeset
27
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
28 #include <stdio.h>
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
29 #include <unistd.h>
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
30 #include <ctype.h>
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
31 #include <sys/types.h>
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
32 #include "lisp.h"
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
33 #include "character.h"
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
34 #include "charset.h"
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
35 #include "coding.h"
17843
f03ff9d069c6 Include disptab.h.
Kenichi Handa <handa@m17n.org>
parents: 17834
diff changeset
36 #include "disptab.h"
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
37 #include "buffer.h"
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
38
88543
f14d2bf6caa4 (load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents: 88524
diff changeset
39 /*** GENERAL NOTES on CODED CHARACTER SETS (CHARSETS) ***
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
40
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
41 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
42 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
43 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
44 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
45 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
46
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
47 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
48 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
49 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
50 charset_table as a struct charset.
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
51
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
52 */
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
53
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
54 /* 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
55 Lisp. */
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
56 Lisp_Object Vcharset_list;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
57
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
58 /* 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
59 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
60 Lisp_Object Vcharset_hash_table;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
61
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
62 /* Table of struct charset. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
63 struct charset *charset_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 static int charset_table_size;
89683
d3302f68a7cf (charset_table_used): Make it static.
Kenichi Handa <handa@m17n.org>
parents: 89645
diff changeset
66 static int charset_table_used;
88364
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 Lisp_Object Qcharsetp;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
69
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
70 /* Special charset symbols. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
71 Lisp_Object Qascii;
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
72 Lisp_Object Qeight_bit;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
73 Lisp_Object Qiso_8859_1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
74 Lisp_Object Qunicode;
20720
f084bb8d535f (min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents: 20705
diff changeset
75
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
76 /* The corresponding charsets. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
77 int charset_ascii;
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
78 int charset_eight_bit;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
79 int charset_iso_8859_1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
80 int charset_unicode;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
81
88683
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
82 /* The other special charsets. */
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
83 int charset_jisx0201_roman;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
84 int charset_jisx0208_1978;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
85 int charset_jisx0208;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
86
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
87 /* Value of charset attribute `charset-iso-plane'. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
88 Lisp_Object Qgl, Qgr;
23489
09201cebfa21 (Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents: 23427
diff changeset
89
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
90 /* Charset of unibyte characters. */
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
91 int charset_unibyte;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
92
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
93 /* List of charsets ordered by the priority. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
94 Lisp_Object Vcharset_ordered_list;
23489
09201cebfa21 (Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents: 23427
diff changeset
95
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
96 /* 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
97 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
98 -1. */
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
99 unsigned short charset_ordered_list_tick;
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
100
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
101 /* List of iso-2022 charsets. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
102 Lisp_Object Viso_2022_charset_list;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
103
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
104 /* List of emacs-mule charsets. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
105 Lisp_Object Vemacs_mule_charset_list;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
106
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
107 struct charset *emacs_mule_charset[256];
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
108
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
109 /* Mapping table from ISO2022's charset (specified by DIMENSION,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
110 CHARS, and FINAL-CHAR) to Emacs' charset. */
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
111 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
112
89787
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
113 Lisp_Object Vcharset_map_path;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
114
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
115 Lisp_Object Vchar_unified_charset_table;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
116
88927
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
117 /* Defined in chartab.c */
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
118 extern void
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
119 map_char_table_for_charset P_ ((void (*c_function) (Lisp_Object, Lisp_Object),
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
120 Lisp_Object function, Lisp_Object table,
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
121 Lisp_Object arg, struct charset *charset,
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
122 unsigned from, unsigned to));
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
123
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
124 #define CODE_POINT_TO_INDEX(charset, code) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
125 ((charset)->code_linear_p \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
126 ? (code) - (charset)->min_code \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
127 : (((charset)->code_space_mask[(code) >> 24] & 0x8) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
128 && ((charset)->code_space_mask[((code) >> 16) & 0xFF] & 0x4) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
129 && ((charset)->code_space_mask[((code) >> 8) & 0xFF] & 0x2) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
130 && ((charset)->code_space_mask[(code) & 0xFF] & 0x1)) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
131 ? (((((code) >> 24) - (charset)->code_space[12]) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
132 * (charset)->code_space[11]) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
133 + (((((code) >> 16) & 0xFF) - (charset)->code_space[8]) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
134 * (charset)->code_space[7]) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
135 + (((((code) >> 8) & 0xFF) - (charset)->code_space[4]) \
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
136 * (charset)->code_space[3]) \
88678
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
137 + (((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
138 - ((charset)->char_index_offset)) \
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
139 : -1)
20705
a949dc65fbea (nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents: 20636
diff changeset
140
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
141
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
142 /* 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
143 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
144
88678
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
145 #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
146 ((charset)->code_linear_p \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
147 ? (idx) + (charset)->min_code \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
148 : (idx += (charset)->char_index_offset, \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
149 (((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
150 | (((charset)->code_space[4] \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
151 + ((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
152 << 8) \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
153 | (((charset)->code_space[8] \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
154 + ((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
155 << 16) \
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
156 | (((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
157 << 24))))
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
158
22703
15e0119749cf (Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents: 22524
diff changeset
159
19384
6ce37633c7f9 Many doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19025
diff changeset
160
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
161
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
162 /* 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
163 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
164 int charset_map_loaded;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
165
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
166 struct charset_map_entries
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
167 {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
168 struct {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
169 unsigned from, to;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
170 int c;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
171 } entry[0x10000];
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
172 struct charset_map_entries *next;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
173 };
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
174
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
175 /* Load the mapping information for CHARSET from ENTRIES.
20933
5ceea9d50194 (invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents: 20890
diff changeset
176
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
177 If CONTROL_FLAG is 0, setup CHARSET->min_char and CHARSET->max_char.
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
178
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
179 If CONTROL_FLAG is 1, setup CHARSET->min_char, CHARSET->max_char,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
180 CHARSET->decoder, and CHARSET->encoder.
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
181
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
182 If CONTROL_FLAG is 2, setup CHARSET->deunifier and
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
183 Vchar_unify_table. If Vchar_unified_charset_table is non-nil,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
184 setup it too. */
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
185
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
186 static void
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
187 load_charset_map (charset, entries, n_entries, control_flag)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
188 struct charset *charset;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
189 struct charset_map_entries *entries;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
190 int n_entries;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
191 int control_flag;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
192 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
193 Lisp_Object vec, table;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
194 unsigned max_code = CHARSET_MAX_CODE (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
195 int ascii_compatible_p = charset->ascii_compatible_p;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
196 int min_char, max_char, nonascii_min_char;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
197 int i;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
198 unsigned char *fast_map = charset->fast_map;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
199
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
200 if (n_entries <= 0)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
201 return;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
202
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
203 if (control_flag > 0)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
204 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
205 int n = CODE_POINT_TO_INDEX (charset, max_code) + 1;
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
206
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
207 table = Fmake_char_table (Qnil, Qnil);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
208 if (control_flag == 1)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
209 vec = Fmake_vector (make_number (n), make_number (-1));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
210 else if (! CHAR_TABLE_P (Vchar_unify_table))
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
211 Vchar_unify_table = Fmake_char_table (Qnil, Qnil);
20933
5ceea9d50194 (invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents: 20890
diff changeset
212
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
213 charset_map_loaded = 1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
214 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
215
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
216 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
217 nonascii_min_char = MAX_CHAR;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
218 for (i = 0; i < n_entries; i++)
23767
1dfb6d38354f (non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents: 23720
diff changeset
219 {
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
220 unsigned from, to;
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
221 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
222 int from_c, to_c;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
223 int idx = i % 0x10000;
25250
2228d0a678ef (non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents: 23978
diff changeset
224
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
225 if (i > 0 && idx == 0)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
226 entries = entries->next;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
227 from = entries->entry[idx].from;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
228 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
229 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
230 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
231 if (from == to)
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
232 {
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
233 to_index = from_index;
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
234 to_c = from_c;
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
235 }
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
236 else
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
237 {
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
238 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
239 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
240 }
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
241 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
242 continue;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
243
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
244 if (control_flag < 2)
25250
2228d0a678ef (non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents: 23978
diff changeset
245 {
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
246 int c;
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
247
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
248 if (to_c > max_char)
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
249 max_char = to_c;
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
250 else if (from_c < min_char)
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
251 min_char = from_c;
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
252 if (ascii_compatible_p)
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
253 {
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
254 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
255 {
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
256 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
257 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
258 }
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
259 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
260 {
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
261 nonascii_min_char = 0x80;
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
262 }
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
263 }
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
264
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
265 for (c = from_c; c <= to_c; c++)
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
266 CHARSET_FAST_MAP_SET (c, fast_map);
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
267
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
268 if (control_flag == 1)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
269 {
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
270 unsigned code = from;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
271
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
272 if (CHARSET_COMPACT_CODES_P (charset))
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
273 while (1)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
274 {
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
275 ASET (vec, from_index, make_number (from_c));
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
276 if (NILP (CHAR_TABLE_REF (table, from_c)))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
277 CHAR_TABLE_SET (table, from_c, make_number (code));
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
278 if (from_index == to_index)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
279 break;
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
280 from_index++, from_c++;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
281 code = INDEX_TO_CODE_POINT (charset, from_index);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
282 }
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
283 else
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
284 for (; from_index <= to_index; from_index++, from_c++)
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
285 {
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
286 ASET (vec, from_index, make_number (from_c));
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
287 if (NILP (CHAR_TABLE_REF (table, from_c)))
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
288 CHAR_TABLE_SET (table, from_c, make_number (from_index));
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
289 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
290 }
25250
2228d0a678ef (non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents: 23978
diff changeset
291 }
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
292 else
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
293 {
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
294 unsigned code = from;
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
295
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
296 while (1)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
297 {
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
298 int c1 = DECODE_CHAR (charset, code);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
299
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
300 if (c1 >= 0)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
301 {
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
302 CHAR_TABLE_SET (table, from_c, make_number (c1));
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
303 CHAR_TABLE_SET (Vchar_unify_table, c1, make_number (from_c));
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
304 if (CHAR_TABLE_P (Vchar_unified_charset_table))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
305 CHAR_TABLE_SET (Vchar_unified_charset_table, c1,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
306 CHARSET_NAME (charset));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
307 }
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
308 if (from_index == to_index)
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
309 break;
88696
8646a672489b (load_charset_map): Handle the case that from < to correctly.
Kenichi Handa <handa@m17n.org>
parents: 88683
diff changeset
310 from_index++, from_c++;
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
311 code = INDEX_TO_CODE_POINT (charset, from_index);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
312 }
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
313 }
23767
1dfb6d38354f (non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents: 23720
diff changeset
314 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
315
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
316 if (control_flag < 2)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
317 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
318 CHARSET_MIN_CHAR (charset) = (ascii_compatible_p
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
319 ? nonascii_min_char : min_char);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
320 CHARSET_MAX_CHAR (charset) = max_char;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
321 if (control_flag == 1)
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
322 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
323 CHARSET_DECODER (charset) = vec;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
324 CHARSET_ENCODER (charset) = table;
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
325 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
326 }
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
327 else
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
328 CHARSET_DEUNIFIER (charset) = table;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
329 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
330
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
331
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
332 /* Read a hexadecimal number (preceded by "0x") from the file FP while
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
333 paying attention to comment charcter '#'. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
334
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
335 static INLINE unsigned
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
336 read_hex (fp, eof)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
337 FILE *fp;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
338 int *eof;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
339 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
340 int c;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
341 unsigned n;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
342
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
343 while ((c = getc (fp)) != EOF)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
344 {
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
345 if (c == '#')
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
346 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
347 while ((c = getc (fp)) != EOF && c != '\n');
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
348 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
349 else if (c == '0')
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
350 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
351 if ((c = getc (fp)) == EOF || c == 'x')
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
352 break;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
353 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
354 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
355 if (c == EOF)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
356 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
357 *eof = 1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
358 return 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
359 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
360 *eof = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
361 n = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
362 if (c == 'x')
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
363 while ((c = getc (fp)) != EOF && isxdigit (c))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
364 n = ((n << 4)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
365 | (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
366 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
367 while ((c = getc (fp)) != EOF && isdigit (c))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
368 n = (n * 10) + c - '0';
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
369 if (c != EOF)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
370 ungetc (c, fp);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
371 return n;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
372 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
373
38394
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
374
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
375 /* 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
376 Each line of MAPFILE has this form
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
377 0xAAAA 0xCCCC
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
378 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
379 character code, or this form
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
380 0xAAAA-0xBBBB 0xCCCC
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
381 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
382 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
383
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
384 The returned vector has this form:
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
385 [ CODE1 CHAR1 CODE2 CHAR2 .... ]
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
386 where CODE1 is a code-point or a cons of code-points specifying a
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
387 range. */
38394
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
388
88433
9a1e7befb0b2 (parse_charset_map): Remove an unused variable.
Kenichi Handa <handa@m17n.org>
parents: 88364
diff changeset
389 extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));
9a1e7befb0b2 (parse_charset_map): Remove an unused variable.
Kenichi Handa <handa@m17n.org>
parents: 88364
diff changeset
390
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
391 static void
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
392 load_charset_map_from_file (charset, mapfile, control_flag)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
393 struct charset *charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
394 Lisp_Object mapfile;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
395 int control_flag;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
396 {
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
397 unsigned min_code = CHARSET_MIN_CODE (charset);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
398 unsigned max_code = CHARSET_MAX_CODE (charset);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
399 int fd;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
400 FILE *fp;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
401 int eof;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
402 Lisp_Object suffixes;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
403 struct charset_map_entries *head, *entries;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
404 int n_entries;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
405
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
406 suffixes = Fcons (build_string (".map"),
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
407 Fcons (build_string (".TXT"), Qnil));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
408
89787
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
409 fd = openp (Vcharset_map_path, mapfile, suffixes, NULL, Qnil);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
410 if (fd < 0
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
411 || ! (fp = fdopen (fd, "r")))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
412 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
413 add_to_log ("Failure in loading charset map: %S", mapfile, Qnil);
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
414 return;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
415 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
416
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
417 head = entries = ((struct charset_map_entries *)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
418 alloca (sizeof (struct charset_map_entries)));
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
419 n_entries = 0;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
420 eof = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
421 while (1)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
422 {
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
423 unsigned from, to;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
424 int c;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
425 int idx;
38394
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
426
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
427 from = read_hex (fp, &eof);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
428 if (eof)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
429 break;
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
430 if (getc (fp) == '-')
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
431 to = read_hex (fp, &eof);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
432 else
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
433 to = from;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
434 c = (int) read_hex (fp, &eof);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
435
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
436 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
437 continue;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
438
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
439 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
440 {
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
441 entries->next = ((struct charset_map_entries *)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
442 alloca (sizeof (struct charset_map_entries)));
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
443 entries = entries->next;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
444 }
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
445 idx = n_entries % 0x10000;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
446 entries->entry[idx].from = from;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
447 entries->entry[idx].to = to;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
448 entries->entry[idx].c = c;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
449 n_entries++;
88364
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 fclose (fp);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
452 close (fd);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
453
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
454 load_charset_map (charset, head, n_entries, control_flag);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
455 }
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
456
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
457 static void
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
458 load_charset_map_from_vector (charset, vec, control_flag)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
459 struct charset *charset;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
460 Lisp_Object vec;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
461 int control_flag;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
462 {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
463 unsigned min_code = CHARSET_MIN_CODE (charset);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
464 unsigned max_code = CHARSET_MAX_CODE (charset);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
465 struct charset_map_entries *head, *entries;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
466 int n_entries;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
467 int len = ASIZE (vec);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
468 int i;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
469
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
470 if (len % 2 == 1)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
471 {
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
472 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
473 return;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
474 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
475
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
476 head = entries = ((struct charset_map_entries *)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
477 alloca (sizeof (struct charset_map_entries)));
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
478 n_entries = 0;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
479 for (i = 0; i < len; i += 2)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
480 {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
481 Lisp_Object val, val2;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
482 unsigned from, to;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
483 int c;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
484 int idx;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
485
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
486 val = AREF (vec, i);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
487 if (CONSP (val))
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
488 {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
489 val2 = XCDR (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
490 val = XCAR (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
491 CHECK_NATNUM (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
492 CHECK_NATNUM (val2);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
493 from = XFASTINT (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
494 to = XFASTINT (val2);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
495 }
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
496 else
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
497 {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
498 CHECK_NATNUM (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
499 from = to = XFASTINT (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
500 }
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
501 val = AREF (vec, i + 1);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
502 CHECK_NATNUM (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
503 c = XFASTINT (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
504
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
505 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
506 continue;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
507
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
508 if ((n_entries % 0x10000) == 0)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
509 {
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
510 entries->next = ((struct charset_map_entries *)
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
511 alloca (sizeof (struct charset_map_entries)));
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
512 entries = entries->next;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
513 }
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
514 idx = n_entries % 0x10000;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
515 entries->entry[idx].from = from;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
516 entries->entry[idx].to = to;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
517 entries->entry[idx].c = c;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
518 n_entries++;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
519 }
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
520
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
521 load_charset_map (charset, head, n_entries, control_flag);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
522 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
523
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
524 static void
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
525 load_charset (charset)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
526 struct charset *charset;
38394
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
527 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
528 if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP_DEFERRED)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
529 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
530 Lisp_Object map;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
531
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
532 map = CHARSET_MAP (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
533 if (STRINGP (map))
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
534 load_charset_map_from_file (charset, map, 1);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
535 else
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
536 load_charset_map_from_vector (charset, map, 1);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
537 CHARSET_METHOD (charset) = CHARSET_METHOD_MAP;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
538 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
539 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
540
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
541
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
542 DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
543 doc: /* Return non-nil if and only if OBJECT is a charset.*/)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
544 (object)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
545 Lisp_Object object;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
546 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
547 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
548 }
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
549
245ae371bd4d (char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents: 36521
diff changeset
550
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
551 void
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
552 map_charset_chars (c_function, function, arg,
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
553 charset, from, to)
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
554 void (*c_function) P_ ((Lisp_Object, Lisp_Object));
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
555 Lisp_Object function, arg;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
556 struct charset *charset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
557 unsigned from, to;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
558 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
559 Lisp_Object range;
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
560 int partial;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
561
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
562 if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP_DEFERRED)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
563 load_charset (charset);
21445
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
564
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
565 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
566 || to < CHARSET_MAX_CODE (charset));
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
567
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
568 if (CHARSET_UNIFIED_P (charset)
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
569 && CHAR_TABLE_P (CHARSET_DEUNIFIER (charset)))
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
570 {
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
571 map_char_table_for_charset (c_function, function,
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
572 CHARSET_DEUNIFIER (charset), arg,
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
573 partial ? charset : NULL, from, to);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
574 }
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
575
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
576 if (CHARSET_METHOD (charset) == CHARSET_METHOD_OFFSET)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
577 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
578 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
579 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
580 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
581 int to_c = to_idx + CHARSET_CODE_OFFSET (charset);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
582
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
583 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
584 if (NILP (function))
89683
d3302f68a7cf (charset_table_used): Make it static.
Kenichi Handa <handa@m17n.org>
parents: 89645
diff changeset
585 (*c_function) (arg, range);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
586 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
587 call2 (function, range, arg);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
588 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
589 else if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
590 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
591 if (! CHAR_TABLE_P (CHARSET_ENCODER (charset)))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
592 return;
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
593 if (CHARSET_ASCII_COMPATIBLE_P (charset) && from <= 127)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
594 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
595 range = Fcons (make_number (from), make_number (to));
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
596 if (to >= 128)
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
597 XSETCAR (range, make_number (127));
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
598
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
599 if (NILP (function))
89683
d3302f68a7cf (charset_table_used): Make it static.
Kenichi Handa <handa@m17n.org>
parents: 89645
diff changeset
600 (*c_function) (arg, range);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
601 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
602 call2 (function, range, arg);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
603 }
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
604 map_char_table_for_charset (c_function, function,
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
605 CHARSET_ENCODER (charset), arg,
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
606 partial ? charset : NULL, from, to);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
607 }
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
608 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
609 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
610 Lisp_Object subset_info;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
611 int offset;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
612
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
613 subset_info = CHARSET_SUBSET (charset);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
614 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
615 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
616 from -= offset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
617 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
618 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
619 to -= offset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
620 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
621 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
622 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
623 }
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
624 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
625 {
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
626 Lisp_Object parents;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
627
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
628 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
629 parents = XCDR (parents))
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
630 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
631 int offset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
632 unsigned this_from, this_to;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
633
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
634 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
635 offset = XINT (XCDR (XCAR (parents)));
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
636 this_from = from - offset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
637 this_to = to - offset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
638 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
639 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
640 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
641 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
642 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
643 this_from, this_to);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
644 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
645 }
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
646 }
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
647
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
648 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
649 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
650 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
651 argument ARG.
88496
959dea33a8d5 (Fmap_charset_chars): Fix docstring.
Kenichi Handa <handa@m17n.org>
parents: 88490
diff changeset
652
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
653 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
654 characters contained in CHARSET.
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
655
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
656 The optional 4th and 5th arguments FROM-CODE and TO-CODE specify the
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
657 range of code points of target characters. */)
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
658 (function, charset, arg, from_code, to_code)
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
659 Lisp_Object function, charset, arg, from_code, to_code;
17727
9d39361ce928 (unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 17366
diff changeset
660 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
661 struct charset *cs;
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
662 unsigned from, to;
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
663
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
664 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
665 if (NILP (from_code))
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
666 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
667 else
7702a9d9edff (Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents: 88874
diff changeset
668 {
7702a9d9edff (Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents: 88874
diff changeset
669 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
670 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
671 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
672 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
673 }
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
674 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
675 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
676 else
7702a9d9edff (Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents: 88874
diff changeset
677 {
7702a9d9edff (Fmap_charset_chars): Fix handling of default value for FROM_CODE
Kenichi Handa <handa@m17n.org>
parents: 88874
diff changeset
678 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
679 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
680 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
681 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
682 }
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
683 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
684 return Qnil;
20705
a949dc65fbea (nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents: 20636
diff changeset
685 }
22927
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
686
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
687
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
688 /* 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
689 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
690 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
691 detail. */
22927
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
692
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
693 DEFUN ("define-charset-internal", Fdefine_charset_internal,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
694 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
695 doc: /* For internal use only.
f14d2bf6caa4 (load_charset_map, load_charset_map_from_file): Remove
Dave Love <fx@gnu.org>
parents: 88524
diff changeset
696 usage: (define-charset-internal ...) */)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
697 (nargs, args)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
698 int nargs;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
699 Lisp_Object *args;
22927
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
700 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
701 /* Charset attr vector. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
702 Lisp_Object attrs;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
703 Lisp_Object val;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
704 unsigned hash_code;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
705 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
706 int i, j;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
707 struct charset charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
708 int id;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
709 int dimension;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
710 int new_definition_p;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
711 int nchars;
22927
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
712
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
713 if (nargs != charset_arg_max)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
714 return Fsignal (Qwrong_number_of_arguments,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
715 Fcons (intern ("define-charset-internal"),
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
716 make_number (nargs)));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
717
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
718 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
719
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
720 CHECK_SYMBOL (args[charset_arg_name]);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
721 ASET (attrs, charset_name, args[charset_arg_name]);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
722
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
723 val = args[charset_arg_code_space];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
724 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
725 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
726 int min_byte, max_byte;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
727
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
728 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
729 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
730 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
731 error ("Invalid :code-space value");
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
732 charset.code_space[i * 4] = min_byte;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
733 charset.code_space[i * 4 + 1] = max_byte;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
734 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
735 nchars *= charset.code_space[i * 4 + 2];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
736 charset.code_space[i * 4 + 3] = nchars;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
737 if (max_byte > 0)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
738 dimension = i + 1;
22927
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
739 }
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
740
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
741 val = args[charset_arg_dimension];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
742 if (NILP (val))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
743 charset.dimension = dimension;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
744 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
745 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
746 CHECK_NATNUM (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
747 charset.dimension = XINT (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
748 if (charset.dimension < 1 || charset.dimension > 4)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
749 args_out_of_range_3 (val, make_number (1), make_number (4));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
750 }
22927
209acf11198c (multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 22774
diff changeset
751
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
752 charset.code_linear_p
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
753 = (charset.dimension == 1
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
754 || (charset.code_space[2] == 256
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
755 && (charset.dimension == 2
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
756 || (charset.code_space[6] == 256
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
757 && (charset.dimension == 3
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
758 || charset.code_space[10] == 256)))));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
759
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
760 if (! charset.code_linear_p)
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
761 {
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
762 charset.code_space_mask = (unsigned char *) xmalloc (256);
88609
d95f7c449f7a (Fdefine_charset_internal): Fix argument to bzero.
Kenichi Handa <handa@m17n.org>
parents: 88592
diff changeset
763 bzero (charset.code_space_mask, 256);
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
764 for (i = 0; i < 4; i++)
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
765 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
766 j++)
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
767 charset.code_space_mask[j] |= (1 << i);
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
768 }
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
769
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
770 charset.iso_chars_96 = charset.code_space[2] == 96;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
771
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
772 charset.min_code = (charset.code_space[0]
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
773 | (charset.code_space[4] << 8)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
774 | (charset.code_space[8] << 16)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
775 | (charset.code_space[12] << 24));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
776 charset.max_code = (charset.code_space[1]
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
777 | (charset.code_space[5] << 8)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
778 | (charset.code_space[9] << 16)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
779 | (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
780 charset.char_index_offset = 0;
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
781
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
782 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
783 if (! NILP (val))
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
784 {
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
785 unsigned code;
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
786
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
787 if (INTEGERP (val))
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
788 code = XINT (val);
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
789 else
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
790 {
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
791 CHECK_CONS (val);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
792 CHECK_NUMBER_CAR (val);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
793 CHECK_NUMBER_CDR (val);
88678
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
794 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
795 }
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
796 if (code < charset.min_code
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
797 || code > charset.max_code)
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
798 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
799 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
800 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
801 charset.min_code = code;
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
802 }
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
803
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
804 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
805 if (! NILP (val))
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
806 {
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
807 unsigned code;
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
808
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
809 if (INTEGERP (val))
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
810 code = XINT (val);
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
811 else
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
812 {
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
813 CHECK_CONS (val);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
814 CHECK_NUMBER_CAR (val);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
815 CHECK_NUMBER_CDR (val);
88678
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
816 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
817 }
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
818 if (code < charset.min_code
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
819 || code > charset.max_code)
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
820 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
821 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
822 charset.max_code = code;
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
823 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
824
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
825 charset.compact_codes_p = charset.max_code < 0x1000000;
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
826
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
827 val = args[charset_arg_invalid_code];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
828 if (NILP (val))
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
829 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
830 if (charset.min_code > 0)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
831 charset.invalid_code = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
832 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
833 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
834 XSETINT (val, charset.max_code + 1);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
835 if (XINT (val) == charset.max_code + 1)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
836 charset.invalid_code = charset.max_code + 1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
837 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
838 error ("Attribute :invalid-code must be specified");
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
839 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
840 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
841 else
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
842 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
843 CHECK_NATNUM (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
844 charset.invalid_code = XFASTINT (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
845 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
846
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
847 val = args[charset_arg_iso_final];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
848 if (NILP (val))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
849 charset.iso_final = -1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
850 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
851 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
852 CHECK_NUMBER (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
853 if (XINT (val) < '0' || XINT (val) > 127)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
854 error ("Invalid iso-final-char: %d", XINT (val));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
855 charset.iso_final = XINT (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
856 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
857
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
858 val = args[charset_arg_iso_revision];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
859 if (NILP (val))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
860 charset.iso_revision = -1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
861 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
862 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
863 CHECK_NUMBER (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
864 if (XINT (val) > 63)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
865 args_out_of_range (make_number (63), val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
866 charset.iso_revision = XINT (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
867 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
868
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
869 val = args[charset_arg_emacs_mule_id];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
870 if (NILP (val))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
871 charset.emacs_mule_id = -1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
872 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
873 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
874 CHECK_NATNUM (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
875 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
876 error ("Invalid emacs-mule-id: %d", XINT (val));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
877 charset.emacs_mule_id = XINT (val);
29538
c0c34d18e8a0 (update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents: 29269
diff changeset
878 }
23628
4a0a107fac9e (string_to_non_ascii_char): Change the check for the
Kenichi Handa <handa@m17n.org>
parents: 23576
diff changeset
879
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
880 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
881
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
882 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
883
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
884 charset.unified_p = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
885
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
886 bzero (charset.fast_map, sizeof (charset.fast_map));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
887
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
888 if (! NILP (args[charset_arg_code_offset]))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
889 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
890 val = args[charset_arg_code_offset];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
891 CHECK_NUMBER (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
892
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
893 charset.method = CHARSET_METHOD_OFFSET;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
894 charset.code_offset = XINT (val);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
895
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
896 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
897 charset.min_char = i + charset.code_offset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
898 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
899 charset.max_char = i + charset.code_offset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
900 if (charset.max_char > MAX_CHAR)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
901 error ("Unsupported max char: %d", charset.max_char);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
902
89313
1991025c6bc2 (Fdefine_charset_internal): Setup charset.fast_map correctly.
Kenichi Handa <handa@m17n.org>
parents: 89263
diff changeset
903 i = (charset.min_char >> 7) << 7;
1991025c6bc2 (Fdefine_charset_internal): Setup charset.fast_map correctly.
Kenichi Handa <handa@m17n.org>
parents: 89263
diff changeset
904 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
905 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
906 i = (i >> 12) << 12;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
907 for (; i <= charset.max_char; i += 0x1000)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
908 CHARSET_FAST_MAP_SET (i, charset.fast_map);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
909 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
910 else if (! NILP (args[charset_arg_map]))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
911 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
912 val = args[charset_arg_map];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
913 ASET (attrs, charset_map, val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
914 if (STRINGP (val))
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
915 load_charset_map_from_file (&charset, val, 0);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
916 else
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
917 load_charset_map_from_vector (&charset, val, 0);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
918 charset.method = CHARSET_METHOD_MAP_DEFERRED;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
919 }
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
920 else if (! NILP (args[charset_arg_subset]))
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
921 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
922 Lisp_Object parent;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
923 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
924 struct charset *parent_charset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
925
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
926 val = args[charset_arg_subset];
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
927 parent = Fcar (val);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
928 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
929 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
930 CHECK_NATNUM (parent_min_code);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
931 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
932 CHECK_NATNUM (parent_max_code);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
933 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
934 CHECK_NUMBER (parent_code_offset);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
935 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
936 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
937 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
938 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
939 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
940 ASET (attrs, charset_subset, val);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
941
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
942 charset.method = CHARSET_METHOD_SUBSET;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
943 /* 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
944 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
945 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
946 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
947 charset.fast_map[i] = parent_charset->fast_map[i];
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
948
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
949 /* 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
950 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
951 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
952 }
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
953 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
954 {
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
955 val = args[charset_arg_superset];
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
956 charset.method = CHARSET_METHOD_SUPERSET;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
957 val = Fcopy_sequence (val);
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
958 ASET (attrs, charset_superset, val);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
959
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
960 charset.min_char = MAX_CHAR;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
961 charset.max_char = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
962 for (; ! NILP (val); val = Fcdr (val))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
963 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
964 Lisp_Object elt, car_part, cdr_part;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
965 int this_id, offset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
966 struct charset *this_charset;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
967
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
968 elt = Fcar (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
969 if (CONSP (elt))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
970 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
971 car_part = XCAR (elt);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
972 cdr_part = XCDR (elt);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
973 CHECK_CHARSET_GET_ID (car_part, this_id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
974 CHECK_NUMBER (cdr_part);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
975 offset = XINT (cdr_part);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
976 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
977 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
978 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
979 CHECK_CHARSET_GET_ID (elt, this_id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
980 offset = 0;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
981 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
982 XSETCAR (val, Fcons (make_number (this_id), make_number (offset)));
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
983
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
984 this_charset = CHARSET_FROM_ID (this_id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
985 if (charset.min_char > this_charset->min_char)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
986 charset.min_char = this_charset->min_char;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
987 if (charset.max_char < this_charset->max_char)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
988 charset.max_char = this_charset->max_char;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
989 for (i = 0; i < 190; i++)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
990 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
991 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
992 }
43144
69a3fef3cb46 (get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents: 42162
diff changeset
993 else
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
994 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
995
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
996 val = args[charset_arg_unify_map];
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
997 if (! NILP (val) && !STRINGP (val))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
998 CHECK_VECTOR (val);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
999 ASET (attrs, charset_unify_map, val);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1000
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1001 CHECK_LIST (args[charset_arg_plist]);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1002 ASET (attrs, charset_plist, args[charset_arg_plist]);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1003
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1004 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
1005 &hash_code);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1006 if (charset.hash_index >= 0)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1007 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1008 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
1009 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
1010 HASH_VALUE (hash_table, charset.hash_index) = attrs;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1011 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1012 else
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1013 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1014 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
1015 hash_code);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1016 if (charset_table_used == charset_table_size)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1017 {
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1018 struct charset *new_table
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1019 = (struct charset *) xmalloc (sizeof (struct charset)
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1020 * (charset_table_size + 16));
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1021 bcopy (charset_table, new_table,
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1022 sizeof (struct charset) * charset_table_size);
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1023 charset_table_size += 16;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1024 charset_table = new_table;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1025 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1026 id = charset_table_used++;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1027 new_definition_p = 1;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1028 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1029
88584
f4f7b1532dc3 (Fdefine_charset_internal): Fix bug for the case of re-defining a
Kenichi Handa <handa@m17n.org>
parents: 88543
diff changeset
1030 ASET (attrs, charset_id, make_number (id));
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1031 charset.id = id;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1032 charset_table[id] = charset;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1033
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1034 if (charset.iso_final >= 0)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1035 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1036 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
1037 charset.iso_final) = id;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1038 if (new_definition_p)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1039 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
1040 Fcons (make_number (id), Qnil));
88683
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
1041 if (ISO_CHARSET_TABLE (1, 0, 'J') == id)
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
1042 charset_jisx0201_roman = id;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
1043 else if (ISO_CHARSET_TABLE (2, 0, '@') == id)
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
1044 charset_jisx0208_1978 = id;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
1045 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
1046 charset_jisx0208 = id;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1047 }
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 if (charset.emacs_mule_id >= 0)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1050 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1051 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
1052 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
1053 emacs_mule_bytes[charset.emacs_mule_id] = charset.dimension + 1;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1054 if (new_definition_p)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1055 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
1056 Fcons (make_number (id), Qnil));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1057 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1058
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1059 if (new_definition_p)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1060 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1061 Vcharset_list = Fcons (args[charset_arg_name], Vcharset_list);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1062 Vcharset_ordered_list = nconc2 (Vcharset_ordered_list,
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1063 Fcons (make_number (id), Qnil));
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1064 charset_ordered_list_tick++;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1065 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1066
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1067 return Qnil;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1068 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1069
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1070
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1071 /* 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
1072 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
1073 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
1074 charset. */
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1075
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1076 static int
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1077 define_charset_internal (name, dimension, code_space, min_code, max_code,
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1078 iso_final, iso_revision, emacs_mule_id,
89171
d7ce536898bf (define_charset_internal): Rename `supprementary'.
Dave Love <fx@gnu.org>
parents: 89055
diff changeset
1079 ascii_compatible, supplementary,
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1080 code_offset)
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1081 Lisp_Object name;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1082 int dimension;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1083 unsigned char *code_space;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1084 unsigned min_code, max_code;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1085 int iso_final, iso_revision, emacs_mule_id;
89171
d7ce536898bf (define_charset_internal): Rename `supprementary'.
Dave Love <fx@gnu.org>
parents: 89055
diff changeset
1086 int ascii_compatible, supplementary;
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1087 int code_offset;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1088 {
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1089 Lisp_Object args[charset_arg_max];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1090 Lisp_Object plist[14];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1091 Lisp_Object val;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1092 int i;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1093
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1094 args[charset_arg_name] = name;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1095 args[charset_arg_dimension] = make_number (dimension);
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1096 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
1097 for (i = 0; i < 8; i++)
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1098 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
1099 args[charset_arg_code_space] = val;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1100 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
1101 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
1102 args[charset_arg_iso_final]
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1103 = (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
1104 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
1105 args[charset_arg_emacs_mule_id]
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1106 = (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
1107 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
1108 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
1109 args[charset_arg_invalid_code] = Qnil;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1110 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
1111 args[charset_arg_map] = Qnil;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1112 args[charset_arg_subset] = Qnil;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1113 args[charset_arg_superset] = Qnil;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1114 args[charset_arg_unify_map] = Qnil;
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1115
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1116 plist[0] = intern (":name");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1117 plist[1] = args[charset_arg_name];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1118 plist[2] = intern (":dimension");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1119 plist[3] = args[charset_arg_dimension];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1120 plist[4] = intern (":code-space");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1121 plist[5] = args[charset_arg_code_space];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1122 plist[6] = intern (":iso-final-char");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1123 plist[7] = args[charset_arg_iso_final];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1124 plist[8] = intern (":emacs-mule-id");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1125 plist[9] = args[charset_arg_emacs_mule_id];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1126 plist[10] = intern (":ascii-compatible-p");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1127 plist[11] = args[charset_arg_ascii_compatible_p];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1128 plist[12] = intern (":code-offset");
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1129 plist[13] = args[charset_arg_code_offset];
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1130
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1131 args[charset_arg_plist] = Flist (14, plist);
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1132 Fdefine_charset_internal (charset_arg_max, args);
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1133
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1134 return XINT (CHARSET_SYMBOL_ID (name));
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1135 }
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1136
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
1137
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1138 DEFUN ("define-charset-alias", Fdefine_charset_alias,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1139 Sdefine_charset_alias, 2, 2, 0,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1140 doc: /* Define ALIAS as an alias for charset CHARSET. */)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1141 (alias, charset)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1142 Lisp_Object alias, charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1143 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1144 Lisp_Object attr;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1145
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1146 CHECK_CHARSET_GET_ATTR (charset, attr);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1147 Fputhash (alias, attr, Vcharset_hash_table);
88634
ad7c09ee6cf9 (Fdefine_charset_alias): Update Vcharset_list.
Dave Love <fx@gnu.org>
parents: 88626
diff changeset
1148 Vcharset_list = Fcons (alias, Vcharset_list);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1149 return Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1150 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1151
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1152
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
1153 DEFUN ("unibyte-charset", Funibyte_charset, Sunibyte_charset, 0, 0, 0,
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
1154 doc: /* Return the unibyte charset (set by `set-unibyte-charset'). */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1155 ()
22703
15e0119749cf (Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents: 22524
diff changeset
1156 {
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
1157 return CHARSET_NAME (CHARSET_FROM_ID (charset_unibyte));
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1158 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1159
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1160
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
1161 DEFUN ("set-unibyte-charset", Fset_unibyte_charset, Sset_unibyte_charset,
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1162 1, 1, 0,
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
1163 doc: /* Set the unibyte charset to CHARSET.
88817
5756cf8c8828 Doc fixes.
Dave Love <fx@gnu.org>
parents: 88756
diff changeset
1164 This determines how unibyte/multibyte conversion is done. See also
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
1165 function `unibyte-charset'. */)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1166 (charset)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1167 Lisp_Object charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1168 {
89055
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1169 struct charset *cs;
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1170 int i, c;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1171
89055
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1172 CHECK_CHARSET_GET_CHARSET (charset, cs);
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1173 if (! cs->ascii_compatible_p
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1174 || cs->dimension != 1)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1175 error ("Inappropriate unibyte charset: %s", SDATA (SYMBOL_NAME (charset)));
89055
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1176 charset_unibyte = cs->id;
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1177 for (i = 128; i < 256; i++)
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1178 {
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1179 c = DECODE_CHAR (cs, i);
89452
6cc7c4aa53cc (Fset_unibyte_charset): Fix setting up of
Kenichi Handa <handa@m17n.org>
parents: 89375
diff changeset
1180 unibyte_to_multibyte_table[i] = (c < 0 ? BYTE8_TO_CHAR (i) : c);
89055
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1181 }
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
1182
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1183 return Qnil;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1184 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1185
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1186
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1187 DEFUN ("charset-plist", Fcharset_plist, Scharset_plist, 1, 1, 0,
88817
5756cf8c8828 Doc fixes.
Dave Love <fx@gnu.org>
parents: 88756
diff changeset
1188 doc: /* Return the property list of CHARSET. */)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1189 (charset)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1190 Lisp_Object charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1191 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1192 Lisp_Object attrs;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1193
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1194 CHECK_CHARSET_GET_ATTR (charset, attrs);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1195 return CHARSET_ATTR_PLIST (attrs);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1196 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1197
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1198
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1199 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
1200 doc: /* Set CHARSET's property list to PLIST. */)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1201 (charset, plist)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1202 Lisp_Object charset, plist;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1203 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1204 Lisp_Object attrs;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1205
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1206 CHECK_CHARSET_GET_ATTR (charset, attrs);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1207 CHARSET_ATTR_PLIST (attrs) = plist;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1208 return plist;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1209 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1210
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1211
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1212 DEFUN ("unify-charset", Funify_charset, Sunify_charset, 1, 3, 0,
88817
5756cf8c8828 Doc fixes.
Dave Love <fx@gnu.org>
parents: 88756
diff changeset
1213 doc: /* Unify characters of CHARSET with Unicode.
5756cf8c8828 Doc fixes.
Dave Love <fx@gnu.org>
parents: 88756
diff changeset
1214 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
1215 by CHARSET's `:unify-map' property.
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1216
88927
cd7645c9842b Remove `emacs' conditional. Doc fixes.
Dave Love <fx@gnu.org>
parents: 88881
diff changeset
1217 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
1218 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
1219 `define-charset' (which see).
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1220
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1221 Optional third argument DEUNIFY, if non-nil, means to de-unify CHARSET. */)
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1222 (charset, unify_map, deunify)
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1223 Lisp_Object charset, unify_map, deunify;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1224 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1225 int id;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1226 struct charset *cs;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1227
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1228 CHECK_CHARSET_GET_ID (charset, id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1229 cs = CHARSET_FROM_ID (id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1230 if (CHARSET_METHOD (cs) == CHARSET_METHOD_MAP_DEFERRED)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1231 load_charset (cs);
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1232 if (NILP (deunify)
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1233 ? CHARSET_UNIFIED_P (cs) && ! NILP (CHARSET_DEUNIFIER (cs))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1234 : ! CHARSET_UNIFIED_P (cs))
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1235 return Qnil;
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1236
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1237 CHARSET_UNIFIED_P (cs) = 0;
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1238 if (NILP (deunify))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1239 {
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1240 if (CHARSET_METHOD (cs) != CHARSET_METHOD_OFFSET)
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1241 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
1242 if (NILP (unify_map))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1243 unify_map = CHARSET_UNIFY_MAP (cs);
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1244 if (STRINGP (unify_map))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1245 load_charset_map_from_file (cs, unify_map, 2);
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1246 else if (VECTORP (unify_map))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1247 load_charset_map_from_vector (cs, unify_map, 2);
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1248 else if (NILP (unify_map))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1249 error ("No unify-map for charset");
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1250 else
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1251 error ("Bad unify-map arg");
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1252 CHARSET_UNIFIED_P (cs) = 1;
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1253 }
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1254 else if (CHAR_TABLE_P (Vchar_unify_table))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1255 {
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1256 int min_code = CHARSET_MIN_CODE (cs);
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1257 int max_code = CHARSET_MAX_CODE (cs);
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1258 int min_char = DECODE_CHAR (cs, min_code);
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1259 int max_char = DECODE_CHAR (cs, max_code);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1260
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1261 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
1262 }
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1263
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1264 return Qnil;
22703
15e0119749cf (Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents: 22524
diff changeset
1265 }
15e0119749cf (Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents: 22524
diff changeset
1266
20435
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1267 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
1268 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
1269 doc: /*
88626
decf968c7435 (map_charset_chars): Fix c_function declaration for
Dave Love <fx@gnu.org>
parents: 88609
diff changeset
1270 Return an unsed ISO final char for a charset of DIMENISION and CHARS.
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1271 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
1272 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
1273
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1274 This final char is for private use, thus the range is `0' (48) .. `?' (63).
88626
decf968c7435 (map_charset_chars): Fix c_function declaration for
Dave Love <fx@gnu.org>
parents: 88609
diff changeset
1275 If there's no unused final char for the specified kind of charset,
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1276 return nil. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1277 (dimension, chars)
20435
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1278 Lisp_Object dimension, chars;
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1279 {
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1280 int final_char;
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1281
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40115
diff changeset
1282 CHECK_NUMBER (dimension);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40115
diff changeset
1283 CHECK_NUMBER (chars);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1284 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
1285 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
1286 if (XINT (chars) != 94 && XINT (chars) != 96)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1287 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
1288 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
1289 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
1290 break;
20435
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1291 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
1292 }
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
1293
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1294 static void
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1295 check_iso_charset_parameter (dimension, chars, final_char)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1296 Lisp_Object dimension, chars, final_char;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1297 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1298 CHECK_NATNUM (dimension);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1299 CHECK_NATNUM (chars);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1300 CHECK_NATNUM (final_char);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1301
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1302 if (XINT (dimension) > 3)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1303 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
1304 if (XINT (chars) != 94 && XINT (chars) != 96)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1305 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
1306 if (XINT (final_char) < '0' || XINT (final_char) > '~')
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1307 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
1308 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1309
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1310
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1311 DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset,
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1312 4, 4, 0,
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1313 doc: /*
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1314 Declare a charset of DIMENSION, CHARS, FINAL-CHAR is the same as CHARSET.
88817
5756cf8c8828 Doc fixes.
Dave Love <fx@gnu.org>
parents: 88756
diff changeset
1315 CHARSET should be defined by `define-charset' in advance. */)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1316 (dimension, chars, final_char, charset)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1317 Lisp_Object dimension, chars, final_char, charset;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1318 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1319 int id;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1320
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1321 CHECK_CHARSET_GET_ID (charset, id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1322 check_iso_charset_parameter (dimension, chars, final_char);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1323
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
1324 ISO_CHARSET_TABLE (XINT (dimension), XINT (chars), XINT (final_char)) = id;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1325 return Qnil;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1326 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1327
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1328
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1329 /* 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
1330 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
1331
29095
39e94c12f469 Fix previous change (typo).
Kenichi Handa <handa@m17n.org>
parents: 29094
diff changeset
1332 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
1333 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
1334 it contains only ASCII characters.
22168
2156ac6d054f (find_charset_in_str): New arg CMPCHARP.
Kenichi Handa <handa@m17n.org>
parents: 22121
diff changeset
1335
88860
23c58f02c558 Comments.
Dave Love <fx@gnu.org>
parents: 88855
diff changeset
1336 1: No charsets other than ascii, control-1, and latin-1 are
23c58f02c558 Comments.
Dave Love <fx@gnu.org>
parents: 88855
diff changeset
1337 found.
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1338
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1339 2: Otherwise.
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1340 */
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1341
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1342 int
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1343 string_xstring_p (string)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1344 Lisp_Object string;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1345 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1346 const unsigned char *p = SDATA (string);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1347 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
1348
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1349 if (SCHARS (string) == SBYTES (string))
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1350 return 0;
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1351
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1352 while (p < endp)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1353 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1354 int c = STRING_CHAR_ADVANCE (p);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1355
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1356 if (c >= 0x100)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1357 return 2;
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 return 1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1360 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1361
20228
acb7aa0aa71f (find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents: 20188
diff changeset
1362
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1363 /* 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
1364
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1365 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
1366 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
1367
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1368 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
1369
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1370 static void
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1371 find_charsets_in_text (ptr, nchars, nbytes, charsets, table, multibyte)
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1372 const unsigned char *ptr;
89544
36913565de8a (syms_of_charset): Remove unused var p.
Dave Love <fx@gnu.org>
parents: 89483
diff changeset
1373 EMACS_INT nchars, nbytes;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1374 Lisp_Object charsets, table;
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1375 int multibyte;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1376 {
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1377 const unsigned char *pend = ptr + nbytes;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1378
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1379 if (nchars == nbytes)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1380 {
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1381 if (multibyte)
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1382 ASET (charsets, charset_ascii, Qt);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1383 else
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1384 while (ptr < pend)
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1385 {
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1386 int c = *ptr++;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1387
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1388 if (!NILP (table))
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1389 c = translate_char (table, c);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1390 if (ASCII_BYTE_P (c))
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1391 ASET (charsets, charset_ascii, Qt);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1392 else
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1393 ASET (charsets, charset_eight_bit, Qt);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1394 }
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1395 }
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1396 else
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1397 {
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1398 while (ptr < pend)
17727
9d39361ce928 (unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 17366
diff changeset
1399 {
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1400 int c = STRING_CHAR_ADVANCE (ptr);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1401 struct charset *charset;
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1402
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1403 if (!NILP (table))
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1404 c = translate_char (table, c);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1405 charset = CHAR_CHARSET (c);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1406 ASET (charsets, CHARSET_ID (charset), Qt);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1407 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1408 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1409 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1410
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1411 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
1412 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
1413 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
1414 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
1415 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
1416
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1417 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
1418 only `ascii', `eight-bit-control', and `eight-bit-graphic'. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1419 (beg, end, table)
17727
9d39361ce928 (unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 17366
diff changeset
1420 Lisp_Object beg, end, table;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1421 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1422 Lisp_Object charsets;
89544
36913565de8a (syms_of_charset): Remove unused var p.
Dave Love <fx@gnu.org>
parents: 89483
diff changeset
1423 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
1424 int i;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1425 Lisp_Object val;
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1426 int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1427
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1428 validate_region (&beg, &end);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1429 from = XFASTINT (beg);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1430 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
1431
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1432 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
1433 {
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1434 stop = GPT;
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1435 stop_byte = GPT_BYTE;
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1436 }
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1437 else
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1438 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
1439
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1440 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
1441
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1442 charsets = Fmake_vector (make_number (charset_table_used), Qnil);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1443 while (1)
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1444 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1445 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
1446 stop_byte - from_byte, charsets, table,
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1447 multibyte);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1448 if (stop < to)
20534
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1449 {
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1450 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
1451 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
1452 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1453 else
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1454 break;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1455 }
20534
066251bcf9f7 (Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents: 20435
diff changeset
1456
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1457 val = Qnil;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1458 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
1459 if (!NILP (AREF (charsets, i)))
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1460 val = Fcons (CHARSET_NAME (charset_table + i), val);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1461 return val;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1462 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1463
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1464 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
1465 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
1466 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
1467 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
1468
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1469 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
1470 only `ascii', `eight-bit-control', and `eight-bit-graphic'. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1471 (str, table)
17727
9d39361ce928 (unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 17366
diff changeset
1472 Lisp_Object str, table;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1473 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1474 Lisp_Object charsets;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1475 int i;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1476 Lisp_Object val;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1477
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40115
diff changeset
1478 CHECK_STRING (str);
20614
a4800f9842e4 (multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20575
diff changeset
1479
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1480 charsets = Fmake_vector (make_number (charset_table_used), Qnil);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1481 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
1482 charsets, table,
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1483 STRING_MULTIBYTE (str));
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1484 val = Qnil;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1485 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
1486 if (!NILP (AREF (charsets, i)))
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1487 val = Fcons (CHARSET_NAME (charset_table + i), val);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1488 return val;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1489 }
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1490
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1491
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1492
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1493 /* 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
1494 CHARSET. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1495
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1496 int
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1497 decode_char (charset, code)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1498 struct charset *charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1499 unsigned code;
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, char_index;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1502 enum charset_method method = CHARSET_METHOD (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1503
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1504 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
1505 return -1;
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
1506
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1507 if (method == CHARSET_METHOD_MAP_DEFERRED)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1508 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1509 load_charset (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1510 method = CHARSET_METHOD (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1511 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1512
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1513 if (method == CHARSET_METHOD_SUBSET)
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1514 {
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1515 Lisp_Object subset_info;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1516
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1517 subset_info = CHARSET_SUBSET (charset);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1518 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
1519 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
1520 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
1521 || 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
1522 c = -1;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1523 else
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1524 c = DECODE_CHAR (charset, code);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1525 }
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1526 else if (method == CHARSET_METHOD_SUPERSET)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1527 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1528 Lisp_Object parents;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1529
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1530 parents = CHARSET_SUPERSET (charset);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1531 c = -1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1532 for (; CONSP (parents); parents = XCDR (parents))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1533 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1534 int id = XINT (XCAR (XCAR (parents)));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1535 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
1536 unsigned this_code = code - code_offset;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1537
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1538 charset = CHARSET_FROM_ID (id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1539 if ((c = DECODE_CHAR (charset, this_code)) >= 0)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1540 break;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1541 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1542 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1543 else
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
1544 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1545 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
1546 if (char_index < 0)
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
1547 return -1;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1548
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1549 if (method == CHARSET_METHOD_MAP)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1550 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1551 Lisp_Object decoder;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1552
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1553 decoder = CHARSET_DECODER (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1554 if (! VECTORP (decoder))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1555 return -1;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1556 c = XINT (AREF (decoder, char_index));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1557 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1558 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1559 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1560 c = char_index + CHARSET_CODE_OFFSET (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1561 }
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
1562 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1563
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1564 if (CHARSET_UNIFIED_P (charset)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1565 && c >= 0)
88433
9a1e7befb0b2 (parse_charset_map): Remove an unused variable.
Kenichi Handa <handa@m17n.org>
parents: 88364
diff changeset
1566 {
9a1e7befb0b2 (parse_charset_map): Remove an unused variable.
Kenichi Handa <handa@m17n.org>
parents: 88364
diff changeset
1567 MAYBE_UNIFY_CHAR (c);
9a1e7befb0b2 (parse_charset_map): Remove an unused variable.
Kenichi Handa <handa@m17n.org>
parents: 88364
diff changeset
1568 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1569
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1570 return c;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1571 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1572
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1573 /* 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
1574 Lisp_Object charset_work;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1575
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1576 /* 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
1577 CHARSET, return CHARSET_INVALID_CODE (CHARSET). If STRICT is true,
23c58f02c558 Comments.
Dave Love <fx@gnu.org>
parents: 88855
diff changeset
1578 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
1579
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1580 unsigned
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1581 encode_char (charset, c)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1582 struct charset *charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1583 int c;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1584 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1585 unsigned code;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1586 enum charset_method method = CHARSET_METHOD (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1587
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1588 if (CHARSET_UNIFIED_P (charset))
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
1589 {
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1590 Lisp_Object deunifier, deunified;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1591
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1592 deunifier = CHARSET_DEUNIFIER (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1593 if (! CHAR_TABLE_P (deunifier))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1594 {
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1595 Funify_charset (CHARSET_NAME (charset), Qnil, Qnil);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1596 deunifier = CHARSET_DEUNIFIER (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1597 }
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1598 deunified = CHAR_TABLE_REF (deunifier, c);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1599 if (! NILP (deunified))
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1600 c = XINT (deunified);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1601 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1602
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1603 if (method == CHARSET_METHOD_SUBSET)
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1604 {
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1605 Lisp_Object subset_info;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1606 struct charset *this_charset;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1607
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1608 subset_info = CHARSET_SUBSET (charset);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1609 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
1610 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
1611 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
1612 || 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
1613 || 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
1614 return CHARSET_INVALID_CODE (charset);
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1615 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
1616 return code;
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1617 }
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1618
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1619 if (method == CHARSET_METHOD_SUPERSET)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1620 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1621 Lisp_Object parents;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1622
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1623 parents = CHARSET_SUPERSET (charset);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1624 for (; CONSP (parents); parents = XCDR (parents))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1625 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1626 int id = XINT (XCAR (XCAR (parents)));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1627 int code_offset = XINT (XCDR (XCAR (parents)));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1628 struct charset *this_charset = CHARSET_FROM_ID (id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1629
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1630 code = ENCODE_CHAR (this_charset, c);
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1631 if (code != CHARSET_INVALID_CODE (this_charset))
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
1632 return code + code_offset;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1633 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1634 return CHARSET_INVALID_CODE (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1635 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1636
89365
110a171821db (encode_char): Fix handling of methods SUBSET and SUPERSET.
Kenichi Handa <handa@m17n.org>
parents: 89313
diff changeset
1637 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
1638 || 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
1639 return CHARSET_INVALID_CODE (charset);
110a171821db (encode_char): Fix handling of methods SUBSET and SUPERSET.
Kenichi Handa <handa@m17n.org>
parents: 89313
diff changeset
1640
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1641 if (method == CHARSET_METHOD_MAP_DEFERRED)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1642 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1643 load_charset (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1644 method = CHARSET_METHOD (charset);
25506
ba0ad349e792 (SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents: 25250
diff changeset
1645 }
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1646
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1647 if (method == CHARSET_METHOD_MAP)
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1648 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1649 Lisp_Object encoder;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1650 Lisp_Object val;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1651
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1652 encoder = CHARSET_ENCODER (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1653 if (! CHAR_TABLE_P (CHARSET_ENCODER (charset)))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1654 return CHARSET_INVALID_CODE (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1655 val = CHAR_TABLE_REF (encoder, c);
88745
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1656 if (NILP (val))
f247f70ed2c3 (load_charset_map): Set the default value of encoder
Kenichi Handa <handa@m17n.org>
parents: 88696
diff changeset
1657 return CHARSET_INVALID_CODE (charset);
88455
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
1658 code = XINT (val);
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
1659 if (! CHARSET_COMPACT_CODES_P (charset))
bae0bd953f61 (struct charset_map_entries): New struct.
Kenichi Handa <handa@m17n.org>
parents: 88433
diff changeset
1660 code = INDEX_TO_CODE_POINT (charset, code);
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1661 }
88678
7e7e9519784d (CODE_POINT_TO_INDEX): Take charset->char_index_offset
Kenichi Handa <handa@m17n.org>
parents: 88641
diff changeset
1662 else /* method == CHARSET_METHOD_OFFSET */
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1663 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1664 code = c - CHARSET_CODE_OFFSET (charset);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1665 code = INDEX_TO_CODE_POINT (charset, code);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1666 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1667
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1668 return code;
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
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1671
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1672 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
1673 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
1674 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
1675
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1676 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
1677
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1678 Optional argument RESTRICTION specifies a way to map the pair of CCS
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1679 and CODE-POINT to a chracter. Currently not supported and just ignored. */)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1680 (charset, code_point, restriction)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1681 Lisp_Object charset, code_point, restriction;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1682 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1683 int c, id;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1684 unsigned code;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1685 struct charset *charsetp;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1686
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1687 CHECK_CHARSET_GET_ID (charset, id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1688 if (CONSP (code_point))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1689 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1690 CHECK_NATNUM_CAR (code_point);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
1691 CHECK_NATNUM_CDR (code_point);
88475
9d54c1d6cd0a (load_charset_map): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88455
diff changeset
1692 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
1693 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1694 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1695 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1696 CHECK_NATNUM (code_point);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1697 code = XINT (code_point);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1698 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1699 charsetp = CHARSET_FROM_ID (id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1700 c = DECODE_CHAR (charsetp, code);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1701 return (c >= 0 ? make_number (c) : Qnil);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1702 }
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
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1705 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
1706 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
1707 Return nil if CHARSET doesn't include CH.
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1708
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1709 Optional argument RESTRICTION specifies a way to map CHAR to a
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1710 code-point in CCS. Currently not supported and just ignored. */)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1711 (ch, charset, restriction)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1712 Lisp_Object ch, charset, restriction;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1713 {
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
1714 int id;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1715 unsigned code;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1716 struct charset *charsetp;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1717
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1718 CHECK_CHARSET_GET_ID (charset, id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1719 CHECK_NATNUM (ch);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1720 charsetp = CHARSET_FROM_ID (id);
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
1721 code = ENCODE_CHAR (charsetp, XINT (ch));
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1722 if (code == CHARSET_INVALID_CODE (charsetp))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1723 return Qnil;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1724 if (code > 0x7FFFFFF)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1725 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
1726 return make_number (code);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1727 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1728
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1729
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1730 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
1731 doc:
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1732 /* 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
1733
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1734 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
1735 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
1736 is specified. */)
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1737 (charset, code1, code2, code3, code4)
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1738 Lisp_Object charset, code1, code2, code3, code4;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1739 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1740 int id, dimension;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1741 struct charset *charsetp;
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1742 unsigned code;
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1743 int c;
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 CHECK_CHARSET_GET_ID (charset, id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1746 charsetp = CHARSET_FROM_ID (id);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1747
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1748 dimension = CHARSET_DIMENSION (charsetp);
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1749 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
1750 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
1751 ? 0 : CHARSET_MIN_CODE (charsetp));
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1752 else
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1753 {
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1754 CHECK_NATNUM (code1);
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1755 if (XFASTINT (code1) >= 0x100)
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1756 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
1757 code = XFASTINT (code1);
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1758
88592
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1759 if (dimension > 1)
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1760 {
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1761 code <<= 8;
88592
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1762 if (NILP (code2))
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1763 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
1764 else
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1765 {
88592
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1766 CHECK_NATNUM (code2);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1767 if (XFASTINT (code2) >= 0x100)
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1768 args_out_of_range (make_number (0xFF), code2);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1769 code |= XFASTINT (code2);
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1770 }
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1771
88592
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1772 if (dimension > 2)
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1773 {
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1774 code <<= 8;
88592
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1775 if (NILP (code3))
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1776 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
1777 else
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1778 {
88592
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1779 CHECK_NATNUM (code3);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1780 if (XFASTINT (code3) >= 0x100)
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1781 args_out_of_range (make_number (0xFF), code3);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1782 code |= XFASTINT (code3);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1783 }
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1784
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1785 if (dimension > 3)
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1786 {
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1787 code <<= 8;
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1788 if (NILP (code4))
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1789 code |= charsetp->code_space[0];
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1790 else
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1791 {
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1792 CHECK_NATNUM (code4);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1793 if (XFASTINT (code4) >= 0x100)
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1794 args_out_of_range (make_number (0xFF), code4);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1795 code |= XFASTINT (code4);
46a07af4f6e0 (Fmake_char): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88590
diff changeset
1796 }
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1797 }
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1798 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1799 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1800 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1801
88490
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1802 if (CHARSET_ISO_FINAL (charsetp) >= 0)
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1803 code &= 0x7F7F7F7F;
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1804 c = DECODE_CHAR (charsetp, code);
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1805 if (c < 0)
9c3255b975cc (Fmake_char): Make it more backward compatible.
Kenichi Handa <handa@m17n.org>
parents: 88475
diff changeset
1806 error ("Invalid code(s)");
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1807 return make_number (c);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1808 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1809
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1810
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1811 /* 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
1812 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
1813 Vcharset_ordered_list. */
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1814
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1815 struct charset *
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1816 char_charset (c, charset_list, code_return)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1817 int c;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1818 Lisp_Object charset_list;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1819 unsigned *code_return;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1820 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1821 if (NILP (charset_list))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1822 charset_list = Vcharset_ordered_list;
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 while (CONSP (charset_list))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1825 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1826 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
1827 unsigned code = ENCODE_CHAR (charset, c);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1828
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1829 if (code != CHARSET_INVALID_CODE (charset))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1830 {
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1831 if (code_return)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1832 *code_return = code;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1833 return charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1834 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1835 charset_list = XCDR (charset_list);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1836 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1837 return NULL;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1838 }
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1839
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1840
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1841 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
1842 doc:
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1843 /*Return list of charset and one to four position-codes of CHAR.
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1844 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
1845 A position-code is a byte value of each dimension of the code-point of
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1846 CHAR in the charset. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1847 (ch)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1848 Lisp_Object ch;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1849 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1850 struct charset *charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1851 int c, dimension;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1852 unsigned code;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1853 Lisp_Object val;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1854
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1855 CHECK_CHARACTER (ch);
23883
0ca2fa58ca7b (Qunknown): New variable.
Kenichi Handa <handa@m17n.org>
parents: 23767
diff changeset
1856 c = XFASTINT (ch);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1857 charset = CHAR_CHARSET (c);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1858 if (! charset)
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1859 abort ();
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1860 code = ENCODE_CHAR (charset, c);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1861 if (code == CHARSET_INVALID_CODE (charset))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1862 abort ();
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1863 dimension = CHARSET_DIMENSION (charset);
89568
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1864 for (val = Qnil; dimension > 0; dimension--)
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1865 {
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1866 val = Fcons (make_number (code & 0xFF), val);
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1867 code >>= 8;
320914f34a77 (string_xstring_p): Check by (C >= 0x100).
Kenichi Handa <handa@m17n.org>
parents: 89544
diff changeset
1868 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1869 return Fcons (CHARSET_NAME (charset), val);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1870 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1871
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1872
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1873 DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 1, 0,
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1874 doc: /* Return the charset of highest priority that contains CHAR. */)
40103
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1875 (ch)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1876 Lisp_Object ch;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1877 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1878 struct charset *charset;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1879
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1880 CHECK_CHARACTER (ch);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1881 charset = CHAR_CHARSET (XINT (ch));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1882 return (CHARSET_NAME (charset));
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1883 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1884
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1885
21445
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
1886 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
1887 doc: /*
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1888 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
1889 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
1890 If POS is out of range, the value is nil. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1891 (pos)
21445
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
1892 Lisp_Object pos;
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
1893 {
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1894 Lisp_Object ch;
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1895 struct charset *charset;
21445
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
1896
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1897 ch = Fchar_after (pos);
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1898 if (! INTEGERP (ch))
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1899 return ch;
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1900 charset = CHAR_CHARSET (XINT (ch));
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1901 return (CHARSET_NAME (charset));
21445
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
1902 }
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
1903
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1904
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1905 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
1906 doc: /*
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1907 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
1908
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1909 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
1910 by their DIMENSION, CHARS, and FINAL-CHAR,
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1911 where as Emacs distinguishes them by charset symbol.
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1912 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
1913 DIMENSION, CHARS, and FINAL-CHAR. */)
6b389fb978bc Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents: 39682
diff changeset
1914 (dimension, chars, final_char)
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1915 Lisp_Object dimension, chars, final_char;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1916 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1917 int id;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1918
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1919 check_iso_charset_parameter (dimension, chars, final_char);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1920 id = ISO_CHARSET_TABLE (XFASTINT (dimension), XFASTINT (chars),
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1921 XFASTINT (final_char));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1922 return (id >= 0 ? CHARSET_NAME (CHARSET_FROM_ID (id)) : Qnil);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1923 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
1924
35407
916718dc2950 (strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents: 34985
diff changeset
1925
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1926 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
1927 0, 0, 0,
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1928 doc: /*
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1929 Clear encoder and decoder of charsets that are loaded from mapfiles. */)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1930 ()
31420
126c87fe1aad Include composite.h
Kenichi Handa <handa@m17n.org>
parents: 31176
diff changeset
1931 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1932 int i;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1933 struct charset *charset;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1934 Lisp_Object attrs;
31420
126c87fe1aad Include composite.h
Kenichi Handa <handa@m17n.org>
parents: 31176
diff changeset
1935
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1936 for (i = 0; i < charset_table_used; i++)
31420
126c87fe1aad Include composite.h
Kenichi Handa <handa@m17n.org>
parents: 31176
diff changeset
1937 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1938 charset = CHARSET_FROM_ID (i);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1939 attrs = CHARSET_ATTRIBUTES (charset);
35407
916718dc2950 (strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents: 34985
diff changeset
1940
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1941 if (CHARSET_METHOD (charset) == CHARSET_METHOD_MAP)
35407
916718dc2950 (strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents: 34985
diff changeset
1942 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1943 CHARSET_ATTR_DECODER (attrs) = Qnil;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1944 CHARSET_ATTR_ENCODER (attrs) = Qnil;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1945 CHARSET_METHOD (charset) = CHARSET_METHOD_MAP_DEFERRED;
35407
916718dc2950 (strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents: 34985
diff changeset
1946 }
916718dc2950 (strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents: 34985
diff changeset
1947
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1948 if (CHARSET_UNIFIED_P (charset))
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1949 CHARSET_ATTR_DEUNIFIER (attrs) = Qnil;
31420
126c87fe1aad Include composite.h
Kenichi Handa <handa@m17n.org>
parents: 31176
diff changeset
1950 }
35407
916718dc2950 (strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents: 34985
diff changeset
1951
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1952 if (CHAR_TABLE_P (Vchar_unified_charset_table))
20614
a4800f9842e4 (multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20575
diff changeset
1953 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1954 Foptimize_char_table (Vchar_unified_charset_table);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1955 Vchar_unify_table = Vchar_unified_charset_table;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1956 Vchar_unified_charset_table = Qnil;
20614
a4800f9842e4 (multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20575
diff changeset
1957 }
a4800f9842e4 (multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents: 20575
diff changeset
1958
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
1959 return Qnil;
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1960 }
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
1961
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1962 DEFUN ("charset-priority-list", Fcharset_priority_list,
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1963 Scharset_priority_list, 0, 1, 0,
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1964 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
1965 HIGHESTP non-nil means just return the highest priority one. */)
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1966 (highestp)
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1967 Lisp_Object highestp;
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1968 {
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1969 Lisp_Object val = Qnil, list = Vcharset_ordered_list;
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1970
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1971 if (!NILP (highestp))
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
1972 return CHARSET_NAME (CHARSET_FROM_ID (XINT (Fcar (list))));
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1973
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1974 while (!NILP (list))
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1975 {
88855
0382604a03ea (Fmap_charset_chars): Check args. Convert Lisp types.
Dave Love <fx@gnu.org>
parents: 88817
diff changeset
1976 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
1977 list = XCDR (list);
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1978 }
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1979 return Fnreverse (val);
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1980 }
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1981
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1982 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
1983 1, MANY, 0,
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1984 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
1985 usage: (set-charset-priority &rest charsets) */)
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1986 (nargs, args)
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1987 int nargs;
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1988 Lisp_Object *args;
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1989 {
89471
31ac7465ef51 (Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents: 89452
diff changeset
1990 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
1991 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
1992 int i, id;
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1993
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1994 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
1995 new_head = Qnil;
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1996 for (i = 0; i < nargs; i++)
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1997 {
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
1998 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
1999 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
2000 {
31ac7465ef51 (Fset_charset_priority): Pay attention to dumplicated arguments.
Kenichi Handa <handa@m17n.org>
parents: 89452
diff changeset
2001 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
2002 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
2003 }
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2004 }
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2005 arglist[0] = Fnreverse (new_head);
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2006 arglist[1] = old_list;
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2007 Vcharset_ordered_list = Fnconc (2, arglist);
88874
82c5e4f67e4a (charset_ordered_list_tick): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88860
diff changeset
2008 charset_ordered_list_tick++;
89261
86acab1ffbe2 (Fset_charset_priority): Update Viso_2022_charset_list.
Kenichi Handa <handa@m17n.org>
parents: 89171
diff changeset
2009
89645
17d1d4813c04 (find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents: 89568
diff changeset
2010 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
2011 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
2012 {
89263
208b5b32e08c (Fset_charset_priority): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 89261
diff changeset
2013 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
2014 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
2015 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
2016 list_emacs_mule = Fcons (XCAR (old_list), list_emacs_mule);
89261
86acab1ffbe2 (Fset_charset_priority): Update Viso_2022_charset_list.
Kenichi Handa <handa@m17n.org>
parents: 89171
diff changeset
2017 }
89645
17d1d4813c04 (find_charsets_in_text): Delete unused locale variable.
Kenichi Handa <handa@m17n.org>
parents: 89568
diff changeset
2018 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
2019 Vemacs_mule_charset_list = Fnreverse (list_emacs_mule);
89261
86acab1ffbe2 (Fset_charset_priority): Update Viso_2022_charset_list.
Kenichi Handa <handa@m17n.org>
parents: 89171
diff changeset
2020
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2021 return Qnil;
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2022 }
89375
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2023
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2024 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
2025 0, 1, 0,
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2026 doc: /* Internal use only.
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2027 Return charset identification number of CHARSET. */)
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2028 (charset)
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2029 Lisp_Object charset;
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2030 {
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2031 int id;
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2032
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2033 CHECK_CHARSET_GET_ID (charset, id);
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2034 return make_number (id);
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2035 }
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2036
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
2037
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2038 void
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2039 init_charset ()
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2040 {
89787
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
2041 Vcharset_map_path
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
2042 = Fcons (Fexpand_file_name (build_string ("charsets"), Vdata_directory),
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
2043 Qnil);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2044 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2045
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2046
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21445
diff changeset
2047 void
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2048 init_charset_once ()
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2049 {
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2050 int i, j, k;
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2051
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2052 for (i = 0; i < ISO_MAX_DIMENSION; i++)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2053 for (j = 0; j < ISO_MAX_CHARS; j++)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2054 for (k = 0; k < ISO_MAX_FINAL; k++)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2055 iso_charset_table[i][j][k] = -1;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2056
89055
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
2057 for (i = 0; i < 256; i++)
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2058 emacs_mule_charset[i] = NULL;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2059
88683
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
2060 charset_jisx0201_roman = -1;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
2061 charset_jisx0208_1978 = -1;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
2062 charset_jisx0208 = -1;
39ba56532289 (charset_jisx0201_roman, charset_jisx0208_1978,
Kenichi Handa <handa@m17n.org>
parents: 88678
diff changeset
2063
89452
6cc7c4aa53cc (Fset_unibyte_charset): Fix setting up of
Kenichi Handa <handa@m17n.org>
parents: 89375
diff changeset
2064 for (i = 0; i < 128; i++)
89055
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
2065 unibyte_to_multibyte_table[i] = i;
89452
6cc7c4aa53cc (Fset_unibyte_charset): Fix setting up of
Kenichi Handa <handa@m17n.org>
parents: 89375
diff changeset
2066 for (; i < 256; i++)
6cc7c4aa53cc (Fset_unibyte_charset): Fix setting up of
Kenichi Handa <handa@m17n.org>
parents: 89375
diff changeset
2067 unibyte_to_multibyte_table[i] = BYTE8_TO_CHAR (i);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2068 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2069
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2070 #ifdef emacs
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2071
21514
fa9ff387d260 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21445
diff changeset
2072 void
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2073 syms_of_charset ()
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2074 {
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2075 DEFSYM (Qcharsetp, "charsetp");
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2076
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2077 DEFSYM (Qascii, "ascii");
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2078 DEFSYM (Qunicode, "unicode");
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2079 DEFSYM (Qeight_bit, "eight-bit");
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2080 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
2081
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2082 DEFSYM (Qgl, "gl");
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2083 DEFSYM (Qgr, "gr");
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2084
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2085 staticpro (&Vcharset_ordered_list);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2086 Vcharset_ordered_list = Qnil;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2087
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2088 staticpro (&Viso_2022_charset_list);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2089 Viso_2022_charset_list = Qnil;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2090
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2091 staticpro (&Vemacs_mule_charset_list);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2092 Vemacs_mule_charset_list = Qnil;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2093
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2094 staticpro (&Vcharset_hash_table);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
2095 {
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
2096 Lisp_Object args[2];
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
2097 args[0] = QCtest;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
2098 args[1] = Qeq;
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
2099 Vcharset_hash_table = Fmake_hash_table (2, args);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 89471
diff changeset
2100 }
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2101
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2102 charset_table_size = 128;
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2103 charset_table = ((struct charset *)
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2104 xmalloc (sizeof (struct charset) * charset_table_size));
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2105 charset_table_used = 0;
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
2106
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2107 staticpro (&Vchar_unified_charset_table);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2108 Vchar_unified_charset_table = Fmake_char_table (Qnil, make_number (-1));
29003
72eafb39ec65 (Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents: 28818
diff changeset
2109
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2110 defsubr (&Scharsetp);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2111 defsubr (&Smap_charset_chars);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2112 defsubr (&Sdefine_charset_internal);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2113 defsubr (&Sdefine_charset_alias);
88985
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
2114 defsubr (&Sunibyte_charset);
cafb04d00ef2 (charset_unibyte): Renamed from charset_primary.
Kenichi Handa <handa@m17n.org>
parents: 88957
diff changeset
2115 defsubr (&Sset_unibyte_charset);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2116 defsubr (&Scharset_plist);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2117 defsubr (&Sset_charset_plist);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2118 defsubr (&Sunify_charset);
20435
099812ea310f (Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents: 20362
diff changeset
2119 defsubr (&Sget_unused_iso_final_char);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2120 defsubr (&Sdeclare_equiv_charset);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2121 defsubr (&Sfind_charset_region);
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2122 defsubr (&Sfind_charset_string);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2123 defsubr (&Sdecode_char);
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2124 defsubr (&Sencode_char);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2125 defsubr (&Ssplit_char);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2126 defsubr (&Smake_char);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2127 defsubr (&Schar_charset);
21445
4c0b4a1025cd (string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents: 21419
diff changeset
2128 defsubr (&Scharset_after);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2129 defsubr (&Siso_charset);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2130 defsubr (&Sclear_charset_maps);
88641
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2131 defsubr (&Scharset_priority_list);
203bb5221b98 (Fcharset_priority_list, Fset_charset_priority): New
Dave Love <fx@gnu.org>
parents: 88634
diff changeset
2132 defsubr (&Sset_charset_priority);
89375
4b653615bbe4 (Fcharset_id_internal): New function.
Kenichi Handa <handa@m17n.org>
parents: 89365
diff changeset
2133 defsubr (&Scharset_id_internal);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2134
89787
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
2135 DEFVAR_LISP ("charset-map-path", &Vcharset_map_path,
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
2136 doc: /* *Lisp of directories to search for charset map files. */);
cbb58e8c4481 (Vcharset_map_directory): Deleted.
Kenichi Handa <handa@m17n.org>
parents: 89758
diff changeset
2137 Vcharset_map_path = Qnil;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2138
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2139 DEFVAR_LISP ("charset-list", &Vcharset_list,
88634
ad7c09ee6cf9 (Fdefine_charset_alias): Update Vcharset_list.
Dave Love <fx@gnu.org>
parents: 88626
diff changeset
2140 doc: /* List of all charsets ever defined. */);
88364
f6557aebe110 Completely re-written. Character and multibyte
Kenichi Handa <handa@m17n.org>
parents: 43144
diff changeset
2141 Vcharset_list = Qnil;
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2142
88948
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2143 charset_ascii
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2144 = 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
2145 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
2146 charset_iso_8859_1
77ff0866e8b1 (Fset_unibyte_charset): If the dimension of CHARSET is
Kenichi Handa <handa@m17n.org>
parents: 88985
diff changeset
2147 = 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
2148 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
2149 charset_unicode
88957
afdff51dae58 (syms_of_charset): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 88948
diff changeset
2150 = 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
2151 0, MAX_UNICODE_CHAR, -1, 0, -1, 1, 0, 0);
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2152 charset_eight_bit
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2153 = define_charset_internal (Qeight_bit, 1, "\x80\xFF\x00\x00\x00\x00",
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2154 128, 255, -1, 0, -1, 0, 0,
1ff7f42f40ad (charset_eight_bit, Qeight_bit_control): New
Kenichi Handa <handa@m17n.org>
parents: 88927
diff changeset
2155 MAX_5_BYTE_CHAR + 1);
17052
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2156 }
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2157
d0d7b244b1d0 Initial revision
Karl Heuer <kwzh@gnu.org>
parents:
diff changeset
2158 #endif /* emacs */