Mercurial > hg > xemacs-beta

comparison src/chartab.h @ 867:804517e16990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-05 09:54:39 by ben] Textual renaming: text/char names abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, charset.h, chartab.c, chartab.h, cmds.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console-x.h, console.h, data.c, device-msw.c, device-x.c, dialog-msw.c, dired-msw.c, dired.c, doc.c, doprnt.c, editfns.c, eldap.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-unixoid.c, events.c, events.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, glyphs-eimage.c, glyphs-msw.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-x.c, gui-x.h, gui.c, gui.h, hpplay.c, indent.c, insdel.c, insdel.h, intl-win32.c, keymap.c, line-number.c, line-number.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, md5.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, ndir.h, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, procimpl.h, realpath.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, search.c, select-common.h, select-gtk.c, select-x.c, sound.h, symbols.c, syntax.c, syntax.h, sysdep.c, sysdep.h, sysdir.h, sysfile.h, sysproc.h, syspwd.h, systime.h, syswindows.h, termcap.c, tests.c, text.c, text.h, toolbar-common.c, tooltalk.c, ui-gtk.c, unexnt.c, unicode.c, win32.c: Text/char naming rationalization. [a] distinguish between "charptr" when it refers to operations on the pointer itself and when it refers to operations on text; and [b] use consistent naming for everything referring to internal format, i.e. Itext == text in internal format Ibyte == a byte in such text Ichar == a char as represented in internal character format thus e.g. set_charptr_emchar -> set_itext_ichar The pre and post tags on either side of this change are: pre-internal-format-textual-renaming post-internal-format-textual-renaming See the Internals Manual for details of exactly how this was done, how to handle the change in your workspace, etc.
author ben
date Wed, 05 Jun 2002 09:58:45 +0000
parents 6728e641994e
children 87084e8445a7
comparison
equal deleted inserted replaced
866:613552a02607 867:804517e16990
134 #define CHAR_TABLE_TYPE(ct) ((ct)->type) 134 #define CHAR_TABLE_TYPE(ct) ((ct)->type)
135 #define XCHAR_TABLE_TYPE(ct) CHAR_TABLE_TYPE (XCHAR_TABLE (ct)) 135 #define XCHAR_TABLE_TYPE(ct) CHAR_TABLE_TYPE (XCHAR_TABLE (ct))
136 136
137 Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct, 137 Lisp_Object get_non_ascii_char_table_value (Lisp_Char_Table *ct,
138 int leading_byte, 138 int leading_byte,
139 Emchar c); 139 Ichar c);
140 140
141 DECLARE_INLINE_HEADER ( 141 DECLARE_INLINE_HEADER (
142 Lisp_Object 142 Lisp_Object
143 get_char_table (Emchar ch, Lisp_Object table) 143 get_char_table (Ichar ch, Lisp_Object table)
144 ) 144 )
145 { 145 {
146 Lisp_Object retval; 146 Lisp_Object retval;
147 Lisp_Char_Table *ct = XCHAR_TABLE (table); 147 Lisp_Char_Table *ct = XCHAR_TABLE (table);
148 #ifdef MULE 148 #ifdef MULE
149 if (ch < NUM_ASCII_CHARS) 149 if (ch < NUM_ASCII_CHARS)
150 retval = ct->ascii[ch]; 150 retval = ct->ascii[ch];
151 else 151 else
152 { 152 {
153 unsigned char lb = emchar_leading_byte (ch); 153 unsigned char lb = ichar_leading_byte (ch);
154 if (!CHAR_TABLE_ENTRYP (ct->level1[lb - MIN_LEADING_BYTE])) 154 if (!CHAR_TABLE_ENTRYP (ct->level1[lb - MIN_LEADING_BYTE]))
155 retval = ct->level1[lb - MIN_LEADING_BYTE]; 155 retval = ct->level1[lb - MIN_LEADING_BYTE];
156 else 156 else
157 retval = get_non_ascii_char_table_value (ct, lb, ch); 157 retval = get_non_ascii_char_table_value (ct, lb, ch);
158 } 158 }
176 }; 176 };
177 177
178 struct chartab_range 178 struct chartab_range
179 { 179 {
180 enum chartab_range_type type; 180 enum chartab_range_type type;
181 Emchar ch; 181 Ichar ch;
182 Lisp_Object charset; 182 Lisp_Object charset;
183 int row; 183 int row;
184 }; 184 };
185 185
186 void set_char_table_default (Lisp_Object table, Lisp_Object value); 186 void set_char_table_default (Lisp_Object table, Lisp_Object value);
195 void prune_syntax_tables (void); 195 void prune_syntax_tables (void);
196 Lisp_Object get_range_char_table (struct chartab_range *range, 196 Lisp_Object get_range_char_table (struct chartab_range *range,
197 Lisp_Object table, Lisp_Object multi); 197 Lisp_Object table, Lisp_Object multi);
198 void copy_char_table_range (Lisp_Object from, Lisp_Object to, 198 void copy_char_table_range (Lisp_Object from, Lisp_Object to,
199 struct chartab_range *range); 199 struct chartab_range *range);
200 int word_boundary_p (Emchar c1, Emchar c2); 200 int word_boundary_p (Ichar c1, Ichar c2);
201 201
202 EXFUN (Fcopy_char_table, 1); 202 EXFUN (Fcopy_char_table, 1);
203 EXFUN (Fmake_char_table, 1); 203 EXFUN (Fmake_char_table, 1);
204 EXFUN (Fput_char_table, 3); 204 EXFUN (Fput_char_table, 3);
205 EXFUN (Fget_char_table, 2); 205 EXFUN (Fget_char_table, 2);
207 extern Lisp_Object Vall_syntax_tables; 207 extern Lisp_Object Vall_syntax_tables;
208 208
209 209
210 210
211 #ifdef MULE 211 #ifdef MULE
212 int check_category_char (Emchar ch, Lisp_Object ctbl, int designator, 212 int check_category_char (Ichar ch, Lisp_Object ctbl, int designator,
213 int not_p); 213 int not_p);
214 214
215 extern Lisp_Object Vstandard_category_table; 215 extern Lisp_Object Vstandard_category_table;
216 216
217 #define CATEGORY_DESIGNATORP(x) \ 217 #define CATEGORY_DESIGNATORP(x) \