Mercurial > hg > xemacs-beta
view src/casetab.c @ 793:e38acbeb1cae
[xemacs-hg @ 2002-03-29 04:46:17 by ben]
lots o' fixes
etc/ChangeLog: New file.
Separated out all entries for etc/ into their own ChangeLog.
Includes entries for the following files:
etc/BABYL, etc/BETA, etc/CHARSETS, etc/DISTRIB, etc/Emacs.ad,
etc/FTP, etc/GNUS-NEWS, etc/GOATS, etc/HELLO, etc/INSTALL,
etc/MACHINES, etc/MAILINGLISTS, etc/MSDOS, etc/MYTHOLOGY, etc/NEWS,
etc/OXYMORONS, etc/PACKAGES, etc/README, etc/TUTORIAL,
etc/TUTORIAL.de, etc/TUTORIAL.ja, etc/TUTORIAL.ko, etc/TUTORIAL.se,
etc/aliases.ksh, etc/altrasoft-logo.xpm, etc/check_cygwin_setup.sh,
etc/custom/example-themes/europe-theme.el,
etc/custom/example-themes/ex-custom-file,
etc/custom/example-themes/example-theme.el, etc/e/eterm.ti,
etc/edt-user.doc, etc/enriched.doc, etc/etags.1, etc/gnuserv.1,
etc/gnuserv.README, etc/package-index.LATEST.gpg,
etc/package-index.LATEST.pgp, etc/photos/jan.png, etc/recycle.xpm,
etc/refcard.tex, etc/sample.Xdefaults, etc/sample.emacs,
etc/sgml/CATALOG, etc/sgml/HTML32.dtd, etc/skk/SKK.tut.E,
etc/smilies/Face_ase.xbm, etc/smilies/Face_ase2.xbm,
etc/smilies/Face_ase3.xbm, etc/smilies/Face_smile.xbm,
etc/smilies/Face_weep.xbm, etc/sounds, etc/toolbar,
etc/toolbar/workshop-cap-up.xpm, etc/xemacs-ja.1, etc/xemacs.1,
etc/yow.lines, etc\BETA, etc\NEWS, etc\README, etc\TUTORIAL,
etc\TUTORIAL.de, etc\check_cygwin_setup.sh, etc\sample.init.el,
etc\unicode\README, etc\unicode\mule-ucs\*, etc\unicode\other\*
unicode/unicode-consortium/8859-16.TXT: New file.
mule/english.el: Define this charset now, since a bug was fixed that formerly
prevented it.
mule/ethio-util.el: Fix compile errors involving Unicode `characters', which should be
integers.
Makefile.in.in: Always include gui.c, to fix compile error when TTY-only.
EmacsFrame.c, abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, bytecode.h, callint.c, callproc.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.c, console-msw.h, console-tty.c, console-x.c, console-x.h, console.c, console.h, data.c, database.c, device-gtk.c, device-msw.c, device-x.c, device.c, device.h, dialog-msw.c, doc.c, doprnt.c, dumper.c, dynarr.c, editfns.c, eldap.c, eldap.h, elhash.c, elhash.h, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, events.h, extents.c, extents.h, faces.c, faces.h, file-coding.c, file-coding.h, fileio.c, filelock.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, free-hook.c, general-slots.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gtk-xemacs.c, gui-msw.c, gui-x.c, gui-x.h, gui.c, gui.h, gutter.c, gutter.h, indent.c, input-method-xlib.c, insdel.c, keymap.c, keymap.h, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-canna.c, mule-ccl.c, mule-charset.c, mule-wnnfns.c, native-gtk-toolbar.c, objects-msw.c, objects-tty.c, objects-x.c, objects.c, objects.h, opaque.c, opaque.h, postgresql.c, postgresql.h, print.c, process-unix.c, process.c, process.h, rangetab.c, rangetab.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, scrollbar.h, search.c, select-gtk.c, select-x.c, sound.c, specifier.c, specifier.h, strftime.c, symbols.c, symeval.h, syntax.h, text.c, text.h, toolbar-common.c, toolbar-msw.c, toolbar.c, toolbar.h, tooltalk.c, tooltalk.h, ui-gtk.c, ui-gtk.h, undo.c, vm-limit.c, window.c, window.h: Eliminate XSETFOO. Replace all usages with wrap_foo().
Make symbol->name a Lisp_Object, not Lisp_String *. Eliminate
nearly all uses of Lisp_String * in favor of Lisp_Object, and
correct macros so most of them favor Lisp_Object.
Create new error-behavior ERROR_ME_DEBUG_WARN -- output warnings,
but at level `debug' (usually ignored). Use it when instantiating
specifiers, so problems can be debugged. Move
log-warning-minimum-level into C so that we can optimize
ERROR_ME_DEBUG_WARN.
Fix warning levels consistent with new definitions.
Add default_ and parent fields to char table; not yet implemented.
New fun Dynarr_verify(); use for further error checking on Dynarrs.
Rearrange code at top of lisp.h in conjunction with dynarr changes.
Fix eifree(). Use Eistrings in various places
(format_event_object(), where_is_to_char(), and callers thereof)
to avoid fixed-size strings buffers. New fun write_eistring().
Reindent and fix GPM code to follow standards.
Set default MS Windows font to Lucida Console (same size as
Courier New but less interline spacing, so more lines fit).
Increase default frame size on Windows to 50 lines. (If that's too
big for the workspace, the frame will be shrunk as necessary.)
Fix problem with text files with no newlines (). (Change
`convert-eol' coding system to use `nil' for autodetect,
consistent with make-coding-system.)
Correct compile warnings in vm-limit.c.
Fix handling of reverse-direction charsets to avoid errors when
opening (e.g.) mule-ucs/lisp/reldata/uiso8859-6.el.
Recode some object printing methods to use write_fmt_string()
instead of a fixed buffer and sprintf.
Turn on display of png comments as warnings (level `info'), now
that they're unobtrusive.
Revamped the sound documentation.
Fixed bug in redisplay w.r.t. hscroll/truncation/continuation
glyphs causing jumping up and down of the lines, since they're
bigger than the line size. (It was seen most obviously when
there's a horizontal scroll bar, e.g. do C-h a glyph or something
like that.) The problem was that the glyph-contrib-p setting on
glyphs was ignored even if it was set properly, which it wasn't
until now.
author | ben |
---|---|
date | Fri, 29 Mar 2002 04:49:13 +0000 |
parents | 943eaba38521 |
children | a5954632b187 |
line wrap: on
line source
/* XEmacs routines to deal with case tables. Copyright (C) 1987, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2002 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.28. Between FSF 19.28 and 19.30, casetab.c was rewritten to use junky FSF char tables. Meanwhile I rewrote it to use more logical char tables. --ben */ /* Written by Howard Gayle. See some mythical and not-in-the-Emacs- distribution file chartab.c for details. */ /* Modified for Mule by Ben Wing. */ /* #### Someone (Yoshiki?) wrote the following comment, which I don't understand. Case tables consist of four char-tables. These are for downcase, upcase, canonical and equivalent respectively. The entries are like this: downcase: a -> a, A -> a. upcase: a -> A, A -> a. (The latter is for NOCASEP.) canon: a -> a, A -> a. eqv: a -> A, A -> a. */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "opaque.h" #include "chartab.h" #include "casetab.h" Lisp_Object Qcase_tablep, Qdowncase, Qupcase; Lisp_Object Vstandard_case_table; static void compute_trt_inverse (Lisp_Object trt, Lisp_Object inverse); Lisp_Object case_table_char (Lisp_Object ch, Lisp_Object table); #define STRING256_P(obj) ((STRINGP (obj) && XSTRING_CHAR_LENGTH (obj) == 256)) static Lisp_Object mark_case_table (Lisp_Object obj) { Lisp_Case_Table *ct = XCASE_TABLE (obj); mark_object (CASE_TABLE_DOWNCASE (ct)); mark_object (CASE_TABLE_UPCASE (ct)); mark_object (CASE_TABLE_CANON (ct)); mark_object (CASE_TABLE_EQV (ct)); return Qnil; } static void print_case_table (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { Lisp_Case_Table *ct = XCASE_TABLE (obj); char buf[200]; if (print_readably) printing_unreadable_object ("#<case-table 0x%x", ct->header.uid); write_c_string ("#<case-table ", printcharfun); sprintf (buf, "0x%x>", ct->header.uid); write_c_string (buf, printcharfun); } static const struct lrecord_description case_table_description [] = { { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, downcase_table) }, { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, upcase_table) }, { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, case_canon_table) }, { XD_LISP_OBJECT, offsetof (Lisp_Case_Table, case_eqv_table) }, { XD_END } }; DEFINE_LRECORD_IMPLEMENTATION ("case-table", case_table, mark_case_table, print_case_table, 0, 0, 0, case_table_description, Lisp_Case_Table); static Lisp_Object allocate_case_table (void) { Lisp_Case_Table *ct = alloc_lcrecord_type (Lisp_Case_Table, &lrecord_case_table); SET_CASE_TABLE_DOWNCASE (ct, Qnil); SET_CASE_TABLE_UPCASE (ct, Qnil); SET_CASE_TABLE_CANON (ct, Qnil); SET_CASE_TABLE_EQV (ct, Qnil); return wrap_case_table (ct); } DEFUN ("case-table-p", Fcase_table_p, 1, 1, 0, /* Return t if OBJECT is a case table. See `set-case-table' for more information on these data structures. */ (object)) { if (CASE_TABLEP (object)) return Qt; else { Lisp_Object down, up, canon, eqv; if (!CONSP (object)) return Qnil; down = XCAR (object); object = XCDR (object); if (!CONSP (object)) return Qnil; up = XCAR (object); object = XCDR (object); if (!CONSP (object)) return Qnil; canon = XCAR (object); object = XCDR (object); if (!CONSP (object)) return Qnil; eqv = XCAR (object); return ((STRING256_P (down) && (NILP (up) || STRING256_P (up)) && ((NILP (canon) && NILP (eqv)) || STRING256_P (canon)) && (NILP (eqv) || STRING256_P (eqv))) ? Qt : Qnil); } } static Lisp_Object check_case_table (Lisp_Object object) { /* This function can GC */ while (NILP (Fcase_table_p (object))) object = wrong_type_argument (Qcase_tablep, object); return object; } Lisp_Object case_table_char (Lisp_Object ch, Lisp_Object table) { Lisp_Object ct_char; ct_char = get_char_table (XCHAR (ch), XCHAR_TABLE (table)); if (NILP (ct_char)) return ch; else return ct_char; } DEFUN ("get-case-table", Fget_case_table, 3, 3, 0, /* Return CHAR-CASE version of CHARACTER in CASE-TABLE. CHAR-CASE is either downcase or upcase. */ (char_case, character, case_table)) { CHECK_CHAR (character); CHECK_CASE_TABLE (case_table); if (EQ (char_case, Qdowncase)) return case_table_char (character, XCASE_TABLE_DOWNCASE (case_table)); else if (EQ (char_case, Qupcase)) return case_table_char (character, XCASE_TABLE_UPCASE (case_table)); else invalid_constant ("Char case must be downcase or upcase", char_case); return Qnil; /* Not reached. */ } DEFUN ("put-case-table", Fput_case_table, 4, 4, 0, /* Set CHAR-CASE version of CHARACTER to be VALUE in CASE-TABLE. CHAR-CASE is either downcase or upcase. See also `put-case-table-pair'. */ (char_case, character, value, case_table)) { CHECK_CHAR (character); CHECK_CHAR (value); if (EQ (char_case, Qdowncase)) { Fput_char_table (character, value, XCASE_TABLE_DOWNCASE (case_table)); /* This one is not at all intuitive. */ Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table)); Fput_char_table (character, value, XCASE_TABLE_CANON (case_table)); Fput_char_table (value, value, XCASE_TABLE_CANON (case_table)); Fput_char_table (value, character, XCASE_TABLE_EQV (case_table)); Fput_char_table (character, value, XCASE_TABLE_EQV (case_table)); } else if (EQ (char_case, Qupcase)) { Fput_char_table (character, value, XCASE_TABLE_UPCASE (case_table)); Fput_char_table (character, character, XCASE_TABLE_DOWNCASE (case_table)); Fput_char_table (character, character, XCASE_TABLE_CANON (case_table)); Fput_char_table (value, character, XCASE_TABLE_CANON (case_table)); Fput_char_table (value, character, XCASE_TABLE_EQV (case_table)); Fput_char_table (character, value, XCASE_TABLE_EQV (case_table)); } else invalid_constant ("Char case must be downcase or upcase", char_case); return Qnil; } DEFUN ("put-case-table-pair", Fput_case_table_pair, 3, 3, 0, /* Make UC and LC a pair of inter-case-converting letters in CASE-TABLE. UC is an uppercase character and LC is a downcase character. */ (uc, lc, case_table)) { CHECK_CHAR (uc); CHECK_CHAR (lc); CHECK_CASE_TABLE (case_table); Fput_char_table (lc, lc, XCASE_TABLE_DOWNCASE (case_table)); Fput_char_table (uc, lc, XCASE_TABLE_UPCASE (case_table)); Fput_char_table (uc, lc, XCASE_TABLE_DOWNCASE (case_table)); Fput_char_table (lc, uc, XCASE_TABLE_UPCASE (case_table)); Fput_char_table (lc, lc, XCASE_TABLE_CANON (case_table)); Fput_char_table (uc, lc, XCASE_TABLE_CANON (case_table)); Fput_char_table (uc, lc, XCASE_TABLE_EQV (case_table)); Fput_char_table (lc, uc, XCASE_TABLE_EQV (case_table)); return Qnil; } DEFUN ("copy-case-table", Fcopy_case_table, 1, 1, 0, /* Return a new case table which is a copy of CASE-TABLE */ (case_table)) { Lisp_Object new_obj; CHECK_CASE_TABLE (case_table); new_obj = allocate_case_table (); XSET_CASE_TABLE_DOWNCASE (new_obj, Fcopy_char_table (XCASE_TABLE_DOWNCASE (case_table))); XSET_CASE_TABLE_UPCASE (new_obj, Fcopy_char_table (XCASE_TABLE_UPCASE (case_table))); XSET_CASE_TABLE_CANON (new_obj, Fcopy_char_table (XCASE_TABLE_CANON (case_table))); XSET_CASE_TABLE_EQV (new_obj, Fcopy_char_table (XCASE_TABLE_EQV (case_table))); return new_obj; } DEFUN ("current-case-table", Fcurrent_case_table, 0, 1, 0, /* Return the case table of BUFFER, which defaults to the current buffer. */ (buffer)) { struct buffer *buf = decode_buffer (buffer, 0); return buf->case_table; } DEFUN ("standard-case-table", Fstandard_case_table, 0, 0, 0, /* Return the standard case table. This is the one used for new buffers. */ ()) { return Vstandard_case_table; } static Lisp_Object set_case_table (Lisp_Object table, int standard); DEFUN ("set-case-table", Fset_case_table, 1, 1, 0, /* Select CASE-TABLE as the new case table for the current buffer. A case table is a case-table object or list (DOWNCASE UPCASE CANONICALIZE EQUIVALENCES) where each element is either nil or a string of length 256. The latter is provided for backward-compatibility. DOWNCASE maps each character to its lower-case equivalent. UPCASE maps each character to its upper-case equivalent; if lower and upper case characters are in 1-1 correspondence, you may use nil and the upcase table will be deduced from DOWNCASE. CANONICALIZE maps each character to a canonical equivalent; any two characters that are related by case-conversion have the same canonical equivalent character; it may be nil, in which case it is deduced from DOWNCASE and UPCASE. EQUIVALENCES is a map that cyclicly permutes each equivalence class (of characters with the same canonical equivalent); it may be nil, in which case it is deduced from CANONICALIZE. See also `get-case-table', `put-case-table' and `put-case-table-pair'. */ (case_table)) { /* This function can GC */ return set_case_table (case_table, 0); } DEFUN ("set-standard-case-table", Fset_standard_case_table, 1, 1, 0, /* Select CASE-TABLE as the new standard case table for new buffers. See `set-case-table' for more info on case tables. */ (case_table)) { /* This function can GC */ return set_case_table (case_table, 1); } static Lisp_Object set_case_table (Lisp_Object table, int standard) { /* This function can GC */ struct buffer *buf = standard ? XBUFFER(Vbuffer_defaults) : current_buffer; check_case_table (table); if (CASE_TABLEP (table)) { if (standard) Vstandard_case_table = table; buf->case_table = table; } else { /* For backward compatibility. */ Lisp_Object down, up, canon, eqv, tail = table; Lisp_Object temp; int i; down = XCAR (tail); tail = XCDR (tail); up = XCAR (tail); tail = XCDR (tail); canon = XCAR (tail); tail = XCDR (tail); eqv = XCAR (tail); temp = down; down = MAKE_TRT_TABLE (); for (i = 0; i < 256; i++) SET_TRT_TABLE_CHAR_1 (down, i, XSTRING_CHAR (temp, i)); if (NILP (up)) { up = MAKE_TRT_TABLE (); compute_trt_inverse (down, up); } else { temp = up; up = MAKE_TRT_TABLE (); for (i = 0; i < 256; i++) SET_TRT_TABLE_CHAR_1 (up, i, XSTRING_CHAR (temp, i)); } if (NILP (canon)) { canon = MAKE_TRT_TABLE (); /* Set up the CANON table; for each character, this sequence of upcasing and downcasing ought to get the "preferred" lowercase equivalent. */ for (i = 0; i < 256; i++) SET_TRT_TABLE_CHAR_1 (canon, i, TRT_TABLE_CHAR_1 (down, TRT_TABLE_CHAR_1 (up, TRT_TABLE_CHAR_1 (down, i)))); } else { temp = canon; canon = MAKE_TRT_TABLE (); for (i = 0; i < 256; i++) SET_TRT_TABLE_CHAR_1 (canon, i, XSTRING_CHAR (temp, i)); } if (NILP (eqv)) { eqv = MAKE_TRT_TABLE (); compute_trt_inverse (canon, eqv); } else { temp = eqv; eqv = MAKE_TRT_TABLE (); for (i = 0; i < 256; i++) SET_TRT_TABLE_CHAR_1 (eqv, i, XSTRING_CHAR (temp, i)); } if (standard) { XSET_CASE_TABLE_DOWNCASE (Vstandard_case_table, down); XSET_CASE_TABLE_UPCASE (Vstandard_case_table, up); XSET_CASE_TABLE_CANON (Vstandard_case_table, canon); XSET_CASE_TABLE_EQV (Vstandard_case_table, eqv); } buf->case_table = allocate_case_table (); XSET_CASE_TABLE_DOWNCASE (buf->case_table, down); XSET_CASE_TABLE_UPCASE (buf->case_table, up); XSET_CASE_TABLE_CANON (buf->case_table, canon); XSET_CASE_TABLE_EQV (buf->case_table, eqv); } return buf->case_table; } /* Given a translate table TRT, store the inverse mapping into INVERSE. Since TRT is not one-to-one, INVERSE is not a simple mapping. Instead, it divides the space of characters into equivalence classes. All characters in a given class form one circular list, chained through the elements of INVERSE. */ static void compute_trt_inverse (Lisp_Object trt, Lisp_Object inverse) { Charcount i = 0400; Emchar c, q; while (--i) SET_TRT_TABLE_CHAR_1 (inverse, i, (Emchar) i); i = 0400; while (--i) { if ((q = TRT_TABLE_CHAR_1 (trt, i)) != (Emchar) i) { c = TRT_TABLE_CHAR_1 (inverse, q); SET_TRT_TABLE_CHAR_1 (inverse, q, (Emchar) i); SET_TRT_TABLE_CHAR_1 (inverse, i, c); } } } void syms_of_casetab (void) { INIT_LRECORD_IMPLEMENTATION (case_table); DEFSYMBOL_MULTIWORD_PREDICATE (Qcase_tablep); DEFSYMBOL (Qdowncase); DEFSYMBOL (Qupcase); DEFSUBR (Fcase_table_p); DEFSUBR (Fget_case_table); DEFSUBR (Fput_case_table); DEFSUBR (Fput_case_table_pair); DEFSUBR (Fcurrent_case_table); DEFSUBR (Fstandard_case_table); DEFSUBR (Fcopy_case_table); DEFSUBR (Fset_case_table); DEFSUBR (Fset_standard_case_table); } void complex_vars_of_casetab (void) { REGISTER Emchar i; Lisp_Object tem; staticpro (&Vstandard_case_table); Vstandard_case_table = allocate_case_table (); tem = MAKE_TRT_TABLE (); XSET_CASE_TABLE_DOWNCASE (Vstandard_case_table, tem); XSET_CASE_TABLE_CANON (Vstandard_case_table, tem); /* Under Mule, can't do set_string_char() until Vcharset_control_1 and Vcharset_ascii are initialized. */ for (i = 0; i < 256; i++) { unsigned char lowered = tolower (i); SET_TRT_TABLE_CHAR_1 (tem, i, lowered); } tem = MAKE_TRT_TABLE (); XSET_CASE_TABLE_UPCASE (Vstandard_case_table, tem); XSET_CASE_TABLE_EQV (Vstandard_case_table, tem); for (i = 0; i < 256; i++) { unsigned char flipped = (isupper (i) ? tolower (i) : (islower (i) ? toupper (i) : i)); SET_TRT_TABLE_CHAR_1 (tem, i, flipped); } }