Mercurial > hg > xemacs-beta
view lisp/x-compose.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, 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-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 3ecd8885ac67 |
children | a25c824ed558 |
line wrap: on
line source
;;; x-compose.el --- Compose-key processing in XEmacs ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@jwz.org> ;; Maintainer: XEmacs Development Team ;; Rewritten by Martin Buchholz far too many times. ;; ;; Changed: 11 Jun 1997 by Heiko Muenkel <muenkel@tnt.uni-hannover.de> ;; The degree sign couldn't be inserted with the old version. ;; Keywords: i18n ;; 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: Not in FSF. ;;; Commentary: ;; created by jwz, 14-jun-92. ;;; changed by Jan Vroonhof, July 1997: Use function-key-map instead ;;; of global map. ;;; Preliminary support for ;;; XFree86 deadkeys ;; This file implements DEC-, OpenWindows-, and HP-compatible "Compose" ;; processing for XEmacs. ;; If you are running a version of X which already does compose processing, ;; then you don't need this file. But the MIT R4 and R5 distributions don't ;; do compose processing, so you may want to fake it by using this code. ;; The basic idea is that there are several ways to generate keysyms which ;; do not have keys devoted to them on your keyboard. ;; The first method is by using "dead" keys. A dead key is a key which, ;; when typed, does not insert a character. Instead it modifies the ;; following character typed. So if you typed "dead-tilde" followed by "A", ;; then "A-tilde" would be inserted. Of course, this requires you to modify ;; your keyboard to include a "dead-tilde" key on it somewhere. ;; The second method is by using a "Compose" key. With a Compose key, you ;; would type "Compose" then "tilde" then "A" to insert "A-tilde". ;; There are a small number of dead keys: acute, grave, cedilla, diaeresis, ;; circumflex, tilde, and ring. There are a larger number of accented and ;; other characters accessible via the Compose key, so both are useful. ;; To use this code, you will need to have a Compose key on your keyboard. ;; The default configuration of most X keyboards doesn't contain one. You ;; can, for example, turn the right "Meta" key into a "Compose" key with ;; this command: ;; xmodmap -e "remove mod1 = Meta_R" -e "keysym Meta_R = Multi_key" ;; Multi-key is the name that X (and emacs) know the "Compose" key by. ;; The "remove..." command is necessary because the "Compose" key must not ;; have any modifier bits associated with it. This exact command may not ;; work, depending on what system and keyboard you are using. If it ;; doesn't, you'll have to read the man page for xmodmap. You might want ;; to get the "xkeycaps" program from ;; <URL:http://www.jwz.org/xkeycaps/>, ;; which is a graphical front end to xmodmap ;; that hides xmodmap's arcane syntax from you. ;; If for some reason you don't want to have a dedicated compose key on your ;; keyboard, you can use some other key as the prefix. For example, to make ;; "Meta-Shift-C" act as a compose key (so that "M-C , c" would insert the ;; character "ccedilla") you could do ;; (global-set-key "\M-C" compose-map) ;; I believe the bindings encoded in this file are the same as those used ;; by OpenWindows versions 2 and 3, and DEC VT320 terminals. Please let me ;; know if you think otherwise. ;; Much thanks to Justin Bur <justin@crim.ca> for helping me understand how ;; this stuff is supposed to work. ;; You also might want to consider getting Justin's patch for the MIT Xlib ;; that implements compose processing in the library. This will enable ;; compose processing in applications other than emacs as well. You can ;; get it from export.lcs.mit.edu in contrib/compose.tar.Z. ;; This code has one feature that a more "builtin" Compose mechanism could ;; not have: at any point you can type C-h to get a list of the possible ;; completions of what you have typed so far. ;;; Code: (require 'x-iso8859-1) (macrolet ((define-compose-map (keymap-symbol) `(progn (defconst ,keymap-symbol (make-sparse-keymap ',keymap-symbol)) ;; Required to tell XEmacs the keymaps were actually autoloaded. ;; #### Make this unnecessary! (fset ',keymap-symbol ,keymap-symbol)))) (define-compose-map compose-map) (define-compose-map compose-acute-map) (define-compose-map compose-grave-map) (define-compose-map compose-cedilla-map) (define-compose-map compose-diaeresis-map) (define-compose-map compose-circumflex-map) (define-compose-map compose-tilde-map) (define-compose-map compose-ring-map)) (define-key compose-map 'acute compose-acute-map) (define-key compose-map 'grave compose-grave-map) (define-key compose-map 'cedilla compose-cedilla-map) (define-key compose-map 'diaeresis compose-diaeresis-map) (define-key compose-map 'circumflex compose-circumflex-map) (define-key compose-map 'tilde compose-tilde-map) (define-key compose-map 'degree compose-ring-map) ;;(define-key function-key-map [multi-key] compose-map) ;; The following is necessary, because one can't rebind [degree] ;; and use it to insert the degree sign! ;;(defun compose-insert-degree () ;; "Inserts a degree sign." ;; (interactive) ;; (insert ?\260)) (define-key compose-map [acute] compose-acute-map) (define-key compose-map [?'] compose-acute-map) (define-key compose-map [grave] compose-grave-map) (define-key compose-map [?`] compose-grave-map) (define-key compose-map [cedilla] compose-cedilla-map) (define-key compose-map [?,] compose-cedilla-map) (define-key compose-map [diaeresis] compose-diaeresis-map) (define-key compose-map [?\"] compose-diaeresis-map) (define-key compose-map [circumflex] compose-circumflex-map) (define-key compose-map [?^] compose-circumflex-map) (define-key compose-map [tilde] compose-tilde-map) (define-key compose-map [~] compose-tilde-map) (define-key compose-map [degree] compose-ring-map) (define-key compose-map [?*] compose-ring-map) ;;; The contents of the "dead key" maps. These are shared by the ;;; compose-map. (define-key compose-acute-map [space] "'") (define-key compose-acute-map [?'] [acute]) (define-key compose-acute-map [?A] [Aacute]) (define-key compose-acute-map [E] [Eacute]) (define-key compose-acute-map [I] [Iacute]) (define-key compose-acute-map [O] [Oacute]) (define-key compose-acute-map [U] [Uacute]) (define-key compose-acute-map [Y] [Yacute]) (define-key compose-acute-map [a] [aacute]) (define-key compose-acute-map [e] [eacute]) (define-key compose-acute-map [i] [iacute]) (define-key compose-acute-map [o] [oacute]) (define-key compose-acute-map [u] [uacute]) (define-key compose-acute-map [y] [yacute]) (define-key compose-grave-map [space] "`") (define-key compose-grave-map [?`] [grave]) (define-key compose-grave-map [A] [Agrave]) (define-key compose-grave-map [E] [Egrave]) (define-key compose-grave-map [I] [Igrave]) (define-key compose-grave-map [O] [Ograve]) (define-key compose-grave-map [U] [Ugrave]) (define-key compose-grave-map [a] [agrave]) (define-key compose-grave-map [e] [egrave]) (define-key compose-grave-map [i] [igrave]) (define-key compose-grave-map [o] [ograve]) (define-key compose-grave-map [u] [ugrave]) (define-key compose-cedilla-map [space] ",") (define-key compose-cedilla-map [?,] [cedilla]) (define-key compose-cedilla-map [C] [Ccedilla]) (define-key compose-cedilla-map [c] [ccedilla]) (define-key compose-diaeresis-map [space] [diaeresis]) (define-key compose-diaeresis-map [?\"] [diaeresis]) (define-key compose-diaeresis-map [A] [Adiaeresis]) (define-key compose-diaeresis-map [E] [Ediaeresis]) (define-key compose-diaeresis-map [I] [Idiaeresis]) (define-key compose-diaeresis-map [O] [Odiaeresis]) (define-key compose-diaeresis-map [U] [Udiaeresis]) (define-key compose-diaeresis-map [a] [adiaeresis]) (define-key compose-diaeresis-map [e] [ediaeresis]) (define-key compose-diaeresis-map [i] [idiaeresis]) (define-key compose-diaeresis-map [o] [odiaeresis]) (define-key compose-diaeresis-map [u] [udiaeresis]) (define-key compose-diaeresis-map [y] [ydiaeresis]) (define-key compose-circumflex-map [space] "^") (define-key compose-circumflex-map [?/] "|") (define-key compose-circumflex-map [?!] [brokenbar]) (define-key compose-circumflex-map [?-] [macron]) (define-key compose-circumflex-map [?_] [macron]) (define-key compose-circumflex-map [?0] [degree]) (define-key compose-circumflex-map [?1] [onesuperior]) (define-key compose-circumflex-map [?2] [twosuperior]) (define-key compose-circumflex-map [?3] [threesuperior]) (define-key compose-circumflex-map [?.] [periodcentered]) (define-key compose-circumflex-map [A] [Acircumflex]) (define-key compose-circumflex-map [E] [Ecircumflex]) (define-key compose-circumflex-map [I] [Icircumflex]) (define-key compose-circumflex-map [O] [Ocircumflex]) (define-key compose-circumflex-map [U] [Ucircumflex]) (define-key compose-circumflex-map [a] [acircumflex]) (define-key compose-circumflex-map [e] [ecircumflex]) (define-key compose-circumflex-map [i] [icircumflex]) (define-key compose-circumflex-map [o] [ocircumflex]) (define-key compose-circumflex-map [u] [ucircumflex]) (define-key compose-tilde-map [space] "~") (define-key compose-tilde-map [A] [Atilde]) (define-key compose-tilde-map [N] [Ntilde]) (define-key compose-tilde-map [O] [Otilde]) (define-key compose-tilde-map [a] [atilde]) (define-key compose-tilde-map [n] [ntilde]) (define-key compose-tilde-map [o] [otilde]) (define-key compose-ring-map [space] [degree]) (define-key compose-ring-map [A] [Aring]) (define-key compose-ring-map [a] [aring]) ;;; The rest of the compose-map. These are the composed characters ;;; that are not accessible via "dead" keys. (define-key compose-map " '" "'") (define-key compose-map " ^" "^") (define-key compose-map " `" "`") (define-key compose-map " ~" "~") (define-key compose-map " " [nobreakspace]) (define-key compose-map " \"" [diaeresis]) (define-key compose-map " :" [diaeresis]) (define-key compose-map " *" [degree]) (define-key compose-map "!!" [exclamdown]) (define-key compose-map "!^" [brokenbar]) (define-key compose-map "!S" [section]) (define-key compose-map "!s" [section]) (define-key compose-map "!P" [paragraph]) (define-key compose-map "!p" [paragraph]) (define-key compose-map "((" "[") (define-key compose-map "(-" "{") (define-key compose-map "))" "]") (define-key compose-map ")-" "}") (define-key compose-map "++" "#") (define-key compose-map "+-" [plusminus]) (define-key compose-map "-(" "{") (define-key compose-map "-)" "}") (define-key compose-map "--" "-") (define-key compose-map "-L" [sterling]) (define-key compose-map "-l" [sterling]) (define-key compose-map "-Y" [yen]) (define-key compose-map "-y" [yen]) (define-key compose-map "-," [notsign]) (define-key compose-map "-|" [notsign]) (define-key compose-map "-^" [macron]) (define-key compose-map "-+" [plusminus]) (define-key compose-map "-:" [division]) (define-key compose-map "-D" [ETH]) (define-key compose-map "-d" [eth]) (define-key compose-map "-a" [ordfeminine]) (define-key compose-map ".^" [periodcentered]) (define-key compose-map "//" "\\") (define-key compose-map "/<" "\\") (define-key compose-map "/^" "|") (define-key compose-map "/C" [cent]) (define-key compose-map "/c" [cent]) (define-key compose-map "/U" [mu]) (define-key compose-map "/u" [mu]) (define-key compose-map "/O" [Ooblique]) (define-key compose-map "/o" [oslash]) (define-key compose-map "0X" [currency]) (define-key compose-map "0x" [currency]) (define-key compose-map "0S" [section]) (define-key compose-map "0s" [section]) (define-key compose-map "0C" [copyright]) (define-key compose-map "0c" [copyright]) (define-key compose-map "0R" [registered]) (define-key compose-map "0r" [registered]) (define-key compose-map "0^" [degree]) (define-key compose-map "1^" [onesuperior]) (define-key compose-map "14" [onequarter]) (define-key compose-map "12" [onehalf]) (define-key compose-map "2^" [twosuperior]) (define-key compose-map "3^" [threesuperior]) (define-key compose-map "34" [threequarters]) (define-key compose-map ":-" [division]) (define-key compose-map "</" "\\") (define-key compose-map "<<" [guillemotleft]) (define-key compose-map "=L" [sterling]) (define-key compose-map "=l" [sterling]) (define-key compose-map "=Y" [yen]) (define-key compose-map "=y" [yen]) (define-key compose-map ">>" [guillemotright]) (define-key compose-map "??" [questiondown]) (define-key compose-map "AA" "@") (define-key compose-map "Aa" "@") (define-key compose-map "A_" [ordfeminine]) (define-key compose-map "A`" [Agrave]) (define-key compose-map "A'" [Aacute]) (define-key compose-map "A^" [Acircumflex]) (define-key compose-map "A~" [Atilde]) (define-key compose-map "A\"" [Adiaeresis]) (define-key compose-map "A*" [Aring]) (define-key compose-map "AE" [AE]) (define-key compose-map "C/" [cent]) (define-key compose-map "C|" [cent]) (define-key compose-map "C0" [copyright]) (define-key compose-map "CO" [copyright]) (define-key compose-map "Co" [copyright]) (define-key compose-map "C," [Ccedilla]) (define-key compose-map "D-" [ETH]) (define-key compose-map "E`" [Egrave]) (define-key compose-map "E'" [Eacute]) (define-key compose-map "E^" [Ecircumflex]) (define-key compose-map "E\"" [Ediaeresis]) (define-key compose-map "I`" [Igrave]) (define-key compose-map "I'" [Iacute]) (define-key compose-map "I^" [Icircumflex]) (define-key compose-map "I\"" [Idiaeresis]) (define-key compose-map "L-" [sterling]) (define-key compose-map "L=" [sterling]) (define-key compose-map "N~" [Ntilde]) (define-key compose-map "OX" [currency]) (define-key compose-map "Ox" [currency]) (define-key compose-map "OS" [section]) (define-key compose-map "Os" [section]) (define-key compose-map "OC" [copyright]) (define-key compose-map "Oc" [copyright]) (define-key compose-map "OR" [registered]) (define-key compose-map "Or" [registered]) (define-key compose-map "O_" [masculine]) (define-key compose-map "O`" [Ograve]) (define-key compose-map "O'" [Oacute]) (define-key compose-map "O^" [Ocircumflex]) (define-key compose-map "O~" [Otilde]) (define-key compose-map "O\"" [Odiaeresis]) (define-key compose-map "O/" [Ooblique]) (define-key compose-map "P!" [paragraph]) (define-key compose-map "R0" [registered]) (define-key compose-map "RO" [registered]) (define-key compose-map "Ro" [registered]) (define-key compose-map "S!" [section]) (define-key compose-map "S0" [section]) (define-key compose-map "SO" [section]) (define-key compose-map "So" [section]) (define-key compose-map "SS" [ssharp]) (define-key compose-map "TH" [THORN]) (define-key compose-map "U`" [Ugrave]) (define-key compose-map "U'" [Uacute]) (define-key compose-map "U^" [Ucircumflex]) (define-key compose-map "U\"" [Udiaeresis]) (define-key compose-map "X0" [currency]) (define-key compose-map "XO" [currency]) (define-key compose-map "Xo" [currency]) (define-key compose-map "Y-" [yen]) (define-key compose-map "Y=" [yen]) (define-key compose-map "Y'" [Yacute]) (define-key compose-map "_A" [ordfeminine]) (define-key compose-map "_a" [ordfeminine]) (define-key compose-map "_^" [macron]) (define-key compose-map "_O" [masculine]) (define-key compose-map "_o" [masculine]) (define-key compose-map "aA" "@") (define-key compose-map "aa" "@") (define-key compose-map "a_" [ordfeminine]) (define-key compose-map "a-" [ordfeminine]) (define-key compose-map "a`" [agrave]) (define-key compose-map "a'" [aacute]) (define-key compose-map "a^" [acircumflex]) (define-key compose-map "a~" [atilde]) (define-key compose-map "a\"" [adiaeresis]) (define-key compose-map "a*" [aring]) (define-key compose-map "ae" [ae]) (define-key compose-map "c/" [cent]) (define-key compose-map "c|" [cent]) (define-key compose-map "c0" [copyright]) (define-key compose-map "cO" [copyright]) (define-key compose-map "co" [copyright]) (define-key compose-map "c," [ccedilla]) (define-key compose-map "d-" [eth]) (define-key compose-map "e`" [egrave]) (define-key compose-map "e'" [eacute]) (define-key compose-map "e^" [ecircumflex]) (define-key compose-map "e\"" [ediaeresis]) (define-key compose-map "i`" [igrave]) (define-key compose-map "i'" [iacute]) (define-key compose-map "i^" [icircumflex]) (define-key compose-map "i\"" [idiaeresis]) (define-key compose-map "i:" [idiaeresis]) (define-key compose-map "l-" [sterling]) (define-key compose-map "l=" [sterling]) (define-key compose-map "n~" [ntilde]) (define-key compose-map "oX" [currency]) (define-key compose-map "ox" [currency]) (define-key compose-map "oC" [copyright]) (define-key compose-map "oc" [copyright]) (define-key compose-map "oR" [registered]) (define-key compose-map "or" [registered]) (define-key compose-map "oS" [section]) (define-key compose-map "os" [section]) (define-key compose-map "o_" [masculine]) (define-key compose-map "o`" [ograve]) (define-key compose-map "o'" [oacute]) (define-key compose-map "o^" [ocircumflex]) (define-key compose-map "o~" [otilde]) (define-key compose-map "o\"" [odiaeresis]) (define-key compose-map "o/" [oslash]) (define-key compose-map "p!" [paragraph]) (define-key compose-map "r0" [registered]) (define-key compose-map "rO" [registered]) (define-key compose-map "ro" [registered]) (define-key compose-map "s!" [section]) (define-key compose-map "s0" [section]) (define-key compose-map "sO" [section]) (define-key compose-map "so" [section]) (define-key compose-map "ss" [ssharp]) (define-key compose-map "th" [thorn]) (define-key compose-map "u`" [ugrave]) (define-key compose-map "u'" [uacute]) (define-key compose-map "u^" [ucircumflex]) (define-key compose-map "u\"" [udiaeresis]) (define-key compose-map "u/" [mu]) (define-key compose-map "x0" [currency]) (define-key compose-map "xO" [currency]) (define-key compose-map "xo" [currency]) (define-key compose-map "xx" [multiply]) (define-key compose-map "y-" [yen]) (define-key compose-map "y=" [yen]) (define-key compose-map "y'" [yacute]) (define-key compose-map "y\"" [ydiaeresis]) (define-key compose-map "|C" [cent]) (define-key compose-map "|c" [cent]) (define-key compose-map "||" [brokenbar]) ;; Suppose we type these three physical keys: [Multi_key " a] ;; Xlib can deliver these keys as the following sequences of keysyms: ;; ;; - [Multi_key " a] (no surprise here) ;; - [adiaeresis] (OK, Xlib is doing compose processing for us) ;; - [Multi_key " adiaeresis] (Huh?) ;; ;; It is the last possibility that is arguably a bug. Xlib can't ;; decide whether it's really doing compose processing or not (or ;; actually, different parts of Xlib disagree). ;; ;; So we'll just convert [Multi_key " adiaeresis] to [adiaeresis] (defun xlib-input-method-bug-workaround (keymap) (map-keymap (lambda (key value) (cond ((keymapp value) (xlib-input-method-bug-workaround value)) ((and (sequencep value) (eq 1 (length value)) (null (lookup-key keymap value))) (define-key keymap value value)))) keymap)) (xlib-input-method-bug-workaround compose-map) (unintern 'xlib-input-method-bug-workaround) ;; While we're at it, a similar mechanism will make colon equivalent ;; to doublequote for diaeresis processing. Some Xlibs do this. (defun alias-colon-to-doublequote (keymap) (map-keymap (lambda (key value) (when (keymapp value) (alias-colon-to-doublequote value)) (when (eq key '\") (define-key keymap ":" value))) keymap)) (alias-colon-to-doublequote compose-map) (unintern 'alias-colon-to-doublequote) ;;; Electric dead keys: making a' mean a-acute. (defun electric-diacritic (&optional count) "Modify the previous character with an accent. For example, if `:' is bound to this command, then typing `a:' will first insert `a' and then turn it into `\344' (adiaeresis). The keys to which this command may be bound (and the accents which it understands) are: ' (acute) \301\311\315\323\332\335 \341\351\355\363\372\375 ` (grave) \300\310\314\322\331 \340\350\354\362\371 : (diaeresis) \304\313\317\326\334 \344\353\357\366\374\377 ^ (circumflex) \302\312\316\324\333 \342\352\356\364\373 , (cedilla) \307\347 . (ring) \305\345" (interactive "p") (or count (setq count 1)) (if (not (eq last-command 'self-insert-command)) ;; Only do the magic if the two chars were typed in succession. (self-insert-command count) ;; This is so that ``a : C-x u'' will transform `adiaeresis' back into `a:' (self-insert-command count) (undo-boundary) (delete-char (- count)) (let* ((c last-command-char) (map (cond ((eq c ?') compose-acute-map) ((eq c ?`) compose-grave-map) ((eq c ?,) compose-cedilla-map) ((eq c ?:) compose-diaeresis-map) ((eq c ?^) compose-circumflex-map) ((eq c ?~) compose-tilde-map) ((eq c ?.) compose-ring-map) (t (error "unknown diacritic: %s (%c)" c c)))) (base-char (preceding-char)) (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics? (<= (downcase base-char) ?z) (lookup-key map (make-string 1 base-char))))) (if (and (vectorp mod-char) (= (length mod-char) 1)) (setq mod-char (aref mod-char 0))) (if (and mod-char (symbolp mod-char)) (setq mod-char (or (get mod-char character-set-property) mod-char))) (if (and mod-char (> count 0)) (delete-char -1) (setq mod-char c)) (while (> count 0) (insert mod-char) (setq count (1- count)))))) ;; should "::" mean "¨" and ": " mean ":"? ;; should we also do ;; (?~ ;; (?A "\303") ;; (?C "\307") ;; (?D "\320") ;; (?N "\321") ;; (?O "\325") ;; (?a "\343") ;; (?c "\347") ;; (?d "\360") ;; (?n "\361") ;; (?o "\365") ;; (?> "\273") ;; (?< "\253") ;; (? "~")) ; no special code ;; (?\/ ;; (?A "\305") ;; A-with-ring (Norwegian and Danish) ;; (?E "\306") ;; AE-ligature (Norwegian and Danish) ;; (?O "\330") ;; (?a "\345") ;; a-with-ring (Norwegian and Danish) ;; (?e "\346") ;; ae-ligature (Norwegian and Danish) ;; (?o "\370") ;; (? "/")) ; no special code ;;; Providing help in the middle of a compose sequence. (Way cool.) (eval-when-compile (defsubst next-composable-event () (let (event) (while (progn (setq event (next-command-event)) (not (or (key-press-event-p event) (button-press-event-p event)))) (dispatch-event event)) event))) (defun compose-help (ignore-prompt) (let* ((keys (apply 'vector (nbutlast (append (this-command-keys) nil)))) (map (or (lookup-key function-key-map keys) (error "can't find map? %s %s" keys (this-command-keys)))) binding) (save-excursion (with-output-to-temp-buffer "*Help*" (set-buffer "*Help*") (erase-buffer) (message "Working...") (setq ctl-arrow 'compose) ; non-t-non-nil (insert "You are typing a compose sequence. So far you have typed: ") (insert (key-description keys)) (insert "\nCompletions from here are:\n\n") (map-keymap 'compose-help-mapper map t) (message "? "))) (while (keymapp map) (setq binding (lookup-key map (vector (next-composable-event)))) (if (null binding) (message "No such key in keymap. Try again.") (setq map binding))) binding)) (put 'compose-help 'isearch-command t) ; so that it doesn't terminate isearch (defun compose-help-mapper (key binding) (if (and (symbolp key) (get key character-set-property)) (setq key (get key character-set-property))) (if (eq binding 'compose-help) ; suppress that... nil (if (keymapp binding) (let ((p (point))) (map-keymap 'compose-help-mapper binding t) (goto-char p) (while (not (eobp)) (if (characterp key) (insert (make-string 1 key)) (insert (single-key-description key))) (insert " ") (forward-line 1))) (if (characterp key) (insert (make-string 1 key)) (insert (single-key-description key))) (indent-to 16) (let ((code (and (vectorp binding) (= 1 (length binding)) (get (aref binding 0) character-set-property)))) (if code (insert (make-string 1 code)) (if (stringp binding) (insert binding) (insert (prin1-to-string binding))))) (when (and (vectorp binding) (= 1 (length binding))) (indent-to 32) (insert (symbol-name (aref binding 0))))) (insert "\n"))) ;; define it at top-level in the compose map... ;;(define-key compose-map [(control h)] 'compose-help) ;;(define-key compose-map [help] 'compose-help) ;; and then define it in each sub-map of the compose map. (map-keymap (lambda (key binding) (when (keymapp binding) ;; (define-key binding [(control h)] 'compose-help) ;; (define-key binding [help] 'compose-help) )) compose-map nil) ;; Make redisplay display the accented letters (if (memq (default-value 'ctl-arrow) '(t nil)) (setq-default ctl-arrow 'iso-8859/1)) (provide 'x-compose) ;;; x-compose.el ends here