Mercurial > hg > xemacs-beta
view lisp/x-compose.el @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program 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.
#
# This program 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.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
author | ben |
---|---|
date | Thu, 20 Sep 2001 06:31:11 +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