annotate src/character.c @ 109748:e2f8226efb99

Fix -Wwrite_strings in general and for Gtk+ specific code. * callproc.c (synch_process_death): Make const. (Fcall_process): Make signame const. * emacs.c (main): Pass char[] to putenv instead of literal. * floatfns.c (matherr): Use a const char* variable for x->name. * font.c (font_open_by_name): Make name const. * font.h (font_open_by_name): Make name const. * gtkutil.c (get_utf8_string): Always return an allocated string. Parameter is const. (create_dialog, xg_create_one_menuitem, create_menus) (xg_item_label_same_p, xg_update_menu_item): Free result from get_utf8_string. (xg_separator_p, xg_item_label_same_p): label is const. * gtkutil.h: Replace widget_value with struct _widget_value. (enum button_type, struct _widget_value): Remove and use the one from keyboard.h. * keyboard.h (_widget_value): Add defined USE_GTK. Replace Boolean with unsigned char and XtPointer with void *. * menu.c (Fx_popup_menu): error_name is const. * menu.h (w32_menu_show, ns_menu_show, xmenu_show): error parameter is const char **. * w32menu.c (w32_menu_show): * nsmenu.m (ns_menu_show): error parameter is const char **. * process.h (synch_process_death): Is const char*. * xmenu.c (Fx_popup_dialog): error_name is const char*. (xmenu_show): error parameter is const char **. pane_string is const char *. (button_names): Is const char *. (xdialog_show): error_name and pane_string is const. * xrdb.c (get_system_app): Make path const and use char *p for non-const char. * xselect.c (Fx_get_atom_name): Use char empty[] instead of literal "". * xsmfns.c (NOSPLASH_OPT): Change to char[]. (smc_save_yourself_CB): Do xstrdup on all ->type and ->name for props. Free them at the end. * xterm.c (emacs_class): New char[] for EMACS_CLASS. (xim_open_dpy, xim_initialize, xim_close_dpy): Use emacs_class. (x_term_init): Use char[] display_opt and name_opt instead of string literal. file is const char*.
author Jan D <jan.h.d@swipnet.se>
date Wed, 11 Aug 2010 14:34:46 +0200
parents 05e7e7c46ff0
children fda36a325177
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1 /* Basic character support.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
2 Copyright (C) 1995, 1997, 1998, 2001 Electrotechnical Laboratory, JAPAN.
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
3 Licensed to the Free Software Foundation.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106185
diff changeset
4 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
91443
541da5d81b14 Update copyright years and GPL version.
Glenn Morris <rgm@gnu.org>
parents: 90942
diff changeset
5 Free Software Foundation, Inc.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106185
diff changeset
6 Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
7 National Institute of Advanced Industrial Science and Technology (AIST)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
8 Registration Number H13PRO009
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
9
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
10 This file is part of GNU Emacs.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
11
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
12 GNU Emacs is free software: you can redistribute it and/or modify
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
13 it under the terms of the GNU General Public License as published by
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
14 the Free Software Foundation, either version 3 of the License, or
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
15 (at your option) any later version.
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
16
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
17 GNU Emacs is distributed in the hope that it will be useful,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
18 but WITHOUT ANY WARRANTY; without even the implied warranty of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
20 GNU General Public License for more details.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
21
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
22 You should have received a copy of the GNU General Public License
94963
8971ddf55736 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94146
diff changeset
23 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
24
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
25 /* At first, see the document in `character.h' to understand the code
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
26 in this file. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
27
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
28 #ifdef emacs
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
29 #include <config.h>
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
30 #endif
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
31
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
32 #include <stdio.h>
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
33
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
34 #ifdef emacs
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
35
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
36 #include <sys/types.h>
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105661
diff changeset
37 #include <setjmp.h>
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
38 #include "lisp.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
39 #include "character.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
40 #include "buffer.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
41 #include "charset.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
42 #include "composite.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
43 #include "disptab.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
44
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
45 #else /* not emacs */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
46
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
47 #include "mulelib.h"
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
48
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
49 #endif /* emacs */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
50
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
51 Lisp_Object Qcharacterp;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
52
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
53 /* Vector of translation table ever defined.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
54 ID of a translation table is used to index this vector. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
55 Lisp_Object Vtranslation_table_vector;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
56
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
57 /* A char-table for characters which may invoke auto-filling. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
58 Lisp_Object Vauto_fill_chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
59
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
60 Lisp_Object Qauto_fill_chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
61
89888
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
62 /* Char-table of information about which character to unify to which
99482
e228d5755549 (Vchar_unify_table): Comment added.
Kenichi Handa <handa@m17n.org>
parents: 99475
diff changeset
63 Unicode character. Mainly used by the macro MAYBE_UNIFY_CHAR. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
64 Lisp_Object Vchar_unify_table;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
65
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
66 /* A char-table. An element is non-nil iff the corresponding
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
67 character has a printable glyph. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
68 Lisp_Object Vprintable_chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
69
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
70 /* A char-table. An elemnent is a column-width of the corresponding
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
71 character. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
72 Lisp_Object Vchar_width_table;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
73
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
74 /* A char-table. An element is a symbol indicating the direction
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
75 property of corresponding character. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
76 Lisp_Object Vchar_direction_table;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
77
89020
b0277093a5f2 (_fetch_multibyte_char_len): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88990
diff changeset
78 /* Variable used locally in the macro FETCH_MULTIBYTE_CHAR. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
79 unsigned char *_fetch_multibyte_char_p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
80
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
81 /* Char table of scripts. */
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
82 Lisp_Object Vchar_script_table;
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
83
90403
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
84 /* Alist of scripts vs representative characters. */
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
85 Lisp_Object Vscript_representative_chars;
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
86
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
87 static Lisp_Object Qchar_script_table;
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
88
97816
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
89 Lisp_Object Vunicode_category_table;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
90
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
91
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
92 /* If character code C has modifier masks, reflect them to the
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
93 character code if possible. Return the resulting code. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
94
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
95 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
96 char_resolve_modifier_mask (int c)
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
97 {
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
98 /* A non-ASCII character can't reflect modifier bits to the code. */
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
99 if (! ASCII_CHAR_P ((c & ~CHAR_MODIFIER_MASK)))
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
100 return c;
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
101
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
102 /* For Meta, Shift, and Control modifiers, we need special care. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
103 if (c & CHAR_SHIFT)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
104 {
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
105 /* Shift modifier is valid only with [A-Za-z]. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
106 if ((c & 0377) >= 'A' && (c & 0377) <= 'Z')
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
107 c &= ~CHAR_SHIFT;
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
108 else if ((c & 0377) >= 'a' && (c & 0377) <= 'z')
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
109 c = (c & ~CHAR_SHIFT) - ('a' - 'A');
92499
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
110 /* Shift modifier for control characters and SPC is ignored. */
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
111 else if ((c & ~CHAR_MODIFIER_MASK) <= 0x20)
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
112 c &= ~CHAR_SHIFT;
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
113 }
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
114 if (c & CHAR_CTL)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
115 {
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
116 /* Simulate the code in lread.c. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
117 /* Allow `\C- ' and `\C-?'. */
92499
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
118 if ((c & 0377) == ' ')
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
119 c &= ~0177 & ~ CHAR_CTL;
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
120 else if ((c & 0377) == '?')
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
121 c = 0177 | (c & ~0177 & ~CHAR_CTL);
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
122 /* ASCII control chars are made from letters (both cases),
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
123 as well as the non-letters within 0100...0137. */
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
124 else if ((c & 0137) >= 0101 && (c & 0137) <= 0132)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
125 c &= (037 | (~0177 & ~CHAR_CTL));
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
126 else if ((c & 0177) >= 0100 && (c & 0177) <= 0137)
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
127 c &= (037 | (~0177 & ~CHAR_CTL));
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
128 }
105688
dfb23d6b0762 (char_resolve_modifier_mask): Don't resolve meta to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
129 #if 0 /* This is outside the scope of this function. (bug#4751) */
92499
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
130 if (c & CHAR_META)
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
131 {
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
132 /* Move the meta bit to the right place for a string. */
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
133 c = (c & ~CHAR_META) | 0x80;
88d1a8b0752e (char_resolve_modifier_mask): Fix previous change.
Kenichi Handa <handa@m17n.org>
parents: 92494
diff changeset
134 }
105688
dfb23d6b0762 (char_resolve_modifier_mask): Don't resolve meta to the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105669
diff changeset
135 #endif
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
136
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
137 return c;
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
138 }
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
139
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
140
89888
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
141 /* Store multibyte form of character C at P. If C has modifier bits,
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
142 handle them appropriately. */
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
143
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
144 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
145 char_string (unsigned int c, unsigned char *p)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
146 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
147 int bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
148
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
149 if (c & CHAR_MODIFIER_MASK)
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
150 {
92483
95fab6416567 (char_resolve_modifier_mask): New function.
Kenichi Handa <handa@m17n.org>
parents: 91807
diff changeset
151 c = (unsigned) char_resolve_modifier_mask ((int) c);
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
152 /* If C still has any modifier bits, just ignore it. */
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
153 c &= ~CHAR_MODIFIER_MASK;
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
154 }
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
155
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
156 MAYBE_UNIFY_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
157
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
158 if (c <= MAX_3_BYTE_CHAR)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
159 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
160 bytes = CHAR_STRING (c, p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
161 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
162 else if (c <= MAX_4_BYTE_CHAR)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
163 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
164 p[0] = (0xF0 | (c >> 18));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
165 p[1] = (0x80 | ((c >> 12) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
166 p[2] = (0x80 | ((c >> 6) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
167 p[3] = (0x80 | (c & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
168 bytes = 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
169 }
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
170 else if (c <= MAX_5_BYTE_CHAR)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
171 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
172 p[0] = 0xF8;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
173 p[1] = (0x80 | ((c >> 18) & 0x0F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
174 p[2] = (0x80 | ((c >> 12) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
175 p[3] = (0x80 | ((c >> 6) & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
176 p[4] = (0x80 | (c & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
177 bytes = 5;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
178 }
90797
b74794d7f11a (char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents: 90761
diff changeset
179 else if (c <= MAX_CHAR)
89181
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
180 {
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
181 c = CHAR_TO_BYTE8 (c);
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
182 bytes = BYTE8_STRING (c, p);
be75d5934738 (char_string): Renamed from
Kenichi Handa <handa@m17n.org>
parents: 89054
diff changeset
183 }
90797
b74794d7f11a (char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents: 90761
diff changeset
184 else
b74794d7f11a (char_string): Type of arg C changed to unsigned.
Kenichi Handa <handa@m17n.org>
parents: 90761
diff changeset
185 error ("Invalid character: %d", c);
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
186
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
187 return bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
188 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
189
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
190
89888
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
191 /* Return a character whose multibyte form is at P. Set LEN is not
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
192 NULL, it must be a pointer to integer. In that case, set *LEN to
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
193 the byte length of the multibyte form. If ADVANCED is not NULL, is
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
194 must be a pointer to unsigned char. In that case, set *ADVANCED to
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
195 the ending address (i.e. the starting address of the next
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
196 character) of the multibyte form. */
cfd942ddfdab *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89757
diff changeset
197
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
198 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
199 string_char (const unsigned char *p, const unsigned char **advanced, int *len)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
200 {
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
201 int c;
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
202 const unsigned char *saved_p = p;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
203
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
204 if (*p < 0x80 || ! (*p & 0x20) || ! (*p & 0x10))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
205 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
206 c = STRING_CHAR_ADVANCE (p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
207 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
208 else if (! (*p & 0x08))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
209 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
210 c = ((((p)[0] & 0xF) << 18)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
211 | (((p)[1] & 0x3F) << 12)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
212 | (((p)[2] & 0x3F) << 6)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
213 | ((p)[3] & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
214 p += 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
215 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
216 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
217 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
218 c = ((((p)[1] & 0x3F) << 18)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
219 | (((p)[2] & 0x3F) << 12)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
220 | (((p)[3] & 0x3F) << 6)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
221 | ((p)[4] & 0x3F));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
222 p += 5;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
223 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
224
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
225 MAYBE_UNIFY_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
226
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
227 if (len)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
228 *len = p - saved_p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
229 if (advanced)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
230 *advanced = p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
231 return c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
232 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
233
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
234
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
235 /* Translate character C by translation table TABLE. If C is
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
236 negative, translate a character specified by CHARSET and CODE. If
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
237 no translation is found in TABLE, return the untranslated
89757
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
238 character. If TABLE is a list, elements are char tables. In this
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
239 case, translace C by all tables. */
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
240
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
241 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
242 translate_char (Lisp_Object table, int c)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
243 {
89757
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
244 if (CHAR_TABLE_P (table))
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
245 {
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
246 Lisp_Object ch;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
247
89757
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
248 ch = CHAR_TABLE_REF (table, c);
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
249 if (CHARACTERP (ch))
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
250 c = XINT (ch);
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
251 }
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
252 else
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
253 {
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
254 for (; CONSP (table); table = XCDR (table))
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
255 c = translate_char (XCAR (table), c);
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
256 }
482c15940000 (translate_char): Accept list of translation tables.
Kenichi Handa <handa@m17n.org>
parents: 89538
diff changeset
257 return c;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
258 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
259
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
260 /* Convert ASCII or 8-bit character C to unibyte. If C is none of
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
261 them, return (C & 0xFF).
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
262
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
263 The argument REV_TBL is now ignored. It will be removed in the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
264 future. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
265
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
266 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
267 multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
268 {
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
269 if (c < 0x80)
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
270 return c;
89054
8a6da305ac40 (unibyte_to_multibyte_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 89029
diff changeset
271 if (CHAR_BYTE8_P (c))
8a6da305ac40 (unibyte_to_multibyte_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 89029
diff changeset
272 return CHAR_TO_BYTE8 (c);
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
273 return (c & 0xFF);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
274 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
275
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
276 /* Like multibyte_char_to_unibyte, but return -1 if C is not supported
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
277 by charset_unibyte. */
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
278
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
279 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
280 multibyte_char_to_unibyte_safe (int c)
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
281 {
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
282 if (c < 0x80)
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
283 return c;
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
284 if (CHAR_BYTE8_P (c))
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
285 return CHAR_TO_BYTE8 (c);
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
286 return -1;
90761
2951f3d44eba (multibyte_char_to_unibyte_safe): New function.
Kenichi Handa <handa@m17n.org>
parents: 90424
diff changeset
287 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
288
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
289 DEFUN ("characterp", Fcharacterp, Scharacterp, 1, 2, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
290 doc: /* Return non-nil if OBJECT is a character. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
291 (Lisp_Object object, Lisp_Object ignore)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
292 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
293 return (CHARACTERP (object) ? Qt : Qnil);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
294 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
295
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
296 DEFUN ("max-char", Fmax_char, Smax_char, 0, 0, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
297 doc: /* Return the character of the maximum code. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
298 (void)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
299 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
300 return make_number (MAX_CHAR);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
301 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
302
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
303 DEFUN ("unibyte-char-to-multibyte", Funibyte_char_to_multibyte,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
304 Sunibyte_char_to_multibyte, 1, 1, 0,
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
305 doc: /* Convert the byte CH to multibyte character. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
306 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
307 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
308 int c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
309
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
310 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
311 c = XFASTINT (ch);
103740
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
312 if (c >= 0x100)
1896419e9422 (unibyte_has_multibyte_table): Delete it.
Kenichi Handa <handa@m17n.org>
parents: 101818
diff changeset
313 error ("Not a unibyte character: %d", c);
105661
bac26aa40069 Remove leftover table unibyte_to_multibyte_table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103740
diff changeset
314 MAKE_CHAR_MULTIBYTE (c);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
315 return make_number (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
316 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
317
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
318 DEFUN ("multibyte-char-to-unibyte", Fmultibyte_char_to_unibyte,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
319 Smultibyte_char_to_unibyte, 1, 1, 0,
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
320 doc: /* Convert the multibyte character CH to a byte.
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
321 If the multibyte character does not represent a byte, return -1. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
322 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
323 {
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
324 int cm;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
325
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
326 CHECK_CHARACTER (ch);
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
327 cm = XFASTINT (ch);
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
328 if (cm < 256)
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
329 /* Can't distinguish a byte read from a unibyte buffer from
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
330 a latin1 char, so let's let it slide. */
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
331 return ch;
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
332 else
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
333 {
95856
f13a77e0e34f * character.h (CHAR_TO_BYTE_SAFE): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94963
diff changeset
334 int cu = CHAR_TO_BYTE_SAFE (cm);
94146
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
335 return make_number (cu);
096ad76b9ccf (Fmultibyte_char_to_unibyte): Return latin1 chars unchanged.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94114
diff changeset
336 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
337 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
338
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
339 DEFUN ("char-bytes", Fchar_bytes, Schar_bytes, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
340 doc: /* Return 1 regardless of the argument CHAR.
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
341 This is now an obsolete function. We keep it just for backward compatibility.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
342 usage: (char-bytes CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
343 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
344 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
345 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
346 return make_number (1);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
347 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
348
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
349 DEFUN ("char-width", Fchar_width, Schar_width, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
350 doc: /* Return width of CHAR when displayed in the current buffer.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
351 The width is measured by how many columns it occupies on the screen.
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
352 Tab is taken to occupy `tab-width' columns.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
353 usage: (char-width CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
354 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
355 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
356 Lisp_Object disp;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
357 int c, width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
358 struct Lisp_Char_Table *dp = buffer_display_table ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
359
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
360 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
361 c = XINT (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
362
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
363 /* Get the way the display table would display it. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
364 disp = dp ? DISP_CHAR_VECTOR (dp, c) : Qnil;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
365
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
366 if (VECTORP (disp))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
367 width = ASIZE (disp);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
368 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
369 width = CHAR_WIDTH (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
370
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
371 return make_number (width);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
372 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
373
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
374 /* Return width of string STR of length LEN when displayed in the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
375 current buffer. The width is measured by how many columns it
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
376 occupies on the screen. If PRECISION > 0, return the width of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
377 longest substring that doesn't exceed PRECISION, and set number of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
378 characters and bytes of the substring in *NCHARS and *NBYTES
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
379 respectively. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
380
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
381 int
100139
fc199de00487 * keyboard.c (read_char_help_form_unwind): Specify the type for ARG.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99482
diff changeset
382 c_string_width (const unsigned char *str, int len, int precision, int *nchars, int *nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
383 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
384 int i = 0, i_byte = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
385 int width = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
386 struct Lisp_Char_Table *dp = buffer_display_table ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
387
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
388 while (i_byte < len)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
389 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
390 int bytes, thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
391 Lisp_Object val;
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
392 int c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
393
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
394 if (dp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
395 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
396 val = DISP_CHAR_VECTOR (dp, c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
397 if (VECTORP (val))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
398 thiswidth = XVECTOR (val)->size;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
399 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
400 thiswidth = CHAR_WIDTH (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
401 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
402 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
403 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
404 thiswidth = CHAR_WIDTH (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
405 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
406
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
407 if (precision > 0
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
408 && (width + thiswidth > precision))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
409 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
410 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
411 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
412 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
413 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
414 i++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
415 i_byte += bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
416 width += thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
417 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
418
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
419 if (precision > 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
420 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
421 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
422 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
423 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
424
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
425 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
426 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
427
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
428 /* Return width of string STR of length LEN when displayed in the
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
429 current buffer. The width is measured by how many columns it
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
430 occupies on the screen. */
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
431
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
432 int
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109179
diff changeset
433 strwidth (const unsigned char *str, int len)
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
434 {
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
435 return c_string_width (str, len, -1, NULL, NULL);
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
436 }
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
437
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
438 /* Return width of Lisp string STRING when displayed in the current
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
439 buffer. The width is measured by how many columns it occupies on
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
440 the screen while paying attention to compositions. If PRECISION >
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
441 0, return the width of longest substring that doesn't exceed
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
442 PRECISION, and set number of characters and bytes of the substring
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
443 in *NCHARS and *NBYTES respectively. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
444
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
445 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
446 lisp_string_width (Lisp_Object string, int precision, int *nchars, int *nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
447 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
448 int len = SCHARS (string);
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
449 /* This set multibyte to 0 even if STRING is multibyte when it
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
450 contains only ascii and eight-bit-graphic, but that's
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
451 intentional. */
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
452 int multibyte = len < SBYTES (string);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
453 unsigned char *str = SDATA (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
454 int i = 0, i_byte = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
455 int width = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
456 struct Lisp_Char_Table *dp = buffer_display_table ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
457
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
458 while (i < len)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
459 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
460 int chars, bytes, thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
461 Lisp_Object val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
462 int cmp_id;
89511
bae1254b8517 (lisp_string_width): Make ignore and end EMACS_INT.
Dave Love <fx@gnu.org>
parents: 89483
diff changeset
463 EMACS_INT ignore, end;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
464
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
465 if (find_composition (i, -1, &ignore, &end, &val, string)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
466 && ((cmp_id = get_composition_id (i, i_byte, end - i, val, string))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
467 >= 0))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
468 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
469 thiswidth = composition_table[cmp_id]->width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
470 chars = end - i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
471 bytes = string_char_to_byte (string, end) - i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
472 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
473 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
474 {
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
475 int c;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
476
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
477 if (multibyte)
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
478 c = STRING_CHAR_AND_LENGTH (str + i_byte, bytes);
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
479 else
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
480 c = str[i_byte], bytes = 1;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
481 chars = 1;
90256
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
482 if (dp)
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
483 {
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
484 val = DISP_CHAR_VECTOR (dp, c);
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
485 if (VECTORP (val))
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
486 thiswidth = XVECTOR (val)->size;
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
487 else
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
488 thiswidth = CHAR_WIDTH (c);
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
489 }
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
490 else
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
491 {
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
492 thiswidth = CHAR_WIDTH (c);
d4755c5aa57d (lisp_string_width): Check multibyteness of STRING.
Kenichi Handa <handa@m17n.org>
parents: 90159
diff changeset
493 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
494 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
495
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
496 if (precision > 0
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
497 && (width + thiswidth > precision))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
498 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
499 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
500 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
501 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
502 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
503 i += chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
504 i_byte += bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
505 width += thiswidth;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
506 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
507
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
508 if (precision > 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
509 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
510 *nchars = i;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
511 *nbytes = i_byte;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
512 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
513
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
514 return width;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
515 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
516
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
517 DEFUN ("string-width", Fstring_width, Sstring_width, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
518 doc: /* Return width of STRING when displayed in the current buffer.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
519 Width is measured by how many columns it occupies on the screen.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
520 When calculating width of a multibyte character in STRING,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
521 only the base leading-code is considered; the validity of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
522 the following bytes is not checked. Tabs in STRING are always
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
523 taken to occupy `tab-width' columns.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
524 usage: (string-width STRING) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
525 (Lisp_Object str)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
526 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
527 Lisp_Object val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
528
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
529 CHECK_STRING (str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
530 XSETFASTINT (val, lisp_string_width (str, -1, NULL, NULL));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
531 return val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
532 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
533
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
534 DEFUN ("char-direction", Fchar_direction, Schar_direction, 1, 1, 0,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
535 doc: /* Return the direction of CHAR.
94114
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
536 The returned value is 0 for left-to-right and 1 for right-to-left.
327f7207ff7e (Fchar_bytes, Fchar_width, Fstring_width, Fchar_direction):
Juanma Barranquero <lekktu@gmail.com>
parents: 92499
diff changeset
537 usage: (char-direction CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
538 (Lisp_Object ch)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
539 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
540 int c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
541
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
542 CHECK_CHARACTER (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
543 c = XINT (ch);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
544 return CHAR_TABLE_REF (Vchar_direction_table, c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
545 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
546
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
547 /* Return the number of characters in the NBYTES bytes at PTR.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
548 This works by looking at the contents and checking for multibyte
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
549 sequences while assuming that there's no invalid sequence.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
550 However, if the current buffer has enable-multibyte-characters =
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
551 nil, we treat each byte as a character. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
552
91807
507bcfb4342c * coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91443
diff changeset
553 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
554 chars_in_text (const unsigned char *ptr, EMACS_INT nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
555 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
556 /* current_buffer is null at early stages of Emacs initialization. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
557 if (current_buffer == 0
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
558 || NILP (current_buffer->enable_multibyte_characters))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
559 return nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
560
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
561 return multibyte_chars_in_text (ptr, nbytes);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
562 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
563
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
564 /* Return the number of characters in the NBYTES bytes at PTR.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
565 This works by looking at the contents and checking for multibyte
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
566 sequences while assuming that there's no invalid sequence. It
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
567 ignores enable-multibyte-characters. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
568
91807
507bcfb4342c * coding.c (coding_set_destination): Use BEG_BYTE rather than hardcoding 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91443
diff changeset
569 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
570 multibyte_chars_in_text (const unsigned char *ptr, EMACS_INT nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
571 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
572 const unsigned char *endp = ptr + nbytes;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
573 int chars = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
574
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
575 while (ptr < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
576 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
577 int len = MULTIBYTE_LENGTH (ptr, endp);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
578
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
579 if (len == 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
580 abort ();
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
581 ptr += len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
582 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
583 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
584
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
585 return chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
586 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
587
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
588 /* Parse unibyte text at STR of LEN bytes as a multibyte text, count
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
589 characters and bytes in it, and store them in *NCHARS and *NBYTES
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
590 respectively. On counting bytes, pay attention to that 8-bit
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
591 characters not constructing a valid multibyte sequence are
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
592 represented by 2-byte in a multibyte text. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
593
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
594 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
595 parse_str_as_multibyte (const unsigned char *str, int len, int *nchars, int *nbytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
596 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
597 const unsigned char *endp = str + len;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
598 int n, chars = 0, bytes = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
599
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
600 if (len >= MAX_MULTIBYTE_LENGTH)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
601 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
602 const unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
603 while (str < adjusted_endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
604 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
605 if (! CHAR_BYTE8_HEAD_P (*str)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
606 && (n = MULTIBYTE_LENGTH_NO_CHECK (str)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
607 str += n, bytes += n;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
608 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
609 str++, bytes += 2;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
610 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
611 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
612 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
613 while (str < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
614 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
615 if (! CHAR_BYTE8_HEAD_P (*str)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
616 && (n = MULTIBYTE_LENGTH (str, endp)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
617 str += n, bytes += n;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
618 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
619 str++, bytes += 2;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
620 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
621 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
622
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
623 *nchars = chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
624 *nbytes = bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
625 return;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
626 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
627
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
628 /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
629 It actually converts only such 8-bit characters that don't contruct
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
630 a multibyte sequence to multibyte forms of Latin-1 characters. If
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
631 NCHARS is nonzero, set *NCHARS to the number of characters in the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
632 text. It is assured that we can use LEN bytes at STR as a work
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
633 area and that is enough. Return the number of bytes of the
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
634 resulting text. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
635
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
636 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
637 str_as_multibyte (unsigned char *str, int len, int nbytes, int *nchars)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
638 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
639 unsigned char *p = str, *endp = str + nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
640 unsigned char *to;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
641 int chars = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
642 int n;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
643
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
644 if (nbytes >= MAX_MULTIBYTE_LENGTH)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
645 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
646 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
647 while (p < adjusted_endp
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
648 && ! CHAR_BYTE8_HEAD_P (*p)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
649 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
650 p += n, chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
651 }
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
652 while (p < endp
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
653 && ! CHAR_BYTE8_HEAD_P (*p)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
654 && (n = MULTIBYTE_LENGTH (p, endp)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
655 p += n, chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
656 if (nchars)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
657 *nchars = chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
658 if (p == endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
659 return nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
660
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
661 to = p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
662 nbytes = endp - p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
663 endp = str + len;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
664 memmove (endp - nbytes, p, nbytes);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
665 p = endp - nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
666
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
667 if (nbytes >= MAX_MULTIBYTE_LENGTH)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
668 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
669 unsigned char *adjusted_endp = endp - MAX_MULTIBYTE_LENGTH;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
670 while (p < adjusted_endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
671 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
672 if (! CHAR_BYTE8_HEAD_P (*p)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
673 && (n = MULTIBYTE_LENGTH_NO_CHECK (p)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
674 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
675 while (n--)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
676 *to++ = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
677 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
678 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
679 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
680 int c = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
681 c = BYTE8_TO_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
682 to += CHAR_STRING (c, to);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
683 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
684 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
685 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
686 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
687 while (p < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
688 {
107314
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
689 if (! CHAR_BYTE8_HEAD_P (*p)
5e25c4602dd4 Fix handling of the multibyte form of raw-bytes in unibyte->multibyte conversion.
Kenichi Handa <handa@m17n.org>
parents: 106815
diff changeset
690 && (n = MULTIBYTE_LENGTH (p, endp)) > 0)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
691 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
692 while (n--)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
693 *to++ = *p++;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
694 }
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
695 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
696 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
697 int c = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
698 c = BYTE8_TO_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
699 to += CHAR_STRING (c, to);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
700 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
701 chars++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
702 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
703 if (nchars)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
704 *nchars = chars;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
705 return (to - str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
706 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
707
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
708 /* Parse unibyte string at STR of LEN bytes, and return the number of
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
709 bytes it may ocupy when converted to multibyte string by
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
710 `str_to_multibyte'. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
711
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
712 int
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109179
diff changeset
713 parse_str_to_multibyte (const unsigned char *str, int len)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
714 {
109555
05e7e7c46ff0 Use const, move declarations to header files.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109179
diff changeset
715 const unsigned char *endp = str + len;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
716 int bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
717
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
718 for (bytes = 0; str < endp; str++)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
719 bytes += (*str < 0x80) ? 1 : 2;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
720 return bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
721 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
722
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
723
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
724 /* Convert unibyte text at STR of NBYTES bytes to a multibyte text
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
725 that contains the same single-byte characters. It actually
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
726 converts all 8-bit characters to multibyte forms. It is assured
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
727 that we can use LEN bytes at STR as a work area and that is
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
728 enough. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
729
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
730 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
731 str_to_multibyte (unsigned char *str, int len, int bytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
732 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
733 unsigned char *p = str, *endp = str + bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
734 unsigned char *to;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
735
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
736 while (p < endp && *p < 0x80) p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
737 if (p == endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
738 return bytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
739 to = p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
740 bytes = endp - p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
741 endp = str + len;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109126
diff changeset
742 memmove (endp - bytes, p, bytes);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
743 p = endp - bytes;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
744 while (p < endp)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
745 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
746 int c = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
747
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
748 if (c >= 0x80)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
749 c = BYTE8_TO_CHAR (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
750 to += CHAR_STRING (c, to);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
751 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
752 return (to - str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
753 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
754
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
755 /* Arrange multibyte text at STR of LEN bytes as a unibyte text. It
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
756 actually converts characters in the range 0x80..0xFF to
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
757 unibyte. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
758
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
759 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
760 str_as_unibyte (unsigned char *str, int bytes)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
761 {
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
762 const unsigned char *p = str, *endp = str + bytes;
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
763 unsigned char *to;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
764 int c, len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
765
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
766 while (p < endp)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
767 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
768 c = *p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
769 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
770 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
771 break;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
772 p += len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
773 }
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
774 to = str + (p - str);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
775 while (p < endp)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
776 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
777 c = *p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
778 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
779 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
780 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
781 c = STRING_CHAR_ADVANCE (p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
782 *to++ = CHAR_TO_BYTE8 (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
783 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
784 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
785 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
786 while (len--) *to++ = *p++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
787 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
788 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
789 return (to - str);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
790 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
791
96249
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
792 /* Convert eight-bit chars in SRC (in multibyte form) to the
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
793 corresponding byte and store in DST. CHARS is the number of
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
794 characters in SRC. The value is the number of bytes stored in DST.
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
795 Usually, the value is the same as CHARS, but is less than it if SRC
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
796 contains a non-ASCII, non-eight-bit characater. If ACCEPT_LATIN_1
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
797 is nonzero, a Latin-1 character is accepted and converted to a byte
96501
919775e9f3bf (str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents: 96249
diff changeset
798 of that character code.
919775e9f3bf (str_to_unibyte): Modify the comment.
Kenichi Handa <handa@m17n.org>
parents: 96249
diff changeset
799 Note: Currently the arg ACCEPT_LATIN_1 is not used. */
96249
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
800
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
801 EMACS_INT
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
802 str_to_unibyte (const unsigned char *src, unsigned char *dst, EMACS_INT chars, int accept_latin_1)
96249
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
803 {
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
804 EMACS_INT i;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
805
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
806 for (i = 0; i < chars; i++)
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
807 {
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
808 int c = STRING_CHAR_ADVANCE (src);
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
809
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
810 if (CHAR_BYTE8_P (c))
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
811 c = CHAR_TO_BYTE8 (c);
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
812 else if (! ASCII_CHAR_P (c)
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
813 && (! accept_latin_1 || c >= 0x100))
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
814 return i;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
815 *dst++ = c;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
816 }
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
817 return i;
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
818 }
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
819
71c216bc3b71 (str_to_unibyte): New function.
Kenichi Handa <handa@m17n.org>
parents: 95856
diff changeset
820
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
821 int
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
822 string_count_byte8 (Lisp_Object string)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
823 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
824 int multibyte = STRING_MULTIBYTE (string);
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
825 int nbytes = SBYTES (string);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
826 unsigned char *p = SDATA (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
827 unsigned char *pend = p + nbytes;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
828 int count = 0;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
829 int c, len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
830
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
831 if (multibyte)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
832 while (p < pend)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
833 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
834 c = *p;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
835 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
836
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
837 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
838 count++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
839 p += len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
840 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
841 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
842 while (p < pend)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
843 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
844 if (*p++ >= 0x80)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
845 count++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
846 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
847 return count;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
848 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
849
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
850
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
851 Lisp_Object
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
852 string_escape_byte8 (Lisp_Object string)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
853 {
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
854 int nchars = SCHARS (string);
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
855 int nbytes = SBYTES (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
856 int multibyte = STRING_MULTIBYTE (string);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
857 int byte8_count;
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
858 const unsigned char *src, *src_end;
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
859 unsigned char *dst;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
860 Lisp_Object val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
861 int c, len;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
862
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
863 if (multibyte && nchars == nbytes)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
864 return string;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
865
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
866 byte8_count = string_count_byte8 (string);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
867
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
868 if (byte8_count == 0)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
869 return string;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
870
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
871 if (multibyte)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
872 /* Convert 2-byte sequence of byte8 chars to 4-byte octal. */
88526
6bac4ae1c326 (string_escape_byte8): Make multibyte string with correct size.
Kenichi Handa <handa@m17n.org>
parents: 88427
diff changeset
873 val = make_uninit_multibyte_string (nchars + byte8_count * 3,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
874 nbytes + byte8_count * 2);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
875 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
876 /* Convert 1-byte sequence of byte8 chars to 4-byte octal. */
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
877 val = make_uninit_string (nbytes + byte8_count * 3);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
878
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
879 src = SDATA (string);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
880 src_end = src + nbytes;
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
881 dst = SDATA (val);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
882 if (multibyte)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
883 while (src < src_end)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
884 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
885 c = *src;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
886 len = BYTES_BY_CHAR_HEAD (c);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
887
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
888 if (CHAR_BYTE8_HEAD_P (c))
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
889 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
890 c = STRING_CHAR_ADVANCE (src);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
891 c = CHAR_TO_BYTE8 (c);
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
892 sprintf ((char *) dst, "\\%03o", c);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
893 dst += 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
894 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
895 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
896 while (len--) *dst++ = *src++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
897 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
898 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
899 while (src < src_end)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
900 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
901 c = *src++;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
902 if (c >= 0x80)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
903 {
88427
1a3aec316071 (c_string_width): Add return type `int'.
Kenichi Handa <handa@m17n.org>
parents: 88363
diff changeset
904 sprintf ((char *) dst, "\\%03o", c);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
905 dst += 4;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
906 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
907 else
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
908 *dst++ = c;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
909 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
910 return val;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
911 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
912
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
913
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 89181
diff changeset
914 DEFUN ("string", Fstring, Sstring, 0, MANY, 0,
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
915 doc: /*
88640
90a6e8c61273 (Fstring): Doc fix.
Dave Love <fx@gnu.org>
parents: 88526
diff changeset
916 Concatenate all the argument characters and make the result a string.
90a6e8c61273 (Fstring): Doc fix.
Dave Love <fx@gnu.org>
parents: 88526
diff changeset
917 usage: (string &rest CHARACTERS) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
918 (int n, Lisp_Object *args)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
919 {
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
920 int i, c;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
921 unsigned char *buf, *p;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
922 Lisp_Object str;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
923 USE_SAFE_ALLOCA;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
924
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
925 SAFE_ALLOCA (buf, unsigned char *, MAX_MULTIBYTE_LENGTH * n);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
926 p = buf;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
927
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
928 for (i = 0; i < n; i++)
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
929 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
930 CHECK_CHARACTER (args[i]);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
931 c = XINT (args[i]);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
932 p += CHAR_STRING (c, p);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
933 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
934
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
935 str = make_string_from_bytes ((char *) buf, n, p - buf);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
936 SAFE_FREE ();
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
937 return str;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
938 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
939
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
940 DEFUN ("unibyte-string", Funibyte_string, Sunibyte_string, 0, MANY, 0,
90942
ba60bd18bc0b (Funibyte_string): Add "usage: ..." to the docstring.
Kenichi Handa <handa@m17n.org>
parents: 90841
diff changeset
941 doc: /* Concatenate all the argument bytes and make the result a unibyte string.
ba60bd18bc0b (Funibyte_string): Add "usage: ..." to the docstring.
Kenichi Handa <handa@m17n.org>
parents: 90841
diff changeset
942 usage: (unibyte-string &rest BYTES) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
943 (int n, Lisp_Object *args)
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
944 {
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
945 int i, c;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
946 unsigned char *buf, *p;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
947 Lisp_Object str;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
948 USE_SAFE_ALLOCA;
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
949
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
950 SAFE_ALLOCA (buf, unsigned char *, n);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
951 p = buf;
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
952
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
953 for (i = 0; i < n; i++)
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
954 {
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
955 CHECK_NATNUM (args[i]);
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
956 c = XFASTINT (args[i]);
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
957 if (c >= 256)
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
958 args_out_of_range_3 (args[i], make_number (0), make_number (255));
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
959 *p++ = c;
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
960 }
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
961
108650
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
962 str = make_string_from_bytes ((char *) buf, n, p - buf);
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
963 SAFE_FREE ();
c3fda38a8b8b * character.c (Fstring, Funibyte_string): Use SAFE_ALLOCA to
Chong Yidong <cyd@stupidchicken.com>
parents: 107314
diff changeset
964 return str;
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
965 }
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
966
98380
c3d306455ee9 (Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents: 97907
diff changeset
967 DEFUN ("char-resolve-modifiers", Fchar_resolve_modifiers,
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
968 Schar_resolve_modifiers, 1, 1, 0,
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
969 doc: /* Resolve modifiers in the character CHAR.
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
970 The value is a character with modifiers resolved into the character
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
971 code. Unresolved modifiers are kept in the value.
98380
c3d306455ee9 (Fchar_resolve_modifiers): Rewrite Elisp function
Martin Rudalics <rudalics@gmx.at>
parents: 97907
diff changeset
972 usage: (char-resolve-modifiers CHAR) */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
973 (Lisp_Object character)
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
974 {
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
975 int c;
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
976
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
977 CHECK_NUMBER (character);
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
978 c = XINT (character);
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
979 return make_number (char_resolve_modifier_mask (c));
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
980 }
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
981
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
982 DEFUN ("get-byte", Fget_byte, Sget_byte, 0, 2, 0,
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
983 doc: /* Return a byte value of a character at point.
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
984 Optional 1st arg POSITION, if non-nil, is a position of a character to get
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
985 a byte value.
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
986 Optional 2nd arg STRING, if non-nil, is a string of which first
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
987 character is a target to get a byte value. In this case, POSITION, if
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
988 non-nil, is an index of a target character in the string.
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
989
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
990 If the current buffer (or STRING) is multibyte, and the target
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
991 character is not ASCII nor 8-bit character, an error is signalled. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
992 (Lisp_Object position, Lisp_Object string)
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
993 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
994 int c;
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
995 EMACS_INT pos;
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
996 unsigned char *p;
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
997
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
998 if (NILP (string))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
999 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1000 if (NILP (position))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1001 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1002 p = PT_ADDR;
101818
86b3f8ddbaee * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 101805
diff changeset
1003 }
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1004 else
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1005 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1006 CHECK_NUMBER_COERCE_MARKER (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1007 if (XINT (position) < BEGV || XINT (position) >= ZV)
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1008 args_out_of_range_3 (position, make_number (BEGV), make_number (ZV));
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1009 pos = XFASTINT (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1010 p = CHAR_POS_ADDR (pos);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1011 }
99475
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
1012 if (NILP (current_buffer->enable_multibyte_characters))
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
1013 return make_number (*p);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1014 }
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1015 else
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1016 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1017 CHECK_STRING (string);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1018 if (NILP (position))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1019 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1020 p = SDATA (string);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1021 }
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1022 else
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1023 {
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1024 CHECK_NATNUM (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1025 if (XINT (position) >= SCHARS (string))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1026 args_out_of_range (string, position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1027 pos = XFASTINT (position);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1028 p = SDATA (string) + string_char_to_byte (string, pos);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1029 }
99475
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
1030 if (! STRING_MULTIBYTE (string))
98e08333a580 (Fget_byte): Fix and make it faster for unibyte target.
Kenichi Handa <handa@m17n.org>
parents: 99453
diff changeset
1031 return make_number (*p);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1032 }
106185
f2cea199b0c4 * character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
Andreas Schwab <schwab@linux-m68k.org>
parents: 105877
diff changeset
1033 c = STRING_CHAR (p);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1034 if (CHAR_BYTE8_P (c))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1035 c = CHAR_TO_BYTE8 (c);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1036 else if (! ASCII_CHAR_P (c))
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1037 error ("Not an ASCII nor an 8-bit character: %d", c);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1038 return make_number (c);
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1039 }
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1040
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1041
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1042 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
1043 init_character_once (void)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1044 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1045 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1046
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1047 #ifdef emacs
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1048
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1049 void
109126
aec1143e8d85 Convert (most) functions in src to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 108650
diff changeset
1050 syms_of_character (void)
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1051 {
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1052 DEFSYM (Qcharacterp, "characterp");
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1053 DEFSYM (Qauto_fill_chars, "auto-fill-chars");
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1054
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1055 staticpro (&Vchar_unify_table);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1056 Vchar_unify_table = Qnil;
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1057
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1058 defsubr (&Smax_char);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1059 defsubr (&Scharacterp);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1060 defsubr (&Sunibyte_char_to_multibyte);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1061 defsubr (&Smultibyte_char_to_unibyte);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1062 defsubr (&Schar_bytes);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1063 defsubr (&Schar_width);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1064 defsubr (&Sstring_width);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1065 defsubr (&Schar_direction);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1066 defsubr (&Sstring);
90841
fa02baec53ff (Funibyte_string): New function.
Kenichi Handa <handa@m17n.org>
parents: 90797
diff changeset
1067 defsubr (&Sunibyte_string);
92494
b5a82292599c (char_resolve_modifier_mask): Fix previous change
Kenichi Handa <handa@m17n.org>
parents: 92483
diff changeset
1068 defsubr (&Schar_resolve_modifiers);
99453
877b7365b646 (Fget_byte): New function.
Kenichi Handa <handa@m17n.org>
parents: 99079
diff changeset
1069 defsubr (&Sget_byte);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1070
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1071 DEFVAR_LISP ("translation-table-vector", &Vtranslation_table_vector,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1072 doc: /*
88926
f026b7e4fc61 (syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents: 88913
diff changeset
1073 Vector recording all translation tables ever defined.
f026b7e4fc61 (syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents: 88913
diff changeset
1074 Each element is a pair (SYMBOL . TABLE) relating the table to the
f026b7e4fc61 (syms_of_character) <translation-table-vector>: Doc
Dave Love <fx@gnu.org>
parents: 88913
diff changeset
1075 symbol naming it. The ID of a translation table is an index into this vector. */);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1076 Vtranslation_table_vector = Fmake_vector (make_number (16), Qnil);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1077
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1078 DEFVAR_LISP ("auto-fill-chars", &Vauto_fill_chars,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1079 doc: /*
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1080 A char-table for characters which invoke auto-filling.
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1081 Such characters have value t in this table. */);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1082 Vauto_fill_chars = Fmake_char_table (Qauto_fill_chars, Qnil);
88853
503c60238368 (syms_of_character): Fix CHAR_TABLE_SET call.
Dave Love <fx@gnu.org>
parents: 88743
diff changeset
1083 CHAR_TABLE_SET (Vauto_fill_chars, ' ', Qt);
503c60238368 (syms_of_character): Fix CHAR_TABLE_SET call.
Dave Love <fx@gnu.org>
parents: 88743
diff changeset
1084 CHAR_TABLE_SET (Vauto_fill_chars, '\n', Qt);
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1085
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1086 DEFVAR_LISP ("char-width-table", &Vchar_width_table,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1087 doc: /*
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1088 A char-table for width (columns) of each character. */);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1089 Vchar_width_table = Fmake_char_table (Qnil, make_number (1));
88743
4570f1a4c391 (syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents: 88716
diff changeset
1090 char_table_set_range (Vchar_width_table, 0x80, 0x9F, make_number (4));
4570f1a4c391 (syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents: 88716
diff changeset
1091 char_table_set_range (Vchar_width_table, MAX_5_BYTE_CHAR + 1, MAX_CHAR,
4570f1a4c391 (syms_of_character): Setup Vchar_width_table for
Kenichi Handa <handa@m17n.org>
parents: 88716
diff changeset
1092 make_number (4));
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1093
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1094 DEFVAR_LISP ("char-direction-table", &Vchar_direction_table,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1095 doc: /* A char-table for direction of each character. */);
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1096 Vchar_direction_table = Fmake_char_table (Qnil, make_number (1));
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1097
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1098 DEFVAR_LISP ("printable-chars", &Vprintable_chars,
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1099 doc: /* A char-table for each printable character. */);
88716
f617b1bf301b (syms_of_character): Set the default value of
Kenichi Handa <handa@m17n.org>
parents: 88640
diff changeset
1100 Vprintable_chars = Fmake_char_table (Qnil, Qnil);
89029
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1101 Fset_char_table_range (Vprintable_chars,
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1102 Fcons (make_number (32), make_number (126)), Qt);
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1103 Fset_char_table_range (Vprintable_chars,
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1104 Fcons (make_number (160),
ad8f56efa7c6 (syms_of_character): Setup Vprintable_chars.
Kenichi Handa <handa@m17n.org>
parents: 89020
diff changeset
1105 make_number (MAX_5_BYTE_CHAR)), Qt);
88878
a0ae1a5876c7 (Vscript_alist): New variable.
Kenichi Handa <handa@m17n.org>
parents: 88853
diff changeset
1106
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1107 DEFVAR_LISP ("char-script-table", &Vchar_script_table,
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1108 doc: /* Char table of script symbols.
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1109 It has one extra slot whose value is a list of script symbols. */);
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1110
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1111 /* Intern this now in case it isn't already done.
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1112 Setting this variable twice is harmless.
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1113 But don't staticpro it here--that is done in alloc.c. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105688
diff changeset
1114 Qchar_table_extra_slots = intern_c_string ("char-table-extra-slots");
88913
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1115 DEFSYM (Qchar_script_table, "char-script-table");
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1116 Fput (Qchar_script_table, Qchar_table_extra_slots, make_number (1));
76074dea1258 (Vscript_alist): This variable deleted.
Kenichi Handa <handa@m17n.org>
parents: 88878
diff changeset
1117 Vchar_script_table = Fmake_char_table (Qchar_script_table, Qnil);
90403
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
1118
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
1119 DEFVAR_LISP ("script-representative-chars", &Vscript_representative_chars,
97907
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1120 doc: /* Alist of scripts vs the representative characters.
101805
b416b80570f8 (Vscript_representative_chars): Docstring modified.
Kenichi Handa <handa@m17n.org>
parents: 100951
diff changeset
1121 Each element is a cons (SCRIPT . CHARS).
101818
86b3f8ddbaee * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 101805
diff changeset
1122 SCRIPT is a symbol representing a script or a subgroup of a script.
97907
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1123 CHARS is a list or a vector of characters.
99079
ffe8b1e92732 * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 98380
diff changeset
1124 If it is a list, all characters in the list are necessary for supporting SCRIPT.
97907
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1125 If it is a vector, one of the characters in the vector is necessary.
3a2d65dc9abc (syms_of_character): Docstring of script-representative-chars fixed.
Kenichi Handa <handa@m17n.org>
parents: 97816
diff changeset
1126 This variable is used to find a font for a specific script. */);
90403
81f1bbab281f (Vscript_representative_chars): New variable.
Kenichi Handa <handa@m17n.org>
parents: 90256
diff changeset
1127 Vscript_representative_chars = Qnil;
97816
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1128
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1129 DEFVAR_LISP ("unicode-category-table", &Vunicode_category_table,
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1130 doc: /* Char table of Unicode's "General Category".
99079
ffe8b1e92732 * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 98380
diff changeset
1131 All Unicode characters have one of the following values (symbol):
ffe8b1e92732 * character.c (syms_of_character) <script-representative-chars>:
Juanma Barranquero <lekktu@gmail.com>
parents: 98380
diff changeset
1132 Lu, Ll, Lt, Lm, Lo, Mn, Mc, Me, Nd, Nl, No, Pc, Pd, Ps, Pe, Pi, Pf, Po,
97816
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1133 Sm, Sc, Sk, So, Zs, Zl, Zp, Cc, Cf, Cs, Co, Cn
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1134 See The Unicode Standard for the meaning of those values. */);
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1135 /* The correct char-table is setup in characters.el. */
9999d9194509 (Vunicode_category_table): New variable.
Kenichi Handa <handa@m17n.org>
parents: 96501
diff changeset
1136 Vunicode_category_table = Qnil;
88363
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1137 }
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1138
13b9026422e0 New file.
Kenichi Handa <handa@m17n.org>
parents:
diff changeset
1139 #endif /* emacs */
89911
cce857c68ba2 Add arch taglines
Miles Bader <miles@gnu.org>
parents: 89888
diff changeset
1140
cce857c68ba2 Add arch taglines
Miles Bader <miles@gnu.org>
parents: 89888
diff changeset
1141 /* arch-tag: b6665960-3c3d-4184-85cd-af4318197999
cce857c68ba2 Add arch taglines
Miles Bader <miles@gnu.org>
parents: 89888
diff changeset
1142 (do not change this comment) */