Mercurial > emacs
annotate src/casetab.c @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 695cf19ef79e |
children | e99095db1a09 375f2633d815 |
rev | line source |
---|---|
118 | 1 /* GNU Emacs routines to deal with case tables. |
7307 | 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. |
118 | 3 |
4 This file is part of GNU Emacs. | |
5 | |
6 GNU Emacs is free software; you can redistribute it and/or modify | |
7 it under the terms of the GNU General Public License as published by | |
12244 | 8 the Free Software Foundation; either version 2, or (at your option) |
118 | 9 any later version. |
10 | |
11 GNU Emacs is distributed in the hope that it will be useful, | |
12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 GNU General Public License for more details. | |
15 | |
16 You should have received a copy of the GNU General Public License | |
17 along with GNU Emacs; see the file COPYING. If not, write to | |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14064
diff
changeset
|
18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14064
diff
changeset
|
19 Boston, MA 02111-1307, USA. */ |
118 | 20 |
21 /* Written by Howard Gayle. See chartab.c for details. */ | |
22 | |
4696
1fc792473491
Include <config.h> instead of "config.h".
Roland McGrath <roland@gnu.org>
parents:
3069
diff
changeset
|
23 #include <config.h> |
118 | 24 #include "lisp.h" |
25 #include "buffer.h" | |
17804 | 26 #include "charset.h" |
118 | 27 |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
28 Lisp_Object Qcase_table_p, Qcase_table; |
118 | 29 Lisp_Object Vascii_downcase_table, Vascii_upcase_table; |
30 Lisp_Object Vascii_canon_table, Vascii_eqv_table; | |
31 | |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
32 /* Used as a temporary in DOWNCASE and other macros in lisp.h. No |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
33 need to mark it, since it is used only very temporarily. */ |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18004
diff
changeset
|
34 int case_temp1; |
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18004
diff
changeset
|
35 Lisp_Object case_temp2; |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
36 |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
37 static void set_canon (); |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
38 static void set_identity (); |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
39 static void shuffle (); |
118 | 40 |
41 DEFUN ("case-table-p", Fcase_table_p, Scase_table_p, 1, 1, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
42 doc: /* Return t iff OBJECT is a case table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
43 See `set-case-table' for more information on these data structures. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
44 (object) |
14064
d090a0a25ac8
(Fcase_table_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13321
diff
changeset
|
45 Lisp_Object object; |
118 | 46 { |
13276
a09ec2a2f6dd
(Fcase_table_p, Fcurrent_case_table): Delete unused local variables.
Erik Naggum <erik@naggum.no>
parents:
13242
diff
changeset
|
47 Lisp_Object up, canon, eqv; |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
48 |
14064
d090a0a25ac8
(Fcase_table_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13321
diff
changeset
|
49 if (! CHAR_TABLE_P (object)) |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
50 return Qnil; |
14064
d090a0a25ac8
(Fcase_table_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13321
diff
changeset
|
51 if (! EQ (XCHAR_TABLE (object)->purpose, Qcase_table)) |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
52 return Qnil; |
118 | 53 |
14064
d090a0a25ac8
(Fcase_table_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13321
diff
changeset
|
54 up = XCHAR_TABLE (object)->extras[0]; |
d090a0a25ac8
(Fcase_table_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13321
diff
changeset
|
55 canon = XCHAR_TABLE (object)->extras[1]; |
d090a0a25ac8
(Fcase_table_p): Harmonize arguments with documentation.
Erik Naggum <erik@naggum.no>
parents:
13321
diff
changeset
|
56 eqv = XCHAR_TABLE (object)->extras[2]; |
118 | 57 |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
58 return ((NILP (up) || CHAR_TABLE_P (up)) |
484 | 59 && ((NILP (canon) && NILP (eqv)) |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
60 || (CHAR_TABLE_P (canon) |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
61 && (NILP (eqv) || CHAR_TABLE_P (eqv)))) |
118 | 62 ? Qt : Qnil); |
63 } | |
64 | |
65 static Lisp_Object | |
66 check_case_table (obj) | |
67 Lisp_Object obj; | |
68 { | |
69 register Lisp_Object tem; | |
70 | |
484 | 71 while (tem = Fcase_table_p (obj), NILP (tem)) |
1926
952f2a18f83d
* callint.c (Fcall_interactively): Pass the correct number of
Jim Blandy <jimb@redhat.com>
parents:
1506
diff
changeset
|
72 obj = wrong_type_argument (Qcase_table_p, obj); |
118 | 73 return (obj); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
47292
diff
changeset
|
74 } |
118 | 75 |
76 DEFUN ("current-case-table", Fcurrent_case_table, Scurrent_case_table, 0, 0, 0, | |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
77 doc: /* Return the case table of the current buffer. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
78 () |
118 | 79 { |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
80 return current_buffer->downcase_table; |
118 | 81 } |
82 | |
3069
93ff3c50bd1d
* casetab.c: Fix formatting, so as not to confuse etags.
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
83 DEFUN ("standard-case-table", Fstandard_case_table, Sstandard_case_table, 0, 0, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
84 doc: /* Return the standard case table. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
85 This is the one used for new buffers. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
86 () |
118 | 87 { |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
88 return Vascii_downcase_table; |
118 | 89 } |
90 | |
1506
5fe52748a72c
* casetab.c (set_case_table): Declare this to be static, and
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
91 static Lisp_Object set_case_table (); |
5fe52748a72c
* casetab.c (set_case_table): Declare this to be static, and
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
92 |
118 | 93 DEFUN ("set-case-table", Fset_case_table, Sset_case_table, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
94 doc: /* Select a new case table for the current buffer. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
95 A case table is a char-table which maps characters |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
96 to their lower-case equivalents. It also has three \"extra\" slots |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
97 which may be additional char-tables or nil. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
98 These slots are called UPCASE, CANONICALIZE and EQUIVALENCES. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
99 UPCASE maps each character to its upper-case equivalent; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
100 if lower and upper case characters are in 1-1 correspondence, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
101 you may use nil and the upcase table will be deduced from DOWNCASE. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
102 CANONICALIZE maps each character to a canonical equivalent; |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
103 any two characters that are related by case-conversion have the same |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
104 canonical equivalent character; it may be nil, in which case it is |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
105 deduced from DOWNCASE and UPCASE. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
106 EQUIVALENCES is a map that cyclicly permutes each equivalence class |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
107 (of characters with the same canonical equivalent); it may be nil, |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
108 in which case it is deduced from CANONICALIZE. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
109 (table) |
118 | 110 Lisp_Object table; |
111 { | |
1506
5fe52748a72c
* casetab.c (set_case_table): Declare this to be static, and
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
112 return set_case_table (table, 0); |
118 | 113 } |
114 | |
3069
93ff3c50bd1d
* casetab.c: Fix formatting, so as not to confuse etags.
Jim Blandy <jimb@redhat.com>
parents:
2961
diff
changeset
|
115 DEFUN ("set-standard-case-table", Fset_standard_case_table, Sset_standard_case_table, 1, 1, 0, |
40103
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
116 doc: /* Select a new standard case table for new buffers. |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
117 See `set-case-table' for more info on case tables. */) |
6b389fb978bc
Change doc-string comments to `new style' [w/`doc:' keyword].
Pavel Janík <Pavel@Janik.cz>
parents:
21514
diff
changeset
|
118 (table) |
118 | 119 Lisp_Object table; |
120 { | |
1506
5fe52748a72c
* casetab.c (set_case_table): Declare this to be static, and
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
121 return set_case_table (table, 1); |
118 | 122 } |
123 | |
1506
5fe52748a72c
* casetab.c (set_case_table): Declare this to be static, and
Jim Blandy <jimb@redhat.com>
parents:
484
diff
changeset
|
124 static Lisp_Object |
118 | 125 set_case_table (table, standard) |
126 Lisp_Object table; | |
127 int standard; | |
128 { | |
13276
a09ec2a2f6dd
(Fcase_table_p, Fcurrent_case_table): Delete unused local variables.
Erik Naggum <erik@naggum.no>
parents:
13242
diff
changeset
|
129 Lisp_Object up, canon, eqv; |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
130 Lisp_Object indices[3]; |
118 | 131 |
132 check_case_table (table); | |
133 | |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
134 up = XCHAR_TABLE (table)->extras[0]; |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
135 canon = XCHAR_TABLE (table)->extras[1]; |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
136 eqv = XCHAR_TABLE (table)->extras[2]; |
118 | 137 |
484 | 138 if (NILP (up)) |
118 | 139 { |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
140 up = Fmake_char_table (Qcase_table, Qnil); |
51031
0c0b80172350
(set_case_table): Pass new arg to map_char_table.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
141 map_char_table (set_identity, Qnil, table, table, up, 0, indices); |
0c0b80172350
(set_case_table): Pass new arg to map_char_table.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
142 map_char_table (shuffle, Qnil, table, table, up, 0, indices); |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
143 XCHAR_TABLE (table)->extras[0] = up; |
118 | 144 } |
145 | |
484 | 146 if (NILP (canon)) |
118 | 147 { |
13276
a09ec2a2f6dd
(Fcase_table_p, Fcurrent_case_table): Delete unused local variables.
Erik Naggum <erik@naggum.no>
parents:
13242
diff
changeset
|
148 canon = Fmake_char_table (Qcase_table, Qnil); |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
149 XCHAR_TABLE (table)->extras[1] = canon; |
51031
0c0b80172350
(set_case_table): Pass new arg to map_char_table.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
150 map_char_table (set_canon, Qnil, table, table, table, 0, indices); |
6937
c5a85ac1d292
(set_case_table): Handle nil for EQV with non-nil CANON.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
151 } |
c5a85ac1d292
(set_case_table): Handle nil for EQV with non-nil CANON.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
152 |
c5a85ac1d292
(set_case_table): Handle nil for EQV with non-nil CANON.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
153 if (NILP (eqv)) |
c5a85ac1d292
(set_case_table): Handle nil for EQV with non-nil CANON.
Richard M. Stallman <rms@gnu.org>
parents:
4696
diff
changeset
|
154 { |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
155 eqv = Fmake_char_table (Qcase_table, Qnil); |
51031
0c0b80172350
(set_case_table): Pass new arg to map_char_table.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
156 map_char_table (set_identity, Qnil, canon, canon, eqv, 0, indices); |
0c0b80172350
(set_case_table): Pass new arg to map_char_table.
Richard M. Stallman <rms@gnu.org>
parents:
49600
diff
changeset
|
157 map_char_table (shuffle, Qnil, canon, canon, eqv, 0, indices); |
13276
a09ec2a2f6dd
(Fcase_table_p, Fcurrent_case_table): Delete unused local variables.
Erik Naggum <erik@naggum.no>
parents:
13242
diff
changeset
|
158 XCHAR_TABLE (table)->extras[2] = eqv; |
118 | 159 } |
160 | |
47292
644bd031ece8
(set_case_table): Make canon table point to eqv table.
Richard M. Stallman <rms@gnu.org>
parents:
40103
diff
changeset
|
161 /* This is so set_image_of_range_1 in regex.c can find the EQV table. */ |
644bd031ece8
(set_case_table): Make canon table point to eqv table.
Richard M. Stallman <rms@gnu.org>
parents:
40103
diff
changeset
|
162 XCHAR_TABLE (canon)->extras[2] = eqv; |
644bd031ece8
(set_case_table): Make canon table point to eqv table.
Richard M. Stallman <rms@gnu.org>
parents:
40103
diff
changeset
|
163 |
118 | 164 if (standard) |
13276
a09ec2a2f6dd
(Fcase_table_p, Fcurrent_case_table): Delete unused local variables.
Erik Naggum <erik@naggum.no>
parents:
13242
diff
changeset
|
165 Vascii_downcase_table = table; |
118 | 166 else |
15171
36c329b45867
(set_case_table): Set upcase_table, case_canon_table
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
167 { |
36c329b45867
(set_case_table): Set upcase_table, case_canon_table
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
168 current_buffer->downcase_table = table; |
36c329b45867
(set_case_table): Set upcase_table, case_canon_table
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
169 current_buffer->upcase_table = up; |
36c329b45867
(set_case_table): Set upcase_table, case_canon_table
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
170 current_buffer->case_canon_table = canon; |
36c329b45867
(set_case_table): Set upcase_table, case_canon_table
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
171 current_buffer->case_eqv_table = eqv; |
36c329b45867
(set_case_table): Set upcase_table, case_canon_table
Richard M. Stallman <rms@gnu.org>
parents:
14186
diff
changeset
|
172 } |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
173 |
118 | 174 return table; |
175 } | |
176 | |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
177 /* The following functions are called in map_char_table. */ |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
178 |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
179 /* Set CANON char-table element for C to a translated ELT by UP and |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
180 DOWN char-tables. This is done only when ELT is a character. The |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
181 char-tables CANON, UP, and DOWN are in CASE_TABLE. */ |
17815
c407a3aca56f
(compute_trt_identity, compute_trt_shuffle): Add comments.
Karl Heuer <kwzh@gnu.org>
parents:
17807
diff
changeset
|
182 |
17804 | 183 static void |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
184 set_canon (case_table, c, elt) |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
185 Lisp_Object case_table, c, elt; |
17804 | 186 { |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
187 Lisp_Object up = XCHAR_TABLE (case_table)->extras[0]; |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
188 Lisp_Object canon = XCHAR_TABLE (case_table)->extras[1]; |
17804 | 189 |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
190 if (NATNUMP (elt)) |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
191 Faset (canon, c, Faref (case_table, Faref (up, elt))); |
17804 | 192 } |
193 | |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
194 /* Set elements of char-table TABLE for C to C itself. This is done |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
195 only when ELT is a character. This is called in map_char_table. */ |
17815
c407a3aca56f
(compute_trt_identity, compute_trt_shuffle): Add comments.
Karl Heuer <kwzh@gnu.org>
parents:
17807
diff
changeset
|
196 |
17804 | 197 static void |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
198 set_identity (table, c, elt) |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
199 Lisp_Object table, c, elt; |
17804 | 200 { |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
201 if (NATNUMP (elt)) |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
202 Faset (table, c, c); |
17804 | 203 } |
204 | |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
205 /* Permute the elements of TABLE (which is initially an identity |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
206 mapping) so that it has one cycle for each equivalence class |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
207 induced by the translation table on which map_char_table is |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
208 operated. */ |
118 | 209 |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
210 static void |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
211 shuffle (table, c, elt) |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
212 Lisp_Object table, c, elt; |
118 | 213 { |
18613
614b916ff5bf
Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents:
18004
diff
changeset
|
214 if (NATNUMP (elt) && !EQ (c, elt)) |
18004
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
215 { |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
216 Lisp_Object tem = Faref (table, elt); |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
217 Faset (table, elt, c); |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
218 Faset (table, c, tem); |
40ce43a92060
(case_temp1, case_temp2): New variables temporarily
Kenichi Handa <handa@m17n.org>
parents:
17815
diff
changeset
|
219 } |
118 | 220 } |
221 | |
21514 | 222 void |
118 | 223 init_casetab_once () |
224 { | |
225 register int i; | |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
226 Lisp_Object down, up; |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
227 Qcase_table = intern ("case-table"); |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
228 staticpro (&Qcase_table); |
118 | 229 |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
230 /* Intern this now in case it isn't already done. |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
231 Setting this variable twice is harmless. |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
232 But don't staticpro it here--that is done in alloc.c. */ |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
233 Qchar_table_extra_slots = intern ("char-table-extra-slots"); |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
234 |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
235 /* Now we are ready to set up this property, so we can |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
236 create char tables. */ |
13276
a09ec2a2f6dd
(Fcase_table_p, Fcurrent_case_table): Delete unused local variables.
Erik Naggum <erik@naggum.no>
parents:
13242
diff
changeset
|
237 Fput (Qcase_table, Qchar_table_extra_slots, make_number (3)); |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
238 |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
239 down = Fmake_char_table (Qcase_table, Qnil); |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
240 Vascii_downcase_table = down; |
17340
64722b193f14
(init_casetab_once): Initialize the purpose slot.
Richard M. Stallman <rms@gnu.org>
parents:
16224
diff
changeset
|
241 XCHAR_TABLE (down)->purpose = Qcase_table; |
118 | 242 |
17804 | 243 for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++) |
244 XSETFASTINT (XCHAR_TABLE (down)->contents[i], | |
245 (i >= 'A' && i <= 'Z') ? i + ('a' - 'A') : i); | |
118 | 246 |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
247 XCHAR_TABLE (down)->extras[1] = Fcopy_sequence (down); |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
248 |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
249 up = Fmake_char_table (Qcase_table, Qnil); |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
250 XCHAR_TABLE (down)->extras[0] = up; |
118 | 251 |
17804 | 252 for (i = 0; i < CHAR_TABLE_SINGLE_BYTE_SLOTS; i++) |
253 XSETFASTINT (XCHAR_TABLE (up)->contents[i], | |
254 ((i >= 'A' && i <= 'Z') | |
255 ? i + ('a' - 'A') | |
256 : ((i >= 'a' && i <= 'z') | |
257 ? i + ('A' - 'a') | |
258 : i))); | |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
259 |
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
260 XCHAR_TABLE (down)->extras[2] = Fcopy_sequence (up); |
118 | 261 } |
262 | |
21514 | 263 void |
118 | 264 syms_of_casetab () |
265 { | |
266 Qcase_table_p = intern ("case-table-p"); | |
267 staticpro (&Qcase_table_p); | |
13242
3a8c500b97c3
Case tables are now char-tables,
Richard M. Stallman <rms@gnu.org>
parents:
12244
diff
changeset
|
268 |
16224
d4c102d5ac70
(syms_of_casetab): staticpro Vascii_canontable, Vascii_eqv_table, and
Erik Naggum <erik@naggum.no>
parents:
15171
diff
changeset
|
269 staticpro (&Vascii_canon_table); |
118 | 270 staticpro (&Vascii_downcase_table); |
16224
d4c102d5ac70
(syms_of_casetab): staticpro Vascii_canontable, Vascii_eqv_table, and
Erik Naggum <erik@naggum.no>
parents:
15171
diff
changeset
|
271 staticpro (&Vascii_eqv_table); |
d4c102d5ac70
(syms_of_casetab): staticpro Vascii_canontable, Vascii_eqv_table, and
Erik Naggum <erik@naggum.no>
parents:
15171
diff
changeset
|
272 staticpro (&Vascii_upcase_table); |
118 | 273 |
274 defsubr (&Scase_table_p); | |
275 defsubr (&Scurrent_case_table); | |
276 defsubr (&Sstandard_case_table); | |
277 defsubr (&Sset_case_table); | |
278 defsubr (&Sset_standard_case_table); | |
279 } | |
52401 | 280 |
281 /* arch-tag: e06388ad-99fe-40ec-ba67-9d010fcc4916 | |
282 (do not change this comment) */ |