Mercurial > emacs
annotate src/charset.c @ 43798:ff7e1d919ec0
Split pre-21.1 changes into ChangeLog.9.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 09 Mar 2002 09:30:18 +0000 |
parents | f92c4d87863a |
children | fca902769bf4 |
rev | line source |
---|---|
18341
33e78cc7f058
Change copyright notices.
Richard M. Stallman <rms@gnu.org>
parents:
18003
diff
changeset
|
1 /* Basic multilingual character support. |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
2 Copyright (C) 1995, 1997, 1998 Electrotechnical Laboratory, JAPAN. |
18341
33e78cc7f058
Change copyright notices.
Richard M. Stallman <rms@gnu.org>
parents:
18003
diff
changeset
|
3 Licensed to the Free Software Foundation. |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
4 Copyright (C) 2001 Free Software Foundation, Inc. |
17052 | 5 |
17071 | 6 This file is part of GNU Emacs. |
7 | |
8 GNU Emacs is free software; you can redistribute it and/or modify | |
9 it under the terms of the GNU General Public License as published by | |
10 the Free Software Foundation; either version 2, or (at your option) | |
11 any later version. | |
17052 | 12 |
17071 | 13 GNU Emacs is distributed in the hope that it will be useful, |
14 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 GNU General Public License for more details. | |
17052 | 17 |
17071 | 18 You should have received a copy of the GNU General Public License |
19 along with GNU Emacs; see the file COPYING. If not, write to | |
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
21 Boston, MA 02111-1307, USA. */ | |
17052 | 22 |
23 /* At first, see the document in `charset.h' to understand the code in | |
24 this file. */ | |
25 | |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25611
diff
changeset
|
26 #ifdef emacs |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25611
diff
changeset
|
27 #include <config.h> |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25611
diff
changeset
|
28 #endif |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25611
diff
changeset
|
29 |
17052 | 30 #include <stdio.h> |
31 | |
32 #ifdef emacs | |
33 | |
34 #include <sys/types.h> | |
35 #include "lisp.h" | |
36 #include "buffer.h" | |
37 #include "charset.h" | |
31420 | 38 #include "composite.h" |
17052 | 39 #include "coding.h" |
17843 | 40 #include "disptab.h" |
17052 | 41 |
42 #else /* not emacs */ | |
43 | |
44 #include "mulelib.h" | |
45 | |
46 #endif /* emacs */ | |
47 | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
48 Lisp_Object Qcharset, Qascii, Qeight_bit_control, Qeight_bit_graphic; |
23883 | 49 Lisp_Object Qunknown; |
17052 | 50 |
51 /* Declaration of special leading-codes. */ | |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43144
diff
changeset
|
52 EMACS_INT leading_code_private_11; /* for private DIMENSION1 of 1-column */ |
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43144
diff
changeset
|
53 EMACS_INT leading_code_private_12; /* for private DIMENSION1 of 2-column */ |
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43144
diff
changeset
|
54 EMACS_INT leading_code_private_21; /* for private DIMENSION2 of 1-column */ |
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43144
diff
changeset
|
55 EMACS_INT leading_code_private_22; /* for private DIMENSION2 of 2-column */ |
17052 | 56 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
57 /* Declaration of special charsets. The values are set by |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
58 Fsetup_special_charsets. */ |
17052 | 59 int charset_latin_iso8859_1; /* ISO8859-1 (Latin-1) */ |
60 int charset_jisx0208_1978; /* JISX0208.1978 (Japanese Kanji old set) */ | |
61 int charset_jisx0208; /* JISX0208.1983 (Japanese Kanji) */ | |
62 int charset_katakana_jisx0201; /* JISX0201.Kana (Japanese Katakana) */ | |
63 int charset_latin_jisx0201; /* JISX0201.Roman (Japanese Roman) */ | |
64 int charset_big5_1; /* Big5 Level 1 (Chinese Traditional) */ | |
65 int charset_big5_2; /* Big5 Level 2 (Chinese Traditional) */ | |
66 | |
67 Lisp_Object Qcharset_table; | |
68 | |
69 /* A char-table containing information of each character set. */ | |
70 Lisp_Object Vcharset_table; | |
71 | |
72 /* A vector of charset symbol indexed by charset-id. This is used | |
73 only for returning charset symbol from C functions. */ | |
74 Lisp_Object Vcharset_symbol_table; | |
75 | |
76 /* A list of charset symbols ever defined. */ | |
77 Lisp_Object Vcharset_list; | |
78 | |
22185
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
79 /* Vector of translation table ever defined. |
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
80 ID of a translation table is used to index this vector. */ |
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
81 Lisp_Object Vtranslation_table_vector; |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
82 |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
83 /* A char-table for characters which may invoke auto-filling. */ |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
84 Lisp_Object Vauto_fill_chars; |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
85 |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
86 Lisp_Object Qauto_fill_chars; |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
87 |
17052 | 88 /* Tables used by macros BYTES_BY_CHAR_HEAD and WIDTH_BY_CHAR_HEAD. */ |
89 int bytes_by_char_head[256]; | |
90 int width_by_char_head[256]; | |
91 | |
92 /* Mapping table from ISO2022's charset (specified by DIMENSION, | |
93 CHARS, and FINAL-CHAR) to Emacs' charset. */ | |
94 int iso_charset_table[2][2][128]; | |
95 | |
96 /* Variables used locally in the macro FETCH_MULTIBYTE_CHAR. */ | |
97 unsigned char *_fetch_multibyte_char_p; | |
98 int _fetch_multibyte_char_len; | |
99 | |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
100 /* Offset to add to a non-ASCII value when inserting it. */ |
43713
f92c4d87863a
Change defvar_int def and vars to use EMACS_INT instead of just int.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43144
diff
changeset
|
101 EMACS_INT nonascii_insert_offset; |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
102 |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
103 /* Translation table for converting non-ASCII unibyte characters |
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
104 to multibyte codes, or nil. */ |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
105 Lisp_Object Vnonascii_translation_table; |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
106 |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
107 /* List of all possible generic characters. */ |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
108 Lisp_Object Vgeneric_character_list; |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
109 |
19384 | 110 |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
111 void |
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
112 invalid_character (c) |
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
113 int c; |
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
114 { |
23397
2fe04027242e
(invalid_character): Prepend `0' to octal
Kenichi Handa <handa@m17n.org>
parents:
23210
diff
changeset
|
115 error ("Invalid character: 0%o, %d, 0x%x", c, c, c); |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
116 } |
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
117 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
118 /* Parse string STR of length LENGTH and fetch information of a |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
119 character at STR. Set BYTES to the byte length the character |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
120 occupies, CHARSET, C1, C2 to proper values of the character. */ |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
121 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
122 #define SPLIT_MULTIBYTE_SEQ(str, length, bytes, charset, c1, c2) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
123 do { \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
124 (c1) = *(str); \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
125 (bytes) = BYTES_BY_CHAR_HEAD (c1); \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
126 if ((bytes) == 1) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
127 (charset) = ASCII_BYTE_P (c1) ? CHARSET_ASCII : CHARSET_8_BIT_GRAPHIC; \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
128 else if ((bytes) == 2) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
129 { \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
130 if ((c1) == LEADING_CODE_8_BIT_CONTROL) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
131 (charset) = CHARSET_8_BIT_CONTROL, (c1) = (str)[1] - 0x20; \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
132 else \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
133 (charset) = (c1), (c1) = (str)[1] & 0x7F; \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
134 } \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
135 else if ((bytes) == 3) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
136 { \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
137 if ((c1) < LEADING_CODE_PRIVATE_11) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
138 (charset) = (c1), (c1) = (str)[1] & 0x7F, (c2) = (str)[2] & 0x7F; \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
139 else \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
140 (charset) = (str)[1], (c1) = (str)[2] & 0x7F; \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
141 } \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
142 else \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
143 (charset) = (str)[1], (c1) = (str)[2] & 0x7F, (c2) = (str)[3] & 0x7F; \ |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
144 } while (0) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
145 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
146 /* 1 if CHARSET, C1, and C2 compose a valid character, else 0. */ |
25584 | 147 #define CHAR_COMPONENTS_VALID_P(charset, c1, c2) \ |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
148 ((charset) == CHARSET_ASCII \ |
25611
9c9d13747ffb
(CHAR_COMPONENTS_VALID_P): Fix for ASCII.
Kenichi Handa <handa@m17n.org>
parents:
25610
diff
changeset
|
149 ? ((c1) >= 0 && (c1) <= 0x7F) \ |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
150 : ((charset) == CHARSET_8_BIT_CONTROL \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
151 ? ((c1) >= 0x80 && (c1) <= 0x9F) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
152 : ((charset) == CHARSET_8_BIT_GRAPHIC \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
153 ? ((c1) >= 0x80 && (c1) <= 0xFF) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
154 : (CHARSET_DIMENSION (charset) == 1 \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
155 ? ((c1) >= 0x20 && (c1) <= 0x7F) \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
156 : ((c1) >= 0x20 && (c1) <= 0x7F \ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
157 && (c2) >= 0x20 && (c2) <= 0x7F))))) |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
158 |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
159 /* Store multi-byte form of the character C in STR. The caller should |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
160 allocate at least 4-byte area at STR in advance. Returns the |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
161 length of the multi-byte form. If C is an invalid character code, |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
162 return -1. */ |
17052 | 163 |
164 int | |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
165 char_to_string_1 (c, str) |
17052 | 166 int c; |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
167 unsigned char *str; |
17052 | 168 { |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
169 unsigned char *p = str; |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
170 |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
171 if (c & CHAR_MODIFIER_MASK) /* This includes the case C is negative. */ |
23767
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
172 { |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
173 /* Multibyte character can't have a modifier bit. */ |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
174 if (! SINGLE_BYTE_CHAR_P ((c & ~CHAR_MODIFIER_MASK))) |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
175 return -1; |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
176 |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
177 /* For Meta, Shift, and Control modifiers, we need special care. */ |
23767
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
178 if (c & CHAR_META) |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
179 { |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
180 /* Move the meta bit to the right place for a string. */ |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
181 c = (c & ~CHAR_META) | 0x80; |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
182 } |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
183 if (c & CHAR_SHIFT) |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
184 { |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
185 /* Shift modifier is valid only with [A-Za-z]. */ |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
186 if ((c & 0377) >= 'A' && (c & 0377) <= 'Z') |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
187 c &= ~CHAR_SHIFT; |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
188 else if ((c & 0377) >= 'a' && (c & 0377) <= 'z') |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
189 c = (c & ~CHAR_SHIFT) - ('a' - 'A'); |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
190 } |
23767
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
191 if (c & CHAR_CTL) |
25250
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
192 { |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
193 /* Simulate the code in lread.c. */ |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
194 /* Allow `\C- ' and `\C-?'. */ |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
195 if (c == (CHAR_CTL | ' ')) |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
196 c = 0; |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
197 else if (c == (CHAR_CTL | '?')) |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
198 c = 127; |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
199 /* ASCII control chars are made from letters (both cases), |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
200 as well as the non-letters within 0100...0137. */ |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
201 else if ((c & 0137) >= 0101 && (c & 0137) <= 0132) |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
202 c &= (037 | (~0177 & ~CHAR_CTL)); |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
203 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137) |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
204 c &= (037 | (~0177 & ~CHAR_CTL)); |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
205 } |
2228d0a678ef
(non_ascii_char_to_string): Handle modifier bits as
Kenichi Handa <handa@m17n.org>
parents:
23978
diff
changeset
|
206 |
36521
4c211a545642
(char_to_string): If a single byte char has modifier
Kenichi Handa <handa@m17n.org>
parents:
35999
diff
changeset
|
207 /* If C still has any modifier bits, just ignore it. */ |
4c211a545642
(char_to_string): If a single byte char has modifier
Kenichi Handa <handa@m17n.org>
parents:
35999
diff
changeset
|
208 c &= ~CHAR_MODIFIER_MASK; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
209 } |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
210 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
211 if (SINGLE_BYTE_CHAR_P (c)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
212 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
213 if (ASCII_BYTE_P (c) || c >= 0xA0) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
214 *p++ = c; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
215 else |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
216 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
217 *p++ = LEADING_CODE_8_BIT_CONTROL; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
218 *p++ = c + 0x20; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
219 } |
23767
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
220 } |
31176 | 221 else if (CHAR_VALID_P (c, 0)) |
17052 | 222 { |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
223 int charset, c1, c2; |
17052 | 224 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
225 SPLIT_CHAR (c, charset, c1, c2); |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
226 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
227 if (charset >= LEADING_CODE_EXT_11) |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
228 *p++ = (charset < LEADING_CODE_EXT_12 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
229 ? LEADING_CODE_PRIVATE_11 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
230 : (charset < LEADING_CODE_EXT_21 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
231 ? LEADING_CODE_PRIVATE_12 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
232 : (charset < LEADING_CODE_EXT_22 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
233 ? LEADING_CODE_PRIVATE_21 |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
234 : LEADING_CODE_PRIVATE_22))); |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
235 *p++ = charset; |
41898
9965a3b28660
(char_to_string_1, translate_char, Fdefine_charset): Add parentheses around
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
236 if ((c1 > 0 && c1 < 32) || (c2 > 0 && c2 < 32)) |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
237 return -1; |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
238 if (c1) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
239 { |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
240 *p++ = c1 | 0x80; |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
241 if (c2 > 0) |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
242 *p++ = c2 | 0x80; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
243 } |
17052 | 244 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
245 else |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
246 return -1; |
17052 | 247 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
248 return (p - str); |
17052 | 249 } |
250 | |
38394
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
251 |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
252 /* Store multi-byte form of the character C in STR. The caller should |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
253 allocate at least 4-byte area at STR in advance. Returns the |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
254 length of the multi-byte form. If C is an invalid character code, |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
255 signal an error. |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
256 |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
257 Use macro `CHAR_STRING (C, STR)' instead of calling this function |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
258 directly if C can be an ASCII character. */ |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
259 |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
260 int |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
261 char_to_string (c, str) |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
262 int c; |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
263 unsigned char *str; |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
264 { |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
265 int len; |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
266 len = char_to_string_1 (c, str); |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
267 if (len == -1) |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
268 invalid_character (c); |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
269 return len; |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
270 } |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
271 |
245ae371bd4d
(char_to_string_1): Extracted from char_to_string.
Gerd Moellmann <gerd@gnu.org>
parents:
36521
diff
changeset
|
272 |
25584 | 273 /* Return the non-ASCII character corresponding to multi-byte form at |
274 STR of length LEN. If ACTUAL_LEN is not NULL, store the byte | |
275 length of the multibyte form in *ACTUAL_LEN. | |
22185
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
276 |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
277 Use macros STRING_CHAR or STRING_CHAR_AND_LENGTH instead of calling |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
278 this function directly if you want ot handle ASCII characters as |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
279 well. */ |
17052 | 280 |
21514 | 281 int |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
282 string_to_char (str, len, actual_len) |
21419
95aae2ff5fcd
(string_to_non_ascii_char, multibyte_form_length)
Karl Heuer <kwzh@gnu.org>
parents:
21255
diff
changeset
|
283 const unsigned char *str; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
284 int len, *actual_len; |
17052 | 285 { |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
286 int c, bytes, charset, c1, c2; |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
287 |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
288 SPLIT_MULTIBYTE_SEQ (str, len, bytes, charset, c1, c2); |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
289 c = MAKE_CHAR (charset, c1, c2); |
17052 | 290 if (actual_len) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
291 *actual_len = bytes; |
17052 | 292 return c; |
293 } | |
294 | |
25584 | 295 /* Return the length of the multi-byte form at string STR of length LEN. |
296 Use the macro MULTIBYTE_FORM_LENGTH instead. */ | |
17052 | 297 int |
298 multibyte_form_length (str, len) | |
21419
95aae2ff5fcd
(string_to_non_ascii_char, multibyte_form_length)
Karl Heuer <kwzh@gnu.org>
parents:
21255
diff
changeset
|
299 const unsigned char *str; |
17052 | 300 int len; |
301 { | |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
302 int bytes; |
17052 | 303 |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
304 PARSE_MULTIBYTE_SEQ (str, len, bytes); |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
305 return bytes; |
17052 | 306 } |
307 | |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
308 /* Check multibyte form at string STR of length LEN and set variables |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
309 pointed by CHARSET, C1, and C2 to charset and position codes of the |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
310 character at STR, and return 0. If there's no multibyte character, |
17052 | 311 return -1. This should be used only in the macro SPLIT_STRING |
312 which checks range of STR in advance. */ | |
313 | |
21514 | 314 int |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
315 split_string (str, len, charset, c1, c2) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
316 const unsigned char *str; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
317 unsigned char *c1, *c2; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
318 int len, *charset; |
17052 | 319 { |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
320 register int bytes, cs, code1, code2 = -1; |
17052 | 321 |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
322 SPLIT_MULTIBYTE_SEQ (str, len, bytes, cs, code1, code2); |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
323 if (cs == CHARSET_ASCII) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
324 return -1; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
325 *charset = cs; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
326 *c1 = code1; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
327 *c2 = code2; |
26327
74566592a2d6
(split_non_ascii_string): Define return value.
Dave Love <fx@gnu.org>
parents:
26088
diff
changeset
|
328 return 0; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
329 } |
17052 | 330 |
25584 | 331 /* Return 1 iff character C has valid printable glyph. |
332 Use the macro CHAR_PRINTABLE_P instead. */ | |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
333 int |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
334 char_printable_p (c) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
335 int c; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
336 { |
34985
cbfe4fc97ebe
(char_printable_p): Remove unused variable `chars'.
Eli Zaretskii <eliz@gnu.org>
parents:
34761
diff
changeset
|
337 int charset, c1, c2; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
338 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
339 if (ASCII_BYTE_P (c)) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
340 return 1; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
341 else if (SINGLE_BYTE_CHAR_P (c)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
342 return 0; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
343 else if (c >= MAX_CHAR) |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
344 return 0; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
345 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
346 SPLIT_CHAR (c, charset, c1, c2); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
347 if (! CHARSET_DEFINED_P (charset)) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
348 return 0; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
349 if (CHARSET_CHARS (charset) == 94 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
350 ? c1 <= 32 || c1 >= 127 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
351 : c1 < 32) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
352 return 0; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
353 if (CHARSET_DIMENSION (charset) == 2 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
354 && (CHARSET_CHARS (charset) == 94 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
355 ? c2 <= 32 || c2 >= 127 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
356 : c2 < 32)) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
357 return 0; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
358 return 1; |
17052 | 359 } |
360 | |
22185
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
361 /* Translate character C by translation table TABLE. If C |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
362 is negative, translate a character specified by CHARSET, C1, and C2 |
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
363 (C1 and C2 are code points of the character). If no translation is |
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
364 found in TABLE, return C. */ |
21514 | 365 int |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
366 translate_char (table, c, charset, c1, c2) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
367 Lisp_Object table; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
368 int c, charset, c1, c2; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
369 { |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
370 Lisp_Object ch; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
371 int alt_charset, alt_c1, alt_c2, dimension; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
372 |
25610
5f9f35400f70
Reset MSBs of arguments of MAKE_CHAR.
Kenichi Handa <handa@m17n.org>
parents:
25584
diff
changeset
|
373 if (c < 0) c = MAKE_CHAR (charset, (c1 & 0x7F) , (c2 & 0x7F)); |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
374 if (!CHAR_TABLE_P (table) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
375 || (ch = Faref (table, make_number (c)), !NATNUMP (ch))) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
376 return c; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
377 |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
378 SPLIT_CHAR (XFASTINT (ch), alt_charset, alt_c1, alt_c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
379 dimension = CHARSET_DIMENSION (alt_charset); |
41898
9965a3b28660
(char_to_string_1, translate_char, Fdefine_charset): Add parentheses around
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
380 if ((dimension == 1 && alt_c1 > 0) || (dimension == 2 && alt_c2 > 0)) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
381 /* CH is not a generic character, just return it. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
382 return XFASTINT (ch); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
383 |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
384 /* Since CH is a generic character, we must return a specific |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
385 charater which has the same position codes as C from CH. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
386 if (charset < 0) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
387 SPLIT_CHAR (c, charset, c1, c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
388 if (dimension != CHARSET_DIMENSION (charset)) |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
389 /* We can't make such a character because of dimension mismatch. */ |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
390 return c; |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
391 return MAKE_CHAR (alt_charset, c1, c2); |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
392 } |
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
393 |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
394 /* Convert the unibyte character C to multibyte based on |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
395 Vnonascii_translation_table or nonascii_insert_offset. If they can't |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
396 convert C to a valid multibyte character, convert it based on |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
397 DEFAULT_NONASCII_INSERT_OFFSET which makes C a Latin-1 character. */ |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
398 |
21514 | 399 int |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
400 unibyte_char_to_multibyte (c) |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
401 int c; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
402 { |
23928
b718a88bb2b1
(unibyte_char_to_multibyte): Don't convert 7-bit ASCII characters via
Eli Zaretskii <eliz@gnu.org>
parents:
23883
diff
changeset
|
403 if (c < 0400 && c >= 0200) |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
404 { |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
405 int c_save = c; |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
406 |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
407 if (! NILP (Vnonascii_translation_table)) |
23154
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
408 { |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
409 c = XINT (Faref (Vnonascii_translation_table, make_number (c))); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
410 if (c >= 0400 && ! char_valid_p (c, 0)) |
23154
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
411 c = c_save + DEFAULT_NONASCII_INSERT_OFFSET; |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
412 } |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
413 else if (c >= 0240 && nonascii_insert_offset > 0) |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
414 { |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
415 c += nonascii_insert_offset; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
416 if (c < 0400 || ! char_valid_p (c, 0)) |
23154
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
417 c = c_save + DEFAULT_NONASCII_INSERT_OFFSET; |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
418 } |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
419 else if (c >= 0240) |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
420 c = c_save + DEFAULT_NONASCII_INSERT_OFFSET; |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
421 } |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
422 return c; |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
423 } |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
424 |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
425 |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
426 /* Convert the multibyte character C to unibyte 8-bit character based |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
427 on Vnonascii_translation_table or nonascii_insert_offset. If |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
428 REV_TBL is non-nil, it should be a reverse table of |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
429 Vnonascii_translation_table, i.e. what given by: |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
430 Fchar_table_extra_slot (Vnonascii_translation_table, make_number (0)) */ |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
431 |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
432 int |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
433 multibyte_char_to_unibyte (c, rev_tbl) |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
434 int c; |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
435 Lisp_Object rev_tbl; |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
436 { |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
437 if (!SINGLE_BYTE_CHAR_P (c)) |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
438 { |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
439 int c_save = c; |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
440 |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
441 if (! CHAR_TABLE_P (rev_tbl) |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
442 && CHAR_TABLE_P (Vnonascii_translation_table)) |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
443 rev_tbl = Fchar_table_extra_slot (Vnonascii_translation_table, |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
444 make_number (0)); |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
445 if (CHAR_TABLE_P (rev_tbl)) |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
446 { |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
447 Lisp_Object temp; |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
448 temp = Faref (rev_tbl, make_number (c)); |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
449 if (INTEGERP (temp)) |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
450 c = XINT (temp); |
23154
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
451 if (c >= 256) |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
452 c = (c_save & 0177) + 0200; |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
453 } |
23154
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
454 else |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
455 { |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
456 if (nonascii_insert_offset > 0) |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
457 c -= nonascii_insert_offset; |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
458 if (c < 128 || c >= 256) |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
459 c = (c_save & 0177) + 0200; |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
460 } |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
461 } |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
462 |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
463 return c; |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
464 } |
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
465 |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
466 |
17052 | 467 /* Update the table Vcharset_table with the given arguments (see the |
468 document of `define-charset' for the meaning of each argument). | |
469 Several other table contents are also updated. The caller should | |
470 check the validity of CHARSET-ID and the remaining arguments in | |
471 advance. */ | |
472 | |
473 void | |
474 update_charset_table (charset_id, dimension, chars, width, direction, | |
475 iso_final_char, iso_graphic_plane, | |
476 short_name, long_name, description) | |
477 Lisp_Object charset_id, dimension, chars, width, direction; | |
478 Lisp_Object iso_final_char, iso_graphic_plane; | |
479 Lisp_Object short_name, long_name, description; | |
480 { | |
481 int charset = XINT (charset_id); | |
482 int bytes; | |
483 unsigned char leading_code_base, leading_code_ext; | |
484 | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
485 if (NILP (CHARSET_TABLE_ENTRY (charset))) |
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
486 CHARSET_TABLE_ENTRY (charset) |
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
487 = Fmake_vector (make_number (CHARSET_MAX_IDX), Qnil); |
17052 | 488 |
29139
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
489 if (NILP (long_name)) |
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
490 long_name = short_name; |
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
491 if (NILP (description)) |
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
492 description = long_name; |
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
493 |
17052 | 494 /* Get byte length of multibyte form, base leading-code, and |
495 extended leading-code of the charset. See the comment under the | |
496 title "GENERAL NOTE on CHARACTER SET (CHARSET)" in charset.h. */ | |
497 bytes = XINT (dimension); | |
498 if (charset < MIN_CHARSET_PRIVATE_DIMENSION1) | |
499 { | |
500 /* Official charset, it doesn't have an extended leading-code. */ | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
501 if (charset != CHARSET_ASCII && charset != CHARSET_8_BIT_GRAPHIC) |
17052 | 502 bytes += 1; /* For a base leading-code. */ |
503 leading_code_base = charset; | |
504 leading_code_ext = 0; | |
505 } | |
506 else | |
507 { | |
508 /* Private charset. */ | |
509 bytes += 2; /* For base and extended leading-codes. */ | |
510 leading_code_base | |
511 = (charset < LEADING_CODE_EXT_12 | |
512 ? LEADING_CODE_PRIVATE_11 | |
513 : (charset < LEADING_CODE_EXT_21 | |
514 ? LEADING_CODE_PRIVATE_12 | |
515 : (charset < LEADING_CODE_EXT_22 | |
516 ? LEADING_CODE_PRIVATE_21 | |
517 : LEADING_CODE_PRIVATE_22))); | |
518 leading_code_ext = charset; | |
29538
c0c34d18e8a0
(update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents:
29269
diff
changeset
|
519 if (BYTES_BY_CHAR_HEAD (leading_code_base) != bytes) |
c0c34d18e8a0
(update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents:
29269
diff
changeset
|
520 error ("Invalid dimension for the charset-ID %d", charset); |
c0c34d18e8a0
(update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents:
29269
diff
changeset
|
521 } |
23628
4a0a107fac9e
(string_to_non_ascii_char): Change the check for the
Kenichi Handa <handa@m17n.org>
parents:
23576
diff
changeset
|
522 |
17052 | 523 CHARSET_TABLE_INFO (charset, CHARSET_ID_IDX) = charset_id; |
524 CHARSET_TABLE_INFO (charset, CHARSET_BYTES_IDX) = make_number (bytes); | |
525 CHARSET_TABLE_INFO (charset, CHARSET_DIMENSION_IDX) = dimension; | |
526 CHARSET_TABLE_INFO (charset, CHARSET_CHARS_IDX) = chars; | |
527 CHARSET_TABLE_INFO (charset, CHARSET_WIDTH_IDX) = width; | |
528 CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX) = direction; | |
529 CHARSET_TABLE_INFO (charset, CHARSET_LEADING_CODE_BASE_IDX) | |
530 = make_number (leading_code_base); | |
531 CHARSET_TABLE_INFO (charset, CHARSET_LEADING_CODE_EXT_IDX) | |
532 = make_number (leading_code_ext); | |
533 CHARSET_TABLE_INFO (charset, CHARSET_ISO_FINAL_CHAR_IDX) = iso_final_char; | |
534 CHARSET_TABLE_INFO (charset, CHARSET_ISO_GRAPHIC_PLANE_IDX) | |
535 = iso_graphic_plane; | |
536 CHARSET_TABLE_INFO (charset, CHARSET_SHORT_NAME_IDX) = short_name; | |
537 CHARSET_TABLE_INFO (charset, CHARSET_LONG_NAME_IDX) = long_name; | |
538 CHARSET_TABLE_INFO (charset, CHARSET_DESCRIPTION_IDX) = description; | |
539 CHARSET_TABLE_INFO (charset, CHARSET_PLIST_IDX) = Qnil; | |
540 | |
541 { | |
542 /* If we have already defined a charset which has the same | |
543 DIMENSION, CHARS and ISO-FINAL-CHAR but the different | |
544 DIRECTION, we must update the entry REVERSE-CHARSET of both | |
545 charsets. If there's no such charset, the value of the entry | |
546 is set to nil. */ | |
547 int i; | |
548 | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
549 for (i = 0; i <= MAX_CHARSET; i++) |
17052 | 550 if (!NILP (CHARSET_TABLE_ENTRY (i))) |
551 { | |
552 if (CHARSET_DIMENSION (i) == XINT (dimension) | |
553 && CHARSET_CHARS (i) == XINT (chars) | |
554 && CHARSET_ISO_FINAL_CHAR (i) == XINT (iso_final_char) | |
555 && CHARSET_DIRECTION (i) != XINT (direction)) | |
556 { | |
557 CHARSET_TABLE_INFO (charset, CHARSET_REVERSE_CHARSET_IDX) | |
558 = make_number (i); | |
559 CHARSET_TABLE_INFO (i, CHARSET_REVERSE_CHARSET_IDX) = charset_id; | |
560 break; | |
561 } | |
562 } | |
17186
65bc06706714
Adjusted for the change of MAX_CHARSET.
Kenichi Handa <handa@m17n.org>
parents:
17121
diff
changeset
|
563 if (i > MAX_CHARSET) |
17052 | 564 /* No such a charset. */ |
565 CHARSET_TABLE_INFO (charset, CHARSET_REVERSE_CHARSET_IDX) | |
566 = make_number (-1); | |
567 } | |
568 | |
29538
c0c34d18e8a0
(update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents:
29269
diff
changeset
|
569 if (charset != CHARSET_ASCII && charset != CHARSET_8_BIT_GRAPHIC |
17052 | 570 && charset < MIN_CHARSET_PRIVATE_DIMENSION1) |
571 { | |
29538
c0c34d18e8a0
(update_charset_table): Update the table
Kenichi Handa <handa@m17n.org>
parents:
29269
diff
changeset
|
572 bytes_by_char_head[leading_code_base] = bytes; |
17052 | 573 width_by_char_head[leading_code_base] = XINT (width); |
574 | |
575 /* Update table emacs_code_class. */ | |
576 emacs_code_class[charset] = (bytes == 2 | |
577 ? EMACS_leading_code_2 | |
578 : (bytes == 3 | |
579 ? EMACS_leading_code_3 | |
580 : EMACS_leading_code_4)); | |
581 } | |
582 | |
583 /* Update table iso_charset_table. */ | |
29717
acaa36b47f50
fix up more Lisp_Object/int conversion issues
Ken Raeburn <raeburn@raeburn.org>
parents:
29538
diff
changeset
|
584 if (XINT (iso_final_char) >= 0 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
585 && ISO_CHARSET_TABLE (dimension, chars, iso_final_char) < 0) |
17052 | 586 ISO_CHARSET_TABLE (dimension, chars, iso_final_char) = charset; |
587 } | |
588 | |
589 #ifdef emacs | |
590 | |
591 /* Return charset id of CHARSET_SYMBOL, or return -1 if CHARSET_SYMBOL | |
592 is invalid. */ | |
593 int | |
594 get_charset_id (charset_symbol) | |
595 Lisp_Object charset_symbol; | |
596 { | |
597 Lisp_Object val; | |
598 int charset; | |
599 | |
43144
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
600 /* This originally used a ?: operator, but reportedly the HP-UX |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
601 compiler version HP92453-01 A.10.32.22 miscompiles that. */ |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
602 if (SYMBOLP (charset_symbol) |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
603 && VECTORP (val = Fget (charset_symbol, Qcharset)) |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
604 && CHARSET_VALID_P (charset = |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
605 XINT (XVECTOR (val)->contents[CHARSET_ID_IDX]))) |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
606 return charset; |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
607 else |
69a3fef3cb46
(get_charset_id): Use if-else instead of ?:.
Eli Zaretskii <eliz@gnu.org>
parents:
42162
diff
changeset
|
608 return -1; |
17052 | 609 } |
610 | |
611 /* Return an identification number for a new private charset of | |
612 DIMENSION and WIDTH. If there's no more room for the new charset, | |
613 return 0. */ | |
614 Lisp_Object | |
615 get_new_private_charset_id (dimension, width) | |
616 int dimension, width; | |
617 { | |
618 int charset, from, to; | |
619 | |
620 if (dimension == 1) | |
621 { | |
33629
d07521d90a8e
(get_new_private_charset_id): Don't limit CHARSET_ID by WIDTH.
Kenichi Handa <handa@m17n.org>
parents:
32380
diff
changeset
|
622 from = LEADING_CODE_EXT_11; |
d07521d90a8e
(get_new_private_charset_id): Don't limit CHARSET_ID by WIDTH.
Kenichi Handa <handa@m17n.org>
parents:
32380
diff
changeset
|
623 to = LEADING_CODE_EXT_21; |
17052 | 624 } |
625 else | |
626 { | |
33629
d07521d90a8e
(get_new_private_charset_id): Don't limit CHARSET_ID by WIDTH.
Kenichi Handa <handa@m17n.org>
parents:
32380
diff
changeset
|
627 from = LEADING_CODE_EXT_21; |
d07521d90a8e
(get_new_private_charset_id): Don't limit CHARSET_ID by WIDTH.
Kenichi Handa <handa@m17n.org>
parents:
32380
diff
changeset
|
628 to = LEADING_CODE_EXT_MAX + 1; |
17052 | 629 } |
630 | |
631 for (charset = from; charset < to; charset++) | |
632 if (!CHARSET_DEFINED_P (charset)) break; | |
633 | |
634 return make_number (charset < to ? charset : 0); | |
635 } | |
636 | |
637 DEFUN ("define-charset", Fdefine_charset, Sdefine_charset, 3, 3, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
638 doc: /* Define CHARSET-ID as the identification number of CHARSET with INFO-VECTOR. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
639 If CHARSET-ID is nil, it is decided automatically, which means CHARSET is |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
640 treated as a private charset. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
641 INFO-VECTOR is a vector of the format: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
642 [DIMENSION CHARS WIDTH DIRECTION ISO-FINAL-CHAR ISO-GRAPHIC-PLANE |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
643 SHORT-NAME LONG-NAME DESCRIPTION] |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
644 The meanings of each elements is as follows: |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
645 DIMENSION (integer) 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
|
646 CHARS (integer) 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
|
647 WIDTH (integer) is the number of columns a character in the charset |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
648 occupies on the screen: one of 0, 1, and 2. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
649 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
650 DIRECTION (integer) is the rendering direction of characters in the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
651 charset when rendering. If 0, render from left to right, else |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
652 render from right to left. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
653 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
654 ISO-FINAL-CHAR (character) is the final character of the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
655 corresponding ISO 2022 charset. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
656 It may be -1 if the charset is internal use only. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
657 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
658 ISO-GRAPHIC-PLANE (integer) is the graphic plane to be invoked |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
659 while encoding to variants of ISO 2022 coding system, one of the |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
660 following: 0/graphic-plane-left(GL), 1/graphic-plane-right(GR). |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
661 It may be -1 if the charset is internal use only. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
662 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
663 SHORT-NAME (string) is the short name to refer to the charset. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
664 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
665 LONG-NAME (string) is the long name to refer to the charset. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
666 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
667 DESCRIPTION (string) is the description string of the charset. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
668 (charset_id, charset_symbol, info_vector) |
17052 | 669 Lisp_Object charset_id, charset_symbol, info_vector; |
670 { | |
671 Lisp_Object *vec; | |
672 | |
673 if (!NILP (charset_id)) | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
674 CHECK_NUMBER (charset_id); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
675 CHECK_SYMBOL (charset_symbol); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
676 CHECK_VECTOR (info_vector); |
17052 | 677 |
678 if (! NILP (charset_id)) | |
679 { | |
680 if (! CHARSET_VALID_P (XINT (charset_id))) | |
681 error ("Invalid CHARSET: %d", XINT (charset_id)); | |
682 else if (CHARSET_DEFINED_P (XINT (charset_id))) | |
683 error ("Already defined charset: %d", XINT (charset_id)); | |
684 } | |
685 | |
686 vec = XVECTOR (info_vector)->contents; | |
687 if (XVECTOR (info_vector)->size != 9 | |
688 || !INTEGERP (vec[0]) || !(XINT (vec[0]) == 1 || XINT (vec[0]) == 2) | |
689 || !INTEGERP (vec[1]) || !(XINT (vec[1]) == 94 || XINT (vec[1]) == 96) | |
690 || !INTEGERP (vec[2]) || !(XINT (vec[2]) == 1 || XINT (vec[2]) == 2) | |
691 || !INTEGERP (vec[3]) || !(XINT (vec[3]) == 0 || XINT (vec[3]) == 1) | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
692 || !INTEGERP (vec[4]) |
41898
9965a3b28660
(char_to_string_1, translate_char, Fdefine_charset): Add parentheses around
Pavel Janík <Pavel@Janik.cz>
parents:
40656
diff
changeset
|
693 || !(XINT (vec[4]) == -1 || (XINT (vec[4]) >= '0' && XINT (vec[4]) <= '~')) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
694 || !INTEGERP (vec[5]) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
695 || !(XINT (vec[5]) == -1 || XINT (vec[5]) == 0 || XINT (vec[5]) == 1) |
17052 | 696 || !STRINGP (vec[6]) |
697 || !STRINGP (vec[7]) | |
698 || !STRINGP (vec[8])) | |
699 error ("Invalid info-vector argument for defining charset %s", | |
700 XSYMBOL (charset_symbol)->name->data); | |
701 | |
702 if (NILP (charset_id)) | |
703 { | |
704 charset_id = get_new_private_charset_id (XINT (vec[0]), XINT (vec[2])); | |
705 if (XINT (charset_id) == 0) | |
706 error ("There's no room for a new private charset %s", | |
707 XSYMBOL (charset_symbol)->name->data); | |
708 } | |
709 | |
710 update_charset_table (charset_id, vec[0], vec[1], vec[2], vec[3], | |
711 vec[4], vec[5], vec[6], vec[7], vec[8]); | |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
712 Fput (charset_symbol, Qcharset, CHARSET_TABLE_ENTRY (XINT (charset_id))); |
17052 | 713 CHARSET_SYMBOL (XINT (charset_id)) = charset_symbol; |
714 Vcharset_list = Fcons (charset_symbol, Vcharset_list); | |
42162
478d5ff60075
(Fdefine_charset): Call Fupdate_coding_systems_internal.
Richard M. Stallman <rms@gnu.org>
parents:
41898
diff
changeset
|
715 Fupdate_coding_systems_internal (); |
17052 | 716 return Qnil; |
717 } | |
718 | |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
719 DEFUN ("generic-character-list", Fgeneric_character_list, |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
720 Sgeneric_character_list, 0, 0, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
721 doc: /* Return a list of all possible generic characters. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
722 It includes a generic character for a charset not yet defined. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
723 () |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
724 { |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
725 return Vgeneric_character_list; |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
726 } |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
727 |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
728 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
|
729 Sget_unused_iso_final_char, 2, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
730 doc: /* Return an unsed ISO's final char for a charset of DIMENISION and CHARS. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
731 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
|
732 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
|
733 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
734 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
|
735 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
|
736 return nil. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
737 (dimension, chars) |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
738 Lisp_Object dimension, chars; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
739 { |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
740 int final_char; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
741 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
742 CHECK_NUMBER (dimension); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
743 CHECK_NUMBER (chars); |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
744 if (XINT (dimension) != 1 && XINT (dimension) != 2) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
745 error ("Invalid charset dimension %d, it should be 1 or 2", |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
746 XINT (dimension)); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
747 if (XINT (chars) != 94 && XINT (chars) != 96) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
748 error ("Invalid charset chars %d, it should be 94 or 96", |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
749 XINT (chars)); |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
750 for (final_char = '0'; final_char <= '?'; final_char++) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
751 { |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
752 if (ISO_CHARSET_TABLE (dimension, chars, make_number (final_char)) < 0) |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
753 break; |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
754 } |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
755 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
|
756 } |
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
757 |
17052 | 758 DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset, |
759 4, 4, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
760 doc: /* Declare a charset of DIMENSION, CHARS, FINAL-CHAR is the same as CHARSET. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
761 CHARSET should be defined by `defined-charset' in advance. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
762 (dimension, chars, final_char, charset_symbol) |
17052 | 763 Lisp_Object dimension, chars, final_char, charset_symbol; |
764 { | |
765 int charset; | |
766 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
767 CHECK_NUMBER (dimension); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
768 CHECK_NUMBER (chars); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
769 CHECK_NUMBER (final_char); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
770 CHECK_SYMBOL (charset_symbol); |
17052 | 771 |
772 if (XINT (dimension) != 1 && XINT (dimension) != 2) | |
773 error ("Invalid DIMENSION %d, it should be 1 or 2", XINT (dimension)); | |
774 if (XINT (chars) != 94 && XINT (chars) != 96) | |
775 error ("Invalid CHARS %d, it should be 94 or 96", XINT (chars)); | |
776 if (XINT (final_char) < '0' || XFASTINT (final_char) > '~') | |
777 error ("Invalid FINAL-CHAR %c, it should be `0'..`~'", XINT (chars)); | |
778 if ((charset = get_charset_id (charset_symbol)) < 0) | |
779 error ("Invalid charset %s", XSYMBOL (charset_symbol)->name->data); | |
780 | |
781 ISO_CHARSET_TABLE (dimension, chars, final_char) = charset; | |
782 return Qnil; | |
783 } | |
784 | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
785 /* 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
|
786 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
|
787 |
29095
39e94c12f469
Fix previous change (typo).
Kenichi Handa <handa@m17n.org>
parents:
29094
diff
changeset
|
788 0: Each character is represented by one byte. This is always |
29094
8b1a19b318e9
Fix comment for find_charset_in_text.
Kenichi Handa <handa@m17n.org>
parents:
29003
diff
changeset
|
789 true for unibyte text. |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
790 1: No charsets other than ascii eight-bit-control, |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
791 eight-bit-graphic, and latin-1 are found. |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
792 2: Otherwise. |
22168
2156ac6d054f
(find_charset_in_str): New arg CMPCHARP.
Kenichi Handa <handa@m17n.org>
parents:
22121
diff
changeset
|
793 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
794 In addition, if CHARSETS is nonzero, for each found charset N, set |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
795 CHARSETS[N] to 1. For that, callers should allocate CHARSETS |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
796 (MAX_CHARSET + 1 elements) in advance. It may lookup a translation |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
797 table TABLE if supplied. For invalid charsets, set CHARSETS[1] to |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
798 1 (note that there's no charset whose ID is 1). */ |
17052 | 799 |
800 int | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
801 find_charset_in_text (ptr, nchars, nbytes, charsets, table) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
802 unsigned char *ptr; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
803 int nchars, nbytes, *charsets; |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
804 Lisp_Object table; |
17052 | 805 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
806 if (nchars == nbytes) |
23883 | 807 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
808 if (charsets && nbytes > 0) |
23883 | 809 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
810 unsigned char *endp = ptr + nbytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
811 int maskbits = 0; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
812 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
813 while (ptr < endp && maskbits != 7) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
814 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
815 maskbits |= (*ptr < 0x80 ? 1 : *ptr < 0xA0 ? 2 : 4); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
816 ptr++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
817 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
818 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
819 if (maskbits & 1) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
820 charsets[CHARSET_ASCII] = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
821 if (maskbits & 2) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
822 charsets[CHARSET_8_BIT_CONTROL] = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
823 if (maskbits & 4) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
824 charsets[CHARSET_8_BIT_GRAPHIC] = 1; |
23883 | 825 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
826 return 0; |
23883 | 827 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
828 else |
17052 | 829 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
830 int return_val = 1; |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
831 int bytes, charset, c1, c2; |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
832 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
833 if (! CHAR_TABLE_P (table)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
834 table = Qnil; |
20228
acb7aa0aa71f
(find_charset_in_str): Handle the case that STR
Kenichi Handa <handa@m17n.org>
parents:
20188
diff
changeset
|
835 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
836 while (nchars-- > 0) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
837 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
838 SPLIT_MULTIBYTE_SEQ (ptr, len, bytes, charset, c1, c2); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
839 ptr += bytes; |
17052 | 840 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
841 if (!CHARSET_DEFINED_P (charset)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
842 charset = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
843 else if (! NILP (table)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
844 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
845 int c = translate_char (table, -1, charset, c1, c2); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
846 if (c >= 0) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
847 charset = CHAR_CHARSET (c); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
848 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
849 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
850 if (return_val == 1 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
851 && charset != CHARSET_ASCII |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
852 && charset != CHARSET_8_BIT_CONTROL |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
853 && charset != CHARSET_8_BIT_GRAPHIC |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
854 && charset != charset_latin_iso8859_1) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
855 return_val = 2; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
856 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
857 if (charsets) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
858 charsets[charset] = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
859 else if (return_val == 2) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
860 break; |
17052 | 861 } |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
862 return return_val; |
17052 | 863 } |
864 } | |
865 | |
866 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
|
867 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
|
868 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
|
869 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
|
870 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
|
871 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
872 If the region contains invalid multibyte characters, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
873 `unknown' is included in the returned list. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
874 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
875 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
|
876 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
|
877 (beg, end, table) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
878 Lisp_Object beg, end, table; |
17052 | 879 { |
17880
06f58d8a59ba
(Ffind_charset_region): Change the declaration of
Kenichi Handa <handa@m17n.org>
parents:
17863
diff
changeset
|
880 int charsets[MAX_CHARSET + 1]; |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
881 int from, from_byte, to, stop, stop_byte, i; |
17052 | 882 Lisp_Object val; |
883 | |
884 validate_region (&beg, &end); | |
885 from = XFASTINT (beg); | |
886 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
|
887 |
17052 | 888 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
|
889 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
890 stop = GPT; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
891 stop_byte = GPT_BYTE; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
892 } |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
893 else |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
894 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
|
895 |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
896 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
|
897 |
17880
06f58d8a59ba
(Ffind_charset_region): Change the declaration of
Kenichi Handa <handa@m17n.org>
parents:
17863
diff
changeset
|
898 bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); |
17052 | 899 while (1) |
900 { | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
901 find_charset_in_text (BYTE_POS_ADDR (from_byte), stop - from, |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
902 stop_byte - from_byte, charsets, table); |
17052 | 903 if (stop < to) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
904 { |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
905 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
|
906 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
|
907 } |
17052 | 908 else |
909 break; | |
910 } | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
911 |
17052 | 912 val = Qnil; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
913 if (charsets[1]) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
914 val = Fcons (Qunknown, val); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
915 for (i = MAX_CHARSET; i >= MIN_CHARSET_OFFICIAL_DIMENSION1; i--) |
17052 | 916 if (charsets[i]) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
917 val = Fcons (CHARSET_SYMBOL (i), val); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
918 if (charsets[0]) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
919 val = Fcons (Qascii, val); |
17052 | 920 return val; |
921 } | |
922 | |
923 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
|
924 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
|
925 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
|
926 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
|
927 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
928 If the string contains invalid multibyte characters, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
929 `unknown' is included in the returned list. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
930 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
931 If STR 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
|
932 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
|
933 (str, table) |
17727
9d39361ce928
(unify_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
17366
diff
changeset
|
934 Lisp_Object str, table; |
17052 | 935 { |
18003
ac148c939dec
(Ffind_charset_string): The variable CHARSETS is
Kenichi Handa <handa@m17n.org>
parents:
17880
diff
changeset
|
936 int charsets[MAX_CHARSET + 1]; |
17052 | 937 int i; |
938 Lisp_Object val; | |
939 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
940 CHECK_STRING (str); |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
941 |
18003
ac148c939dec
(Ffind_charset_string): The variable CHARSETS is
Kenichi Handa <handa@m17n.org>
parents:
17880
diff
changeset
|
942 bzero (charsets, (MAX_CHARSET + 1) * sizeof (int)); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
943 find_charset_in_text (XSTRING (str)->data, XSTRING (str)->size, |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
944 STRING_BYTES (XSTRING (str)), charsets, table); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
945 |
17052 | 946 val = Qnil; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
947 if (charsets[1]) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
948 val = Fcons (Qunknown, val); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
949 for (i = MAX_CHARSET; i >= MIN_CHARSET_OFFICIAL_DIMENSION1; i--) |
17052 | 950 if (charsets[i]) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
951 val = Fcons (CHARSET_SYMBOL (i), val); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
952 if (charsets[0]) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
953 val = Fcons (Qascii, val); |
17052 | 954 return val; |
955 } | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
956 |
17052 | 957 |
958 DEFUN ("make-char-internal", Fmake_char_internal, Smake_char_internal, 1, 3, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
959 doc: /* Return a character made from arguments. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
960 Internal use only. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
961 (charset, code1, code2) |
17052 | 962 Lisp_Object charset, code1, code2; |
963 { | |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
964 int charset_id, c1, c2; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
965 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
966 CHECK_NUMBER (charset); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
967 charset_id = XINT (charset); |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
968 if (!CHARSET_DEFINED_P (charset_id)) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
969 error ("Invalid charset ID: %d", XINT (charset)); |
17052 | 970 |
971 if (NILP (code1)) | |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
972 c1 = 0; |
17052 | 973 else |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
974 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
975 CHECK_NUMBER (code1); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
976 c1 = XINT (code1); |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
977 } |
17052 | 978 if (NILP (code2)) |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
979 c2 = 0; |
17052 | 980 else |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
981 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
982 CHECK_NUMBER (code2); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
983 c2 = XINT (code2); |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
984 } |
17052 | 985 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
986 if (charset_id == CHARSET_ASCII) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
987 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
988 if (c1 < 0 || c1 > 0x7F) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
989 goto invalid_code_posints; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
990 return make_number (c1); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
991 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
992 else if (charset_id == CHARSET_8_BIT_CONTROL) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
993 { |
34761
b4244c3295bb
(Fmake_char_internal): If CHARSET doesn't have a
Kenichi Handa <handa@m17n.org>
parents:
33629
diff
changeset
|
994 if (NILP (code1)) |
b4244c3295bb
(Fmake_char_internal): If CHARSET doesn't have a
Kenichi Handa <handa@m17n.org>
parents:
33629
diff
changeset
|
995 c1 = 0x80; |
b4244c3295bb
(Fmake_char_internal): If CHARSET doesn't have a
Kenichi Handa <handa@m17n.org>
parents:
33629
diff
changeset
|
996 else if (c1 < 0x80 || c1 > 0x9F) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
997 goto invalid_code_posints; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
998 return make_number (c1); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
999 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1000 else if (charset_id == CHARSET_8_BIT_GRAPHIC) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1001 { |
34761
b4244c3295bb
(Fmake_char_internal): If CHARSET doesn't have a
Kenichi Handa <handa@m17n.org>
parents:
33629
diff
changeset
|
1002 if (NILP (code1)) |
b4244c3295bb
(Fmake_char_internal): If CHARSET doesn't have a
Kenichi Handa <handa@m17n.org>
parents:
33629
diff
changeset
|
1003 c1 = 0xA0; |
b4244c3295bb
(Fmake_char_internal): If CHARSET doesn't have a
Kenichi Handa <handa@m17n.org>
parents:
33629
diff
changeset
|
1004 else if (c1 < 0xA0 || c1 > 0xFF) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1005 goto invalid_code_posints; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1006 return make_number (c1); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1007 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1008 else if (c1 < 0 || c1 > 0xFF || c2 < 0 || c2 > 0xFF) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1009 goto invalid_code_posints; |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1010 c1 &= 0x7F; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1011 c2 &= 0x7F; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1012 if (c1 == 0 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1013 ? c2 != 0 |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1014 : (c2 == 0 |
28515
75bd73426842
* charset.c (Fmake_char_internal): CHAR_COMPONENTS_VALID_P takes a
Ken Raeburn <raeburn@raeburn.org>
parents:
27791
diff
changeset
|
1015 ? !CHAR_COMPONENTS_VALID_P (charset_id, c1, 0x20) |
75bd73426842
* charset.c (Fmake_char_internal): CHAR_COMPONENTS_VALID_P takes a
Ken Raeburn <raeburn@raeburn.org>
parents:
27791
diff
changeset
|
1016 : !CHAR_COMPONENTS_VALID_P (charset_id, c1, c2))) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1017 goto invalid_code_posints; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1018 return make_number (MAKE_CHAR (charset_id, c1, c2)); |
17052 | 1019 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1020 invalid_code_posints: |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1021 error ("Invalid code points for charset ID %d: %d %d", charset_id, c1, c2); |
17052 | 1022 } |
1023 | |
1024 DEFUN ("split-char", Fsplit_char, Ssplit_char, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1025 doc: /* Return list of charset and one or two position-codes of CHAR. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1026 If CHAR is invalid as a character code, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1027 return a list of symbol `unknown' and CHAR. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1028 (ch) |
17052 | 1029 Lisp_Object ch; |
1030 { | |
23883 | 1031 int c, charset, c1, c2; |
17052 | 1032 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1033 CHECK_NUMBER (ch); |
23883 | 1034 c = XFASTINT (ch); |
1035 if (!CHAR_VALID_P (c, 1)) | |
1036 return Fcons (Qunknown, Fcons (ch, Qnil)); | |
17052 | 1037 SPLIT_CHAR (XFASTINT (ch), charset, c1, c2); |
17322
a7d9b8e167ca
(non_ascii_char_to_string, update_charset_table,
Kenichi Handa <handa@m17n.org>
parents:
17186
diff
changeset
|
1038 return (c2 >= 0 |
17052 | 1039 ? Fcons (CHARSET_SYMBOL (charset), |
1040 Fcons (make_number (c1), Fcons (make_number (c2), Qnil))) | |
1041 : Fcons (CHARSET_SYMBOL (charset), Fcons (make_number (c1), Qnil))); | |
1042 } | |
1043 | |
1044 DEFUN ("char-charset", Fchar_charset, Schar_charset, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1045 doc: /* Return charset of CHAR. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1046 (ch) |
17052 | 1047 Lisp_Object ch; |
1048 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1049 CHECK_NUMBER (ch); |
17052 | 1050 |
1051 return CHARSET_SYMBOL (CHAR_CHARSET (XINT (ch))); | |
1052 } | |
1053 | |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1054 DEFUN ("charset-after", Fcharset_after, Scharset_after, 0, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1055 doc: /* Return charset of a character in the current buffer at position POS. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1056 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
|
1057 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
|
1058 (pos) |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1059 Lisp_Object pos; |
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1060 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1061 Lisp_Object ch; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1062 int charset; |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1063 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1064 ch = Fchar_after (pos); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1065 if (! INTEGERP (ch)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1066 return ch; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1067 charset = CHAR_CHARSET (XINT (ch)); |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1068 return CHARSET_SYMBOL (charset); |
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1069 } |
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1070 |
17052 | 1071 DEFUN ("iso-charset", Fiso_charset, Siso_charset, 3, 3, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1072 doc: /* Return charset of ISO's specification 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
|
1073 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1074 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
|
1075 by their DIMENSION, CHARS, and FINAL-CHAR, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1076 where as Emacs distinguishes them by charset symbol. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1077 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
|
1078 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
|
1079 (dimension, chars, final_char) |
17052 | 1080 Lisp_Object dimension, chars, final_char; |
1081 { | |
1082 int charset; | |
1083 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1084 CHECK_NUMBER (dimension); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1085 CHECK_NUMBER (chars); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1086 CHECK_NUMBER (final_char); |
17052 | 1087 |
1088 if ((charset = ISO_CHARSET_TABLE (dimension, chars, final_char)) < 0) | |
1089 return Qnil; | |
1090 return CHARSET_SYMBOL (charset); | |
1091 } | |
1092 | |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1093 /* If GENERICP is nonzero, return nonzero iff C is a valid normal or |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1094 generic character. If GENERICP is zero, return nonzero iff C is a |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1095 valid normal character. Do not call this function directly, |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1096 instead use macro CHAR_VALID_P. */ |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1097 int |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1098 char_valid_p (c, genericp) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1099 int c, genericp; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1100 { |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1101 int charset, c1, c2; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1102 |
31175
738330ba020f
(char_to_string): Check the character validity.
Kenichi Handa <handa@m17n.org>
parents:
30673
diff
changeset
|
1103 if (c < 0 || c >= MAX_CHAR) |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1104 return 0; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1105 if (SINGLE_BYTE_CHAR_P (c)) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1106 return 1; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1107 SPLIT_CHAR (c, charset, c1, c2); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1108 if (genericp) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1109 { |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1110 if (c1) |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1111 { |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1112 if (c2 <= 0) c2 = 0x20; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1113 } |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1114 else |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1115 { |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1116 if (c2 <= 0) c1 = c2 = 0x20; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1117 } |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1118 } |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1119 return (CHARSET_DEFINED_P (charset) |
25584 | 1120 && CHAR_COMPONENTS_VALID_P (charset, c1, c2)); |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1121 } |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1122 |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1123 DEFUN ("char-valid-p", Fchar_valid_p, Schar_valid_p, 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
|
1124 doc: /* Return t if OBJECT is a valid normal character. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1125 If optional arg GENERICP is non-nil, also return t if OBJECT is |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1126 a valid generic character. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1127 (object, genericp) |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1128 Lisp_Object object, genericp; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1129 { |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1130 if (! NATNUMP (object)) |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1131 return Qnil; |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1132 return (CHAR_VALID_P (XFASTINT (object), !NILP (genericp)) ? Qt : Qnil); |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1133 } |
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1134 |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1135 DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte, |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1136 Sunibyte_char_to_multibyte, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1137 doc: /* Convert the unibyte character CH to multibyte character. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1138 The conversion is done based on `nonascii-translation-table' (which see) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1139 or `nonascii-insert-offset' (which see). */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1140 (ch) |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1141 Lisp_Object ch; |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1142 { |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1143 int c; |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1144 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1145 CHECK_NUMBER (ch); |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1146 c = XINT (ch); |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1147 if (c < 0 || c >= 0400) |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1148 error ("Invalid unibyte character: %d", c); |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1149 c = unibyte_char_to_multibyte (c); |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1150 if (c < 0) |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1151 error ("Can't convert to multibyte character: %d", XINT (ch)); |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1152 return make_number (c); |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1153 } |
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1154 |
23060
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1155 DEFUN ("multibyte-char-to-unibyte", Fmultibyte_char_to_unibyte, |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1156 Smultibyte_char_to_unibyte, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1157 doc: /* Convert the multibyte character CH to unibyte character. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1158 The conversion is done based on `nonascii-translation-table' (which see) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1159 or `nonascii-insert-offset' (which see). */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1160 (ch) |
23060
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1161 Lisp_Object ch; |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1162 { |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1163 int c; |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1164 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1165 CHECK_NUMBER (ch); |
23060
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1166 c = XINT (ch); |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1167 if (! CHAR_VALID_P (c, 0)) |
23060
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1168 error ("Invalid multibyte character: %d", c); |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1169 c = multibyte_char_to_unibyte (c, Qnil); |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1170 if (c < 0) |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1171 error ("Can't convert to unibyte character: %d", XINT (ch)); |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1172 return make_number (c); |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1173 } |
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1174 |
17052 | 1175 DEFUN ("char-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1176 doc: /* Return 1 regardless of the argument CHAR. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1177 This is now an obsolete function. We keep it just for backward compatibility. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1178 (ch) |
17052 | 1179 Lisp_Object ch; |
1180 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1181 CHECK_NUMBER (ch); |
23131
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1182 return make_number (1); |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1183 } |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1184 |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1185 /* Return how many bytes C will occupy in a multibyte buffer. |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1186 Don't call this function directly, instead use macro CHAR_BYTES. */ |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1187 int |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1188 char_bytes (c) |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1189 int c; |
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1190 { |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
1191 int charset; |
23131
f7e486faa1ad
(Fchar_bytes): Now always return 1.
Kenichi Handa <handa@m17n.org>
parents:
23060
diff
changeset
|
1192 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1193 if (ASCII_BYTE_P (c) || (c & ~((1 << CHARACTERBITS) -1))) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1194 return 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1195 if (SINGLE_BYTE_CHAR_P (c) && c >= 0xA0) |
23767
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
1196 return 1; |
1dfb6d38354f
(non_ascii_char_to_string): If C has modifier bits,
Kenichi Handa <handa@m17n.org>
parents:
23720
diff
changeset
|
1197 |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
1198 charset = CHAR_CHARSET (c); |
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
1199 return (CHARSET_DEFINED_P (charset) ? CHARSET_BYTES (charset) : 1); |
17052 | 1200 } |
1201 | |
1202 /* Return the width of character of which multi-byte form starts with | |
1203 C. The width is measured by how many columns occupied on the | |
1204 screen when displayed in the current buffer. */ | |
1205 | |
1206 #define ONE_BYTE_CHAR_WIDTH(c) \ | |
1207 (c < 0x20 \ | |
1208 ? (c == '\t' \ | |
17366
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
1209 ? XFASTINT (current_buffer->tab_width) \ |
17052 | 1210 : (c == '\n' ? 0 : (NILP (current_buffer->ctl_arrow) ? 4 : 2))) \ |
1211 : (c < 0x7f \ | |
1212 ? 1 \ | |
1213 : (c == 0x7F \ | |
1214 ? (NILP (current_buffer->ctl_arrow) ? 4 : 2) \ | |
1215 : ((! NILP (current_buffer->enable_multibyte_characters) \ | |
1216 && BASE_LEADING_CODE_P (c)) \ | |
1217 ? WIDTH_BY_CHAR_HEAD (c) \ | |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
1218 : 4)))) |
17052 | 1219 |
1220 DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1221 doc: /* Return width of CHAR when displayed in the current buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1222 The width is measured by how many columns it occupies on the screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1223 Tab is taken to occupy `tab-width' columns. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1224 (ch) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1225 Lisp_Object ch; |
17052 | 1226 { |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1227 Lisp_Object val, disp; |
17052 | 1228 int c; |
18537
6a726658dfa9
(Fchar_width): Check if the current buffer has display
Kenichi Handa <handa@m17n.org>
parents:
18341
diff
changeset
|
1229 struct Lisp_Char_Table *dp = buffer_display_table (); |
17052 | 1230 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1231 CHECK_NUMBER (ch); |
17052 | 1232 |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1233 c = XINT (ch); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1234 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1235 /* Get the way the display table would display it. */ |
18537
6a726658dfa9
(Fchar_width): Check if the current buffer has display
Kenichi Handa <handa@m17n.org>
parents:
18341
diff
changeset
|
1236 disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil; |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1237 |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1238 if (VECTORP (disp)) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1239 XSETINT (val, XVECTOR (disp)->size); |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1240 else if (SINGLE_BYTE_CHAR_P (c)) |
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1241 XSETINT (val, ONE_BYTE_CHAR_WIDTH (c)); |
17052 | 1242 else |
1243 { | |
1244 int charset = CHAR_CHARSET (c); | |
1245 | |
1246 XSETFASTINT (val, CHARSET_WIDTH (charset)); | |
1247 } | |
1248 return val; | |
1249 } | |
1250 | |
1251 /* Return width of string STR of length LEN when displayed in the | |
1252 current buffer. The width is measured by how many columns it | |
1253 occupies on the screen. */ | |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1254 |
17052 | 1255 int |
1256 strwidth (str, len) | |
1257 unsigned char *str; | |
1258 int len; | |
1259 { | |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1260 return c_string_width (str, len, -1, NULL, NULL); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1261 } |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1262 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1263 /* Return width of string STR of length LEN when displayed in the |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1264 current buffer. The width is measured by how many columns it |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1265 occupies on the screen. If PRECISION > 0, return the width of |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1266 longest substring that doesn't exceed PRECISION, and set number of |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1267 characters and bytes of the substring in *NCHARS and *NBYTES |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1268 respectively. */ |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1269 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1270 int |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1271 c_string_width (str, len, precision, nchars, nbytes) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1272 unsigned char *str; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1273 int precision, *nchars, *nbytes; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1274 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1275 int i = 0, i_byte = 0; |
17052 | 1276 int width = 0; |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1277 int chars; |
20362
67bcb068070c
(strwidth): Remove extra argument to buffer_display_table.
Kenichi Handa <handa@m17n.org>
parents:
20228
diff
changeset
|
1278 struct Lisp_Char_Table *dp = buffer_display_table (); |
17052 | 1279 |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1280 while (i_byte < len) |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1281 { |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1282 int bytes, thiswidth; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1283 Lisp_Object val; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1284 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1285 if (dp) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1286 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1287 int c = STRING_CHAR_AND_LENGTH (str + i_byte, len - i_byte, bytes); |
17052 | 1288 |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1289 chars = 1; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1290 val = DISP_CHAR_VECTOR (dp, c); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1291 if (VECTORP (val)) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1292 thiswidth = XVECTOR (val)->size; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1293 else |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1294 thiswidth = ONE_BYTE_CHAR_WIDTH (str[i_byte]); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1295 } |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1296 else |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1297 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1298 chars = 1; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1299 PARSE_MULTIBYTE_SEQ (str + i_byte, len - i_byte, bytes); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1300 thiswidth = ONE_BYTE_CHAR_WIDTH (str[i_byte]); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1301 } |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1302 |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1303 if (precision > 0 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1304 && (width + thiswidth > precision)) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1305 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1306 *nchars = i; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1307 *nbytes = i_byte; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1308 return width; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1309 } |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1310 i++; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1311 i_byte += bytes; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1312 width += thiswidth; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1313 } |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1314 |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1315 if (precision > 0) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1316 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1317 *nchars = i; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1318 *nbytes = i_byte; |
17818
76c6740bd736
(strwidth, Fchar_width): Handle display table.
Richard M. Stallman <rms@gnu.org>
parents:
17727
diff
changeset
|
1319 } |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1320 |
17052 | 1321 return width; |
1322 } | |
1323 | |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1324 /* Return width of Lisp string STRING when displayed in the current |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1325 buffer. The width is measured by how many columns it occupies on |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1326 the screen while paying attention to compositions. If PRECISION > |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1327 0, return the width of longest substring that doesn't exceed |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1328 PRECISION, and set number of characters and bytes of the substring |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1329 in *NCHARS and *NBYTES respectively. */ |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1330 |
31420 | 1331 int |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1332 lisp_string_width (string, precision, nchars, nbytes) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1333 Lisp_Object string; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1334 int precision, *nchars, *nbytes; |
31420 | 1335 { |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1336 int len = XSTRING (string)->size; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1337 int len_byte = STRING_BYTES (XSTRING (string)); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1338 unsigned char *str = XSTRING (string)->data; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1339 int i = 0, i_byte = 0; |
31420 | 1340 int width = 0; |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1341 struct Lisp_Char_Table *dp = buffer_display_table (); |
31420 | 1342 |
1343 while (i < len) | |
1344 { | |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1345 int chars, bytes, thiswidth; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1346 Lisp_Object val; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1347 int cmp_id; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1348 int ignore, end; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1349 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1350 if (find_composition (i, -1, &ignore, &end, &val, string) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1351 && ((cmp_id = get_composition_id (i, i_byte, end - i, val, string)) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1352 >= 0)) |
31420 | 1353 { |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1354 thiswidth = composition_table[cmp_id]->width; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1355 chars = end - i; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1356 bytes = string_char_to_byte (string, end) - i_byte; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1357 } |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1358 else if (dp) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1359 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1360 int c = STRING_CHAR_AND_LENGTH (str + i_byte, len - i_byte, bytes); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1361 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1362 chars = 1; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1363 val = DISP_CHAR_VECTOR (dp, c); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1364 if (VECTORP (val)) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1365 thiswidth = XVECTOR (val)->size; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1366 else |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1367 thiswidth = ONE_BYTE_CHAR_WIDTH (str[i_byte]); |
31420 | 1368 } |
1369 else | |
1370 { | |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1371 chars = 1; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1372 PARSE_MULTIBYTE_SEQ (str + i_byte, len_byte - i_byte, bytes); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1373 thiswidth = ONE_BYTE_CHAR_WIDTH (str[i_byte]); |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1374 } |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1375 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1376 if (precision > 0 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1377 && (width + thiswidth > precision)) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1378 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1379 *nchars = i; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1380 *nbytes = i_byte; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1381 return width; |
31420 | 1382 } |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1383 i += chars; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1384 i_byte += bytes; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1385 width += thiswidth; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1386 } |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1387 |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1388 if (precision > 0) |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1389 { |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1390 *nchars = i; |
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1391 *nbytes = i_byte; |
31420 | 1392 } |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1393 |
31420 | 1394 return width; |
1395 } | |
1396 | |
17052 | 1397 DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1398 doc: /* Return width of STRING when displayed in the current buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1399 Width is measured by how many columns it occupies on the screen. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1400 When calculating width of a multibyte character in STRING, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1401 only the base leading-code is considered; the validity of |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1402 the following bytes is not checked. Tabs in STRING are always |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1403 taken to occupy `tab-width' columns. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1404 (str) |
17052 | 1405 Lisp_Object str; |
1406 { | |
1407 Lisp_Object val; | |
1408 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1409 CHECK_STRING (str); |
35407
916718dc2950
(strwidth): Use c_string_width.
Kenichi Handa <handa@m17n.org>
parents:
34985
diff
changeset
|
1410 XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL)); |
17052 | 1411 return val; |
1412 } | |
1413 | |
1414 DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1415 doc: /* Return the direction of CHAR. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1416 The returned value is 0 for left-to-right and 1 for right-to-left. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1417 (ch) |
17052 | 1418 Lisp_Object ch; |
1419 { | |
1420 int charset; | |
1421 | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1422 CHECK_NUMBER (ch); |
17052 | 1423 charset = CHAR_CHARSET (XFASTINT (ch)); |
1424 if (!CHARSET_DEFINED_P (charset)) | |
20933
5ceea9d50194
(invalid_character): New function.
Kenichi Handa <handa@m17n.org>
parents:
20890
diff
changeset
|
1425 invalid_character (XINT (ch)); |
17052 | 1426 return CHARSET_TABLE_INFO (charset, CHARSET_DIRECTION_IDX); |
1427 } | |
1428 | |
19415
309b9a0d8a45
(Fchars_in_region): Renamed form Fcount_chars_region.
Kenichi Handa <handa@m17n.org>
parents:
19384
diff
changeset
|
1429 DEFUN ("chars-in-region", Fchars_in_region, Schars_in_region, 2, 2, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1430 doc: /* Return number of characters 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
|
1431 (beg, end) |
19384 | 1432 Lisp_Object beg, end; |
1433 { | |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1434 int from, to; |
19384 | 1435 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1436 CHECK_NUMBER_COERCE_MARKER (beg); |
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1437 CHECK_NUMBER_COERCE_MARKER (end); |
22739
f0c8af6c2dfd
(Fchars_in_region): Coerce markers.
Richard M. Stallman <rms@gnu.org>
parents:
22703
diff
changeset
|
1438 |
19384 | 1439 from = min (XFASTINT (beg), XFASTINT (end)); |
19444
752afe97eaa4
(Fchars_in_region): Fix gap handling.
Richard M. Stallman <rms@gnu.org>
parents:
19415
diff
changeset
|
1440 to = max (XFASTINT (beg), XFASTINT (end)); |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1441 |
21519
9b26f9300d41
(Fchars_in_region): Fix mixing of Lisp_Object and int.
Andreas Schwab <schwab@suse.de>
parents:
21514
diff
changeset
|
1442 return make_number (to - from); |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1443 } |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1444 |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1445 /* Return the number of characters in the NBYTES bytes at PTR. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1446 This works by looking at the contents and checking for multibyte sequences. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1447 However, if the current buffer has enable-multibyte-characters = nil, |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1448 we treat each byte as a character. */ |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1449 |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1450 int |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1451 chars_in_text (ptr, nbytes) |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1452 unsigned char *ptr; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1453 int nbytes; |
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1454 { |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1455 /* current_buffer is null at early stages of Emacs initialization. */ |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1456 if (current_buffer == 0 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1457 || NILP (current_buffer->enable_multibyte_characters)) |
20534
066251bcf9f7
(Fchars_in_string): Update call to CHAR_HEAD_P.
Richard M. Stallman <rms@gnu.org>
parents:
20435
diff
changeset
|
1458 return nbytes; |
20188
d4ad4463384d
(Fchars_in_string): Pay attention to
Kenichi Handa <handa@m17n.org>
parents:
20152
diff
changeset
|
1459 |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1460 return multibyte_chars_in_text (ptr, nbytes); |
19384 | 1461 } |
1462 | |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1463 /* Return the number of characters in the NBYTES bytes at PTR. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1464 This works by looking at the contents and checking for multibyte sequences. |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1465 It ignores enable-multibyte-characters. */ |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1466 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1467 int |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1468 multibyte_chars_in_text (ptr, nbytes) |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1469 unsigned char *ptr; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1470 int nbytes; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1471 { |
25506
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1472 unsigned char *endp; |
ba0ad349e792
(SPLIT_COMPOSITE_SEQ): New macro.
Kenichi Handa <handa@m17n.org>
parents:
25250
diff
changeset
|
1473 int chars, bytes; |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1474 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1475 endp = ptr + nbytes; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1476 chars = 0; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1477 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1478 while (ptr < endp) |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1479 { |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1480 PARSE_MULTIBYTE_SEQ (ptr, endp - ptr, bytes); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1481 ptr += bytes; |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1482 chars++; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1483 } |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1484 |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1485 return chars; |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1486 } |
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1487 |
35478 | 1488 /* Parse unibyte text at STR of LEN bytes as multibyte text, and |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1489 count the numbers of characters and bytes in it. On counting |
35478 | 1490 bytes, pay attention to the fact that 8-bit characters in the range |
1491 0x80..0x9F are represented by 2 bytes in multibyte text. */ | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1492 void |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1493 parse_str_as_multibyte (str, len, nchars, nbytes) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1494 unsigned char *str; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1495 int len, *nchars, *nbytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1496 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1497 unsigned char *endp = str + len; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1498 int n, chars = 0, bytes = 0; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1499 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1500 while (str < endp) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1501 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1502 if (UNIBYTE_STR_AS_MULTIBYTE_P (str, endp - str, n)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1503 str += n, bytes += n; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1504 else |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1505 str++, bytes += 2; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1506 chars++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1507 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1508 *nchars = chars; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1509 *nbytes = bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1510 return; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1511 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1512 |
35478 | 1513 /* Arrange unibyte text at STR of NBYTES bytes as multibyte text. |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1514 It actually converts only 8-bit characters in the range 0x80..0x9F |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1515 that don't contruct multibyte characters to multibyte forms. If |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1516 NCHARS is nonzero, set *NCHARS to the number of characters in the |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1517 text. It is assured that we can use LEN bytes at STR as a work |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1518 area and that is enough. Return the number of bytes of the |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1519 resulting text. */ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1520 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1521 int |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1522 str_as_multibyte (str, len, nbytes, nchars) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1523 unsigned char *str; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1524 int len, nbytes, *nchars; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1525 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1526 unsigned char *p = str, *endp = str + nbytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1527 unsigned char *to; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1528 int chars = 0; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1529 int n; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1530 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1531 while (p < endp && UNIBYTE_STR_AS_MULTIBYTE_P (p, endp - p, n)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1532 p += n, chars++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1533 if (nchars) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1534 *nchars = chars; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1535 if (p == endp) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1536 return nbytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1537 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1538 to = p; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1539 nbytes = endp - p; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1540 endp = str + len; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1541 safe_bcopy (p, endp - nbytes, nbytes); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1542 p = endp - nbytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1543 while (p < endp) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1544 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1545 if (UNIBYTE_STR_AS_MULTIBYTE_P (p, endp - p, n)) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1546 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1547 while (n--) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1548 *to++ = *p++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1549 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1550 else |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1551 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1552 *to++ = LEADING_CODE_8_BIT_CONTROL; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1553 *to++ = *p++ + 0x20; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1554 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1555 chars++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1556 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1557 if (nchars) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1558 *nchars = chars; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1559 return (to - str); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1560 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1561 |
35950
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1562 /* Parse unibyte string at STR of LEN bytes, and return the number of |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1563 bytes it may ocupy when converted to multibyte string by |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1564 `str_to_multibyte'. */ |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1565 |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1566 int |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1567 parse_str_to_multibyte (str, len) |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1568 unsigned char *str; |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1569 int len; |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1570 { |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1571 unsigned char *endp = str + len; |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1572 int bytes; |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1573 |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1574 for (bytes = 0; str < endp; str++) |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1575 bytes += (*str < 0x80 || *str >= 0xA0) ? 1 : 2; |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1576 return bytes; |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1577 } |
d2c753cf5c34
(parse_str_to_multibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
35478
diff
changeset
|
1578 |
35478 | 1579 /* Convert unibyte text at STR of NBYTES bytes to multibyte text |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1580 that contains the same single-byte characters. It actually |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1581 converts all 8-bit characters to multibyte forms. It is assured |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1582 that we can use LEN bytes at STR as a work area and that is |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1583 enough. */ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1584 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1585 int |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1586 str_to_multibyte (str, len, bytes) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1587 unsigned char *str; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1588 int len, bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1589 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1590 unsigned char *p = str, *endp = str + bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1591 unsigned char *to; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1592 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1593 while (p < endp && (*p < 0x80 || *p >= 0xA0)) p++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1594 if (p == endp) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1595 return bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1596 to = p; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1597 bytes = endp - p; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1598 endp = str + len; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1599 safe_bcopy (p, endp - bytes, bytes); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1600 p = endp - bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1601 while (p < endp) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1602 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1603 if (*p < 0x80 || *p >= 0xA0) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1604 *to++ = *p++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1605 else |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1606 *to++ = LEADING_CODE_8_BIT_CONTROL, *to++ = *p++ + 0x20; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1607 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1608 return (to - str); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1609 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1610 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1611 /* Arrange multibyte text at STR of LEN bytes as a unibyte text. It |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1612 actually converts only 8-bit characters in the range 0x80..0x9F to |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1613 unibyte forms. */ |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1614 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1615 int |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1616 str_as_unibyte (str, bytes) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1617 unsigned char *str; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1618 int bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1619 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1620 unsigned char *p = str, *endp = str + bytes; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1621 unsigned char *to = str; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1622 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1623 while (p < endp && *p != LEADING_CODE_8_BIT_CONTROL) p++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1624 to = p; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1625 while (p < endp) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1626 { |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1627 if (*p == LEADING_CODE_8_BIT_CONTROL) |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1628 *to++ = *(p + 1) - 0x20, p += 2; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1629 else |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1630 *to++ = *p++; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1631 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1632 return (to - str); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1633 } |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1634 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1635 |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1636 DEFUN ("string", Fstring, Sstring, 1, MANY, 0, |
40115
78a7615cd863
(Fstring): Add usage: string to doc string.
Miles Bader <miles@gnu.org>
parents:
40103
diff
changeset
|
1637 doc: /* Concatenate all the argument characters and make the result a string. |
78a7615cd863
(Fstring): Add usage: string to doc string.
Miles Bader <miles@gnu.org>
parents:
40103
diff
changeset
|
1638 usage: (string &rest CHARACTERS) */) |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1639 (n, args) |
17366
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
1640 int n; |
17052 | 1641 Lisp_Object *args; |
1642 { | |
17366
f7809ff2c65f
(ONE_BYTE_CHAR_WIDTH, Fconcat_chars): Don't use Lisp_Object as integer.
Karl Heuer <kwzh@gnu.org>
parents:
17322
diff
changeset
|
1643 int i; |
26844
9e9a0735c824
In this entry, just `Modified' means that codes for a
Kenichi Handa <handa@m17n.org>
parents:
26632
diff
changeset
|
1644 unsigned char *buf = (unsigned char *) alloca (MAX_MULTIBYTE_LENGTH * n); |
17052 | 1645 unsigned char *p = buf; |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1646 int c; |
35997
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1647 int multibyte = 0; |
17052 | 1648 |
1649 for (i = 0; i < n; i++) | |
1650 { | |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
40115
diff
changeset
|
1651 CHECK_NUMBER (args[i]); |
35997
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1652 if (!multibyte && !SINGLE_BYTE_CHAR_P (XFASTINT (args[i]))) |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1653 multibyte = 1; |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1654 } |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1655 |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1656 for (i = 0; i < n; i++) |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1657 { |
17052 | 1658 c = XINT (args[i]); |
35997
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1659 if (multibyte) |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1660 p += CHAR_STRING (c, p); |
d04b544d2a18
(Fstring): If all arguments are less than 256, return a unibyte
Kenichi Handa <handa@m17n.org>
parents:
35950
diff
changeset
|
1661 else |
35999
6b1e74f1fcce
2001-02-09 ShengHuo ZHU <zsh@cs.rochester.edu>
ShengHuo ZHU <zsh@cs.rochester.edu>
parents:
35997
diff
changeset
|
1662 *p++ = c; |
17052 | 1663 } |
1664 | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1665 return make_string_from_bytes (buf, n, p - buf); |
17052 | 1666 } |
1667 | |
1668 #endif /* emacs */ | |
1669 | |
21514 | 1670 int |
17052 | 1671 charset_id_internal (charset_name) |
1672 char *charset_name; | |
1673 { | |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
1674 Lisp_Object val; |
17052 | 1675 |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
1676 val= Fget (intern (charset_name), Qcharset); |
17052 | 1677 if (!VECTORP (val)) |
1678 error ("Charset %s is not defined", charset_name); | |
1679 | |
1680 return (XINT (XVECTOR (val)->contents[0])); | |
1681 } | |
1682 | |
1683 DEFUN ("setup-special-charsets", Fsetup_special_charsets, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1684 Ssetup_special_charsets, 0, 0, 0, doc: /* Internal use only. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1685 () |
17052 | 1686 { |
1687 charset_latin_iso8859_1 = charset_id_internal ("latin-iso8859-1"); | |
1688 charset_jisx0208_1978 = charset_id_internal ("japanese-jisx0208-1978"); | |
1689 charset_jisx0208 = charset_id_internal ("japanese-jisx0208"); | |
1690 charset_katakana_jisx0201 = charset_id_internal ("katakana-jisx0201"); | |
1691 charset_latin_jisx0201 = charset_id_internal ("latin-jisx0201"); | |
1692 charset_big5_1 = charset_id_internal ("chinese-big5-1"); | |
1693 charset_big5_2 = charset_id_internal ("chinese-big5-2"); | |
1694 return Qnil; | |
1695 } | |
1696 | |
21514 | 1697 void |
17052 | 1698 init_charset_once () |
1699 { | |
1700 int i, j, k; | |
1701 | |
1702 staticpro (&Vcharset_table); | |
1703 staticpro (&Vcharset_symbol_table); | |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1704 staticpro (&Vgeneric_character_list); |
17052 | 1705 |
1706 /* This has to be done here, before we call Fmake_char_table. */ | |
1707 Qcharset_table = intern ("charset-table"); | |
1708 staticpro (&Qcharset_table); | |
1709 | |
1710 /* Intern this now in case it isn't already done. | |
1711 Setting this variable twice is harmless. | |
1712 But don't staticpro it here--that is done in alloc.c. */ | |
1713 Qchar_table_extra_slots = intern ("char-table-extra-slots"); | |
1714 | |
1715 /* Now we are ready to set up this property, so we can | |
1716 create the charset table. */ | |
1717 Fput (Qcharset_table, Qchar_table_extra_slots, make_number (0)); | |
1718 Vcharset_table = Fmake_char_table (Qcharset_table, Qnil); | |
1719 | |
23883 | 1720 Qunknown = intern ("unknown"); |
1721 staticpro (&Qunknown); | |
1722 Vcharset_symbol_table = Fmake_vector (make_number (MAX_CHARSET + 1), | |
1723 Qunknown); | |
17052 | 1724 |
1725 /* Setup tables. */ | |
1726 for (i = 0; i < 2; i++) | |
1727 for (j = 0; j < 2; j++) | |
1728 for (k = 0; k < 128; k++) | |
1729 iso_charset_table [i][j][k] = -1; | |
1730 | |
23656
031653c4634a
(init_charset_once): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents:
23654
diff
changeset
|
1731 for (i = 0; i < 256; i++) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1732 bytes_by_char_head[i] = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1733 bytes_by_char_head[LEADING_CODE_PRIVATE_11] = 3; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1734 bytes_by_char_head[LEADING_CODE_PRIVATE_12] = 3; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1735 bytes_by_char_head[LEADING_CODE_PRIVATE_21] = 4; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1736 bytes_by_char_head[LEADING_CODE_PRIVATE_22] = 4; |
17052 | 1737 |
1738 for (i = 0; i < 128; i++) | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1739 width_by_char_head[i] = 1; |
17052 | 1740 for (; i < 256; i++) |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1741 width_by_char_head[i] = 4; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1742 width_by_char_head[LEADING_CODE_PRIVATE_11] = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1743 width_by_char_head[LEADING_CODE_PRIVATE_12] = 2; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1744 width_by_char_head[LEADING_CODE_PRIVATE_21] = 1; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1745 width_by_char_head[LEADING_CODE_PRIVATE_22] = 2; |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1746 |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1747 { |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
1748 Lisp_Object val; |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1749 |
22927
209acf11198c
(multibyte_char_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents:
22774
diff
changeset
|
1750 val = Qnil; |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1751 for (i = 0x81; i < 0x90; i++) |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1752 val = Fcons (make_number ((i - 0x70) << 7), val); |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1753 for (; i < 0x9A; i++) |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1754 val = Fcons (make_number ((i - 0x8F) << 14), val); |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1755 for (i = 0xA0; i < 0xF0; i++) |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1756 val = Fcons (make_number ((i - 0x70) << 7), val); |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1757 for (; i < 0xFF; i++) |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1758 val = Fcons (make_number ((i - 0xE0) << 14), val); |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1759 Vgeneric_character_list = Fnreverse (val); |
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1760 } |
23154
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
1761 |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
1762 nonascii_insert_offset = 0; |
a9cbf64603ca
(unibyte_char_to_multibyte):
Kenichi Handa <handa@m17n.org>
parents:
23140
diff
changeset
|
1763 Vnonascii_translation_table = Qnil; |
17052 | 1764 } |
1765 | |
1766 #ifdef emacs | |
1767 | |
21514 | 1768 void |
17052 | 1769 syms_of_charset () |
1770 { | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1771 Qcharset = intern ("charset"); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1772 staticpro (&Qcharset); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1773 |
17052 | 1774 Qascii = intern ("ascii"); |
1775 staticpro (&Qascii); | |
1776 | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1777 Qeight_bit_control = intern ("eight-bit-control"); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1778 staticpro (&Qeight_bit_control); |
17052 | 1779 |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1780 Qeight_bit_graphic = intern ("eight-bit-graphic"); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1781 staticpro (&Qeight_bit_graphic); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1782 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1783 /* Define special charsets ascii, eight-bit-control, and |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1784 eight-bit-graphic. */ |
17052 | 1785 update_charset_table (make_number (CHARSET_ASCII), |
1786 make_number (1), make_number (94), | |
1787 make_number (1), | |
1788 make_number (0), | |
1789 make_number ('B'), | |
1790 make_number (0), | |
1791 build_string ("ASCII"), | |
29139
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
1792 Qnil, /* same as above */ |
17052 | 1793 build_string ("ASCII (ISO646 IRV)")); |
1794 CHARSET_SYMBOL (CHARSET_ASCII) = Qascii; | |
1795 Fput (Qascii, Qcharset, CHARSET_TABLE_ENTRY (CHARSET_ASCII)); | |
1796 | |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1797 update_charset_table (make_number (CHARSET_8_BIT_CONTROL), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1798 make_number (1), make_number (96), |
29269
452835795e0f
(syms_of_charset): Revert previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
29257
diff
changeset
|
1799 make_number (4), |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1800 make_number (0), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1801 make_number (-1), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1802 make_number (-1), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1803 build_string ("8-bit control code (0x80..0x9F)"), |
29139
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
1804 Qnil, /* same as above */ |
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
1805 Qnil); /* same as above */ |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1806 CHARSET_SYMBOL (CHARSET_8_BIT_CONTROL) = Qeight_bit_control; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1807 Fput (Qeight_bit_control, Qcharset, |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1808 CHARSET_TABLE_ENTRY (CHARSET_8_BIT_CONTROL)); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1809 |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1810 update_charset_table (make_number (CHARSET_8_BIT_GRAPHIC), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1811 make_number (1), make_number (96), |
29269
452835795e0f
(syms_of_charset): Revert previous change.
Eli Zaretskii <eliz@gnu.org>
parents:
29257
diff
changeset
|
1812 make_number (4), |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1813 make_number (0), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1814 make_number (-1), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1815 make_number (-1), |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1816 build_string ("8-bit graphic char (0xA0..0xFF)"), |
29139
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
1817 Qnil, /* same as above */ |
c1c227f62493
(update_charset_table): Accept nil in LONG_NAME and
Kenichi Handa <handa@m17n.org>
parents:
29095
diff
changeset
|
1818 Qnil); /* same as above */ |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1819 CHARSET_SYMBOL (CHARSET_8_BIT_GRAPHIC) = Qeight_bit_graphic; |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1820 Fput (Qeight_bit_graphic, Qcharset, |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1821 CHARSET_TABLE_ENTRY (CHARSET_8_BIT_GRAPHIC)); |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1822 |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
1823 Qauto_fill_chars = intern ("auto-fill-chars"); |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
1824 staticpro (&Qauto_fill_chars); |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
1825 Fput (Qauto_fill_chars, Qchar_table_extra_slots, make_number (0)); |
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
1826 |
17052 | 1827 defsubr (&Sdefine_charset); |
22703
15e0119749cf
(Vgeneric_character_list): New variable.
Kenichi Handa <handa@m17n.org>
parents:
22524
diff
changeset
|
1828 defsubr (&Sgeneric_character_list); |
20435
099812ea310f
(Fget_unused_iso_final_char): New function.
Kenichi Handa <handa@m17n.org>
parents:
20362
diff
changeset
|
1829 defsubr (&Sget_unused_iso_final_char); |
17052 | 1830 defsubr (&Sdeclare_equiv_charset); |
1831 defsubr (&Sfind_charset_region); | |
1832 defsubr (&Sfind_charset_string); | |
1833 defsubr (&Smake_char_internal); | |
1834 defsubr (&Ssplit_char); | |
1835 defsubr (&Schar_charset); | |
21445
4c0b4a1025cd
(string_to_non_ascii_char): Include garbage bytes (if
Kenichi Handa <handa@m17n.org>
parents:
21419
diff
changeset
|
1836 defsubr (&Scharset_after); |
17052 | 1837 defsubr (&Siso_charset); |
20152
9a3343c36e83
(char_valid_p): New function
Kenichi Handa <handa@m17n.org>
parents:
19983
diff
changeset
|
1838 defsubr (&Schar_valid_p); |
21034
f3128abaf8aa
(DEFAULT_NONASCII_INSERT_OFFSET): Macro definition is
Kenichi Handa <handa@m17n.org>
parents:
20933
diff
changeset
|
1839 defsubr (&Sunibyte_char_to_multibyte); |
23060
5036ee3de0ac
(Fmultibyte_char_to_unibyte): New function.
Richard M. Stallman <rms@gnu.org>
parents:
22927
diff
changeset
|
1840 defsubr (&Smultibyte_char_to_unibyte); |
17052 | 1841 defsubr (&Schar_bytes); |
1842 defsubr (&Schar_width); | |
1843 defsubr (&Sstring_width); | |
1844 defsubr (&Schar_direction); | |
19415
309b9a0d8a45
(Fchars_in_region): Renamed form Fcount_chars_region.
Kenichi Handa <handa@m17n.org>
parents:
19384
diff
changeset
|
1845 defsubr (&Schars_in_region); |
20614
a4800f9842e4
(multibyte_chars_in_text): New function.
Richard M. Stallman <rms@gnu.org>
parents:
20575
diff
changeset
|
1846 defsubr (&Sstring); |
17052 | 1847 defsubr (&Ssetup_special_charsets); |
1848 | |
1849 DEFVAR_LISP ("charset-list", &Vcharset_list, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1850 doc: /* List of charsets ever defined. */); |
29003
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1851 Vcharset_list = Fcons (Qascii, Fcons (Qeight_bit_control, |
72eafb39ec65
(Qeight_bit_control, Qeight_bit_graphic): New
Kenichi Handa <handa@m17n.org>
parents:
28818
diff
changeset
|
1852 Fcons (Qeight_bit_graphic, Qnil))); |
17052 | 1853 |
22185
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
1854 DEFVAR_LISP ("translation-table-vector", &Vtranslation_table_vector, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1855 doc: /* Vector of cons cell of a symbol and translation table ever defined. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1856 An ID of a translation table is an index of this vector. */); |
22185
80a2aa51a6e1
Change term "character translation table" to
Kenichi Handa <handa@m17n.org>
parents:
22168
diff
changeset
|
1857 Vtranslation_table_vector = Fmake_vector (make_number (16), Qnil); |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1858 |
17052 | 1859 DEFVAR_INT ("leading-code-private-11", &leading_code_private_11, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1860 doc: /* Leading-code of private TYPE9N charset of column-width 1. */); |
17052 | 1861 leading_code_private_11 = LEADING_CODE_PRIVATE_11; |
1862 | |
1863 DEFVAR_INT ("leading-code-private-12", &leading_code_private_12, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1864 doc: /* Leading-code of private TYPE9N charset of column-width 2. */); |
17052 | 1865 leading_code_private_12 = LEADING_CODE_PRIVATE_12; |
1866 | |
1867 DEFVAR_INT ("leading-code-private-21", &leading_code_private_21, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1868 doc: /* Leading-code of private TYPE9Nx9N charset of column-width 1. */); |
17052 | 1869 leading_code_private_21 = LEADING_CODE_PRIVATE_21; |
1870 | |
1871 DEFVAR_INT ("leading-code-private-22", &leading_code_private_22, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1872 doc: /* Leading-code of private TYPE9Nx9N charset of column-width 2. */); |
17052 | 1873 leading_code_private_22 = LEADING_CODE_PRIVATE_22; |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
1874 |
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
1875 DEFVAR_INT ("nonascii-insert-offset", &nonascii_insert_offset, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1876 doc: /* Offset for converting non-ASCII unibyte codes 0240...0377 to multibyte. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1877 This is used for converting unibyte text to multibyte, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1878 and for inserting character codes specified by number. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1879 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1880 This serves to convert a Latin-1 or similar 8-bit character code |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1881 to the corresponding Emacs multibyte character code. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1882 Typically the value should be (- (make-char CHARSET 0) 128), |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1883 for your choice of character set. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1884 If `nonascii-translation-table' is non-nil, it overrides this variable. */); |
20705
a949dc65fbea
(nonascii_insert_offset): Variable moved from cmds.c.
Richard M. Stallman <rms@gnu.org>
parents:
20636
diff
changeset
|
1885 nonascii_insert_offset = 0; |
20720
f084bb8d535f
(min_composite_char): New variable.
Kenichi Handa <handa@m17n.org>
parents:
20705
diff
changeset
|
1886 |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
1887 DEFVAR_LISP ("nonascii-translation-table", &Vnonascii_translation_table, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1888 doc: /* Translation table to convert non-ASCII unibyte codes to multibyte. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1889 This is used for converting unibyte text to multibyte, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1890 and for inserting character codes specified by number. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1891 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1892 Conversion is performed only when multibyte characters are enabled, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1893 and it serves to convert a Latin-1 or similar 8-bit character code |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1894 to the corresponding Emacs character code. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1895 |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1896 If this is nil, `nonascii-insert-offset' is used instead. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1897 See also the docstring of `make-translation-table'. */); |
22121
6e79a15594ab
Change terms unify/unification to
Kenichi Handa <handa@m17n.org>
parents:
21718
diff
changeset
|
1898 Vnonascii_translation_table = Qnil; |
20890
c7cfd531cf2b
(Vnonascii_translate_table): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
20833
diff
changeset
|
1899 |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
1900 DEFVAR_LISP ("auto-fill-chars", &Vauto_fill_chars, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1901 doc: /* A char-table for characters which invoke auto-filling. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
39682
diff
changeset
|
1902 Such characters have value t in this table. */); |
23489
09201cebfa21
(Vauto_fill_chars, Qauto_fill_chars): New variables.
Kenichi Handa <handa@m17n.org>
parents:
23427
diff
changeset
|
1903 Vauto_fill_chars = Fmake_char_table (Qauto_fill_chars, Qnil); |
23576 | 1904 CHAR_TABLE_SET (Vauto_fill_chars, make_number (' '), Qt); |
1905 CHAR_TABLE_SET (Vauto_fill_chars, make_number ('\n'), Qt); | |
17052 | 1906 } |
1907 | |
1908 #endif /* emacs */ |