annotate src/charset.c @ 108361:c1fe9f79424a

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