annotate lisp/x11/x-compose.el @ 207:e45d5e7c476e r20-4b2

Import from CVS: tag r20-4b2
author cvs
date Mon, 13 Aug 2007 10:03:52 +0200
parents b405438285a2
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
1 ;;; x-compose.el --- Compose-key processing in XEmacs
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
2
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
3 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
4
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
5 ;; Author: Jamie Zawinski <jwz@netscape.com>
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
6 ;; Maintainer: XEmacs Development Team
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
7 ;; Rewritten by Martin Buchholz far too many times.
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
8 ;;
159
3bb7ccffb0c0 Import from CVS: tag r20-3b6
cvs
parents: 155
diff changeset
9 ;; Changed: 11 Jun 1997 by Heiko Muenkel <muenkel@tnt.uni-hannover.de>
3bb7ccffb0c0 Import from CVS: tag r20-3b6
cvs
parents: 155
diff changeset
10 ;; The degree sign couldn't be inserted with the old version.
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
11 ;; Keywords: i18n
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 ;; This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 ;; XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 ;; under the terms of the GNU General Public License as published by
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17 ;; the Free Software Foundation; either version 2, or (at your option)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 ;; any later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 ;; XEmacs is distributed in the hope that it will be useful, but
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 ;; WITHOUT ANY WARRANTY; without even the implied warranty of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 ;; General Public License for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 ;; You should have received a copy of the GNU General Public License
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
26 ;; along with XEmacs; see the file COPYING. If not, write to the
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 50
diff changeset
27 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 50
diff changeset
28 ;; Boston, MA 02111-1307, USA.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
30 ;;; Synched up with: Not in FSF.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
31
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
32 ;;; Commentary:
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
33
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
34 ;; created by jwz, 14-jun-92.
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 159
diff changeset
35 ;;; changed by Jan Vroonhof, July 1997: Use function-key-map instead
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 159
diff changeset
36 ;;; of global map.
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 159
diff changeset
37 ;;; Preliminary support for
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 159
diff changeset
38 ;;; XFree86 deadkeys
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
39
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
40 ;; This file implements DEC-, OpenWindows-, and HP-compatible "Compose"
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
41 ;; processing for XEmacs.
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
42
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
43 ;; If you are running a version of X which already does compose processing,
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
44 ;; then you don't need this file. But the MIT R4 and R5 distributions don't
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
45 ;; do compose processing, so you may want to fake it by using this code.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
46
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
47 ;; The basic idea is that there are several ways to generate keysyms which
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
48 ;; do not have keys devoted to them on your keyboard.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
49
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
50 ;; The first method is by using "dead" keys. A dead key is a key which,
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
51 ;; when typed, does not insert a character. Instead it modifies the
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
52 ;; following character typed. So if you typed "dead-tilde" followed by "A",
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
53 ;; then "A-tilde" would be inserted. Of course, this requires you to modify
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
54 ;; your keyboard to include a "dead-tilde" key on it somewhere.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
55
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
56 ;; The second method is by using a "Compose" key. With a Compose key, you
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
57 ;; would type "Compose" then "tilde" then "A" to insert "A-tilde".
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
58
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
59 ;; There are a small number of dead keys: acute, grave, cedilla, diaeresis,
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
60 ;; circumflex, tilde, and ring. There are a larger number of accented and
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
61 ;; other characters accessible via the Compose key, so both are useful.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
62
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
63 ;; To use this code, you will need to have a Compose key on your keyboard.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
64 ;; The default configuration of most X keyboards doesn't contain one. You
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
65 ;; can, for example, turn the right "Meta" key into a "Compose" key with
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
66 ;; this command:
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
68 ;; xmodmap -e "remove mod1 = Meta_R" -e "keysym Meta_R = Multi_key"
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
69
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
70 ;; Multi-key is the name that X (and emacs) know the "Compose" key by.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
71 ;; The "remove..." command is necessary because the "Compose" key must not
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
72 ;; have any modifier bits associated with it. This exact command may not
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
73 ;; work, depending on what system and keyboard you are using. If it
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
74 ;; doesn't, you'll have to read the man page for xmodmap. You might want
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
75 ;; to get the "xkeycaps" program from the host export.lcs.mit.edu in the
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
76 ;; file contrib/xkeycaps.tar.Z, which is a graphical front end to xmodmap
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
77 ;; that hides xmodmap's arcane syntax from you.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
78
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
79 ;; If for some reason you don't want to have a dedicated compose key on your
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
80 ;; keyboard, you can use some other key as the prefix. For example, to make
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
81 ;; "Meta-Shift-C" act as a compose key (so that "M-C , c" would insert the
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
82 ;; character "ccedilla") you could do
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
83
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
84 ;; (global-set-key "\M-C" compose-map)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
86 ;; I believe the bindings encoded in this file are the same as those used
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
87 ;; by OpenWindows versions 2 and 3, and DEC VT320 terminals. Please let me
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
88 ;; know if you think otherwise.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
89
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
90 ;; Much thanks to Justin Bur <justin@crim.ca> for helping me understand how
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
91 ;; this stuff is supposed to work.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
92
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
93 ;; You also might want to consider getting Justin's patch for the MIT Xlib
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
94 ;; that implements compose processing in the library. This will enable
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
95 ;; compose processing in applications other than emacs as well. You can
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
96 ;; get it from export.lcs.mit.edu in contrib/compose.tar.Z.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
97
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
98 ;; This code has one feature that a more "builtin" Compose mechanism could
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
99 ;; not have: at any point you can type C-h to get a list of the possible
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
100 ;; completions of what you have typed so far.
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
101
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
102 ;;; Code:
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 (require 'x-iso8859-1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
106 (defun make-compose-map (map-sym)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
107 (let ((map (make-sparse-keymap)))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
108 (set map-sym map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
109 (set-keymap-name map map-sym)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
110 ;; Required to tell XEmacs the keymaps were actually autoloaded.
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
111 ;; #### Make this unnecessary!
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
112 (fset map-sym map)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
113
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
114 (make-compose-map 'compose-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
115 (make-compose-map 'compose-acute-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
116 (make-compose-map 'compose-grave-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
117 (make-compose-map 'compose-cedilla-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
118 (make-compose-map 'compose-diaeresis-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
119 (make-compose-map 'compose-circumflex-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
120 (make-compose-map 'compose-tilde-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
121 (make-compose-map 'compose-ring-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
122
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
123 (unintern 'make-compose-map)
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
124
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
125 (define-key compose-map 'acute compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
126 (define-key compose-map 'grave compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
127 (define-key compose-map 'cedilla compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
128 (define-key compose-map 'diaeresis compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
129 (define-key compose-map 'circumflex compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
130 (define-key compose-map 'tilde compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
131 (define-key compose-map 'degree compose-ring-map)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
132
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
133 ;;(eval-when-compile
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
134 ;; (defsubst define-dead-key-map (key map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
135 ;; (define-key function-key-map key map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
136 ;; (define-key compose-map key map)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
137
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
138 ;;;###utoload (autoload 'compose-map "x-compose" nil t 'keymap)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
139 ;;;###utoload (autoload 'compose-acute-map "x-compose" nil t 'keymap)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
140 ;;;###utoload (autoload 'compose-grave-map "x-compose" nil t 'keymap)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
141 ;;;###utoload (autoload 'compose-cedilla-map "x-compose" nil t 'keymap)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
142 ;;;###utoload (autoload 'compose-diaeresis-map "x-compose" nil t 'keymap)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
143 ;;;###utoload (autoload 'compose-degree-map "x-compose" nil t 'keymap)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
144 ;;;###utoload (define-key function-key-map [acute] 'compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
145 ;;;###utoload (define-key function-key-map [grave] 'compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
146 ;;;###utoload (define-key function-key-map [cedilla] 'compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
147 ;;;###utoload (define-key function-key-map [diaeresis] 'compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
148 ;;;###utoload (define-key function-key-map [degree] 'compose-degree-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
149 ;;;###utoload (define-key function-key-map [multi-key] 'compose-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
150 ;;;###utoload (define-key global-map [multi-key] 'compose-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
151
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
152 ;;(define-key function-key-map [multi-key] compose-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
153
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
154
159
3bb7ccffb0c0 Import from CVS: tag r20-3b6
cvs
parents: 155
diff changeset
155 ;; The following is necessary, because one can't rebind [degree]
3bb7ccffb0c0 Import from CVS: tag r20-3b6
cvs
parents: 155
diff changeset
156 ;; and use it to insert the degree sign!
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
157 ;;(defun compose-insert-degree ()
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
158 ;; "Inserts a degree sign."
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
159 ;; (interactive)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
160 ;; (insert ?\260))
159
3bb7ccffb0c0 Import from CVS: tag r20-3b6
cvs
parents: 155
diff changeset
161
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
162 ;; The "Dead" keys:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
163 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
164 ;;(define-dead-key-map [acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
165 ;;(define-dead-key-map [cedilla] compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
166 ;;(define-dead-key-map [diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
167 ;;(define-dead-key-map [degree] compose-ring-map)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
168
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
169 (define-key compose-map [acute] compose-acute-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
170 (define-key compose-map [?'] compose-acute-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
171 (define-key compose-map [grave] compose-grave-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
172 (define-key compose-map [?`] compose-grave-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
173 (define-key compose-map [cedilla] compose-cedilla-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
174 (define-key compose-map [?,] compose-cedilla-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
175 (define-key compose-map [diaeresis] compose-diaeresis-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
176 (define-key compose-map [?\"] compose-diaeresis-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
177 (define-key compose-map [circumflex] compose-circumflex-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
178 (define-key compose-map [?^] compose-circumflex-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
179 (define-key compose-map [tilde] compose-tilde-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
180 (define-key compose-map [~] compose-tilde-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
181 (define-key compose-map [degree] compose-ring-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
182 (define-key compose-map [?*] compose-ring-map)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
183
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
185 ;;; The dead keys might really be called just about anything, depending
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
186 ;;; on the vendor. MIT thinks that the prefixes are "SunFA_", "D", and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
187 ;;; "hpmute_" for Sun, DEC, and HP respectively. However, OpenWindows 3
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
188 ;;; thinks that the prefixes are "SunXK_FA_", "DXK_", and "hpXK_mute_".
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
189 ;;; And HP (who don't mention Sun and DEC at all) use "XK_mute_".
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
190 ;;; Go figure.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
191
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
192 ;;; Presumably if someone is running OpenWindows, they won't be using
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
193 ;;; the DEC or HP keysyms, but if they are defined then that is possible,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
194 ;;; so in that case we accept them all.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
195
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
196 ;;; If things seem not to be working, you might want to check your
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
197 ;;; /usr/lib/X11/XKeysymDB file to see if your vendor has an equally
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
198 ;;; mixed up view of what these keys should be called.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
199
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
200 ;; Sun according to MIT:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
201 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
202
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
203 ;;(when (x-valid-keysym-name-p "SunFA_Acute")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
204 ;; (define-dead-key-map [SunFA_Acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
205 ;; (define-dead-key-map [SunFA_Grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
206 ;; (define-dead-key-map [SunFA_Cedilla] compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
207 ;; (define-dead-key-map [SunFA_Diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
208 ;; (define-dead-key-map [SunFA_Circum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
209 ;; (define-dead-key-map [SunFA_Tilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
210 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
211 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
212 ;;;; Sun according to OpenWindows 2:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
213 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
214 ;;(when (x-valid-keysym-name-p "Dead_Grave")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
215 ;; (define-dead-key-map [Dead_Grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
216 ;; (define-dead-key-map [Dead_Circum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
217 ;; (define-dead-key-map [Dead_Tilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
218 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
219 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
220 ;;;; Sun according to OpenWindows 3:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
221 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
222 ;;(when (x-valid-keysym-name-p "SunXK_FA_Acute")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
223 ;; (define-dead-key-map [SunXK_FA_Acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
224 ;; (define-dead-key-map [SunXK_FA_Grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
225 ;; (define-dead-key-map [SunXK_FA_Cedilla] compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
226 ;; (define-dead-key-map [SunXK_FA_Diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
227 ;; (define-dead-key-map [SunXK_FA_Circum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
228 ;; (define-dead-key-map [SunXK_FA_Tilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
229 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
230 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
231 ;;;; DEC according to MIT:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
232 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
233 ;;(when (x-valid-keysym-name-p "Dacute_accent")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
234 ;; (define-dead-key-map [Dacute_accent] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
235 ;; (define-dead-key-map [Dgrave_accent] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
236 ;; (define-dead-key-map [Dcedilla_accent] compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
237 ;; (define-dead-key-map [Dcircumflex_accent] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
238 ;; (define-dead-key-map [Dtilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
239 ;; (define-dead-key-map [Dring_accent] compose-ring-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
240 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
241 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
242 ;;;; DEC according to OpenWindows 3:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
243 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
244 ;;(when (x-valid-keysym-name-p "DXK_acute_accent")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
245 ;; (define-dead-key-map [DXK_acute_accent] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
246 ;; (define-dead-key-map [DXK_grave_accent] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
247 ;; (define-dead-key-map [DXK_cedilla_accent] compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
248 ;; (define-dead-key-map [DXK_circumflex_accent] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
249 ;; (define-dead-key-map [DXK_tilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
250 ;; (define-dead-key-map [DXK_ring_accent] compose-ring-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
251 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
252 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
253 ;;;; HP according to MIT:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
254 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
255 ;;(when (x-valid-keysym-name-p "hpmute_acute")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
256 ;; (define-dead-key-map [hpmute_acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
257 ;; (define-dead-key-map [hpmute_grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
258 ;; (define-dead-key-map [hpmute_diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
259 ;; (define-dead-key-map [hpmute_asciicircum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
260 ;; (define-dead-key-map [hpmute_asciitilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
261 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
262 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
263 ;;;; HP according to OpenWindows 3:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
264 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
265 ;;(when (x-valid-keysym-name-p "hpXK_mute_acute")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
266 ;; (define-dead-key-map [hpXK_mute_acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
267 ;; (define-dead-key-map [hpXK_mute_grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
268 ;; (define-dead-key-map [hpXK_mute_diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
269 ;; (define-dead-key-map [hpXK_mute_asciicircum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
270 ;; (define-dead-key-map [hpXK_mute_asciitilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
271 ;; )
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
272 ;;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
273 ;;;; HP according to HP-UX 8.0:
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
274 ;;;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
275 ;;(when (x-valid-keysym-name-p "XK_mute_acute")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
276 ;; (define-dead-key-map [XK_mute_acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
277 ;; (define-dead-key-map [XK_mute_grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
278 ;; (define-dead-key-map [XK_mute_diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
279 ;; (define-dead-key-map [XK_mute_asciicircum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
280 ;; (define-dead-key-map [XK_mute_asciitilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
281 ;; )
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
282 ;;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
283 ;;;; Xfree seems to use lower case and a hyphen
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
284 ;;(when (x-valid-keysym-name-p "dead-tilde")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
285 ;; (define-dead-key-map [dead-acute] compose-acute-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
286 ;; (define-dead-key-map [dead-grave] compose-grave-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
287 ;; (define-dead-key-map [dead-cedilla] compose-cedilla-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
288 ;; (define-dead-key-map [dead-diaeresis] compose-diaeresis-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
289 ;; (define-dead-key-map [dead-circum] compose-circumflex-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
290 ;; (define-dead-key-map [dead-tilde] compose-tilde-map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
291 ;; )
183
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 159
diff changeset
292
e121b013d1f0 Import from CVS: tag r20-3b18
cvs
parents: 159
diff changeset
293
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
294
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
295 ;;; The contents of the "dead key" maps. These are shared by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
296 ;;; compose-map.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
297
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
298 (define-key compose-acute-map [space] "'")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
299 (define-key compose-acute-map [?'] [acute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
300 (define-key compose-acute-map [?A] [Aacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
301 (define-key compose-acute-map [E] [Eacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
302 (define-key compose-acute-map [I] [Iacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
303 (define-key compose-acute-map [O] [Oacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
304 (define-key compose-acute-map [U] [Uacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
305 (define-key compose-acute-map [Y] [Yacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
306 (define-key compose-acute-map [a] [aacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
307 (define-key compose-acute-map [e] [eacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
308 (define-key compose-acute-map [i] [iacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
309 (define-key compose-acute-map [o] [oacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
310 (define-key compose-acute-map [u] [uacute])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
311 (define-key compose-acute-map [y] [yacute])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
312
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
313 (define-key compose-grave-map [space] "`")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
314 (define-key compose-grave-map [?`] [grave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
315 (define-key compose-grave-map [A] [Agrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
316 (define-key compose-grave-map [E] [Egrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
317 (define-key compose-grave-map [I] [Igrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
318 (define-key compose-grave-map [O] [Ograve])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
319 (define-key compose-grave-map [U] [Ugrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
320 (define-key compose-grave-map [a] [agrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
321 (define-key compose-grave-map [e] [egrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
322 (define-key compose-grave-map [i] [igrave])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
323 (define-key compose-grave-map [o] [ograve])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
324 (define-key compose-grave-map [u] [ugrave])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
325
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
326 (define-key compose-cedilla-map [space] ",")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
327 (define-key compose-cedilla-map [?,] [cedilla])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
328 (define-key compose-cedilla-map [C] [Ccedilla])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
329 (define-key compose-cedilla-map [c] [ccedilla])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
330
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
331 (define-key compose-diaeresis-map [space] [diaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
332 (define-key compose-diaeresis-map [?\"] [diaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
333 (define-key compose-diaeresis-map [A] [Adiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
334 (define-key compose-diaeresis-map [E] [Ediaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
335 (define-key compose-diaeresis-map [I] [Idiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
336 (define-key compose-diaeresis-map [O] [Odiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
337 (define-key compose-diaeresis-map [U] [Udiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
338 (define-key compose-diaeresis-map [a] [adiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
339 (define-key compose-diaeresis-map [e] [ediaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
340 (define-key compose-diaeresis-map [i] [idiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
341 (define-key compose-diaeresis-map [o] [odiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
342 (define-key compose-diaeresis-map [u] [udiaeresis])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
343 (define-key compose-diaeresis-map [y] [ydiaeresis])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
344
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
345 (define-key compose-circumflex-map [space] "^")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
346 (define-key compose-circumflex-map [?/] "|")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
347 (define-key compose-circumflex-map [?!] [brokenbar])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
348 (define-key compose-circumflex-map [?-] [macron])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
349 (define-key compose-circumflex-map [?_] [macron])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
350 (define-key compose-circumflex-map [?0] [degree])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
351 (define-key compose-circumflex-map [?1] [onesuperior])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
352 (define-key compose-circumflex-map [?2] [twosuperior])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
353 (define-key compose-circumflex-map [?3] [threesuperior])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
354 (define-key compose-circumflex-map [?.] [periodcentered])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
355 (define-key compose-circumflex-map [A] [Acircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
356 (define-key compose-circumflex-map [E] [Ecircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
357 (define-key compose-circumflex-map [I] [Icircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
358 (define-key compose-circumflex-map [O] [Ocircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
359 (define-key compose-circumflex-map [U] [Ucircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
360 (define-key compose-circumflex-map [a] [acircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
361 (define-key compose-circumflex-map [e] [ecircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
362 (define-key compose-circumflex-map [i] [icircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
363 (define-key compose-circumflex-map [o] [ocircumflex])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
364 (define-key compose-circumflex-map [u] [ucircumflex])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
365
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
366 (define-key compose-tilde-map [space] "~")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
367 (define-key compose-tilde-map [A] [Atilde])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
368 (define-key compose-tilde-map [N] [Ntilde])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
369 (define-key compose-tilde-map [O] [Otilde])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
370 (define-key compose-tilde-map [a] [atilde])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
371 (define-key compose-tilde-map [n] [ntilde])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
372 (define-key compose-tilde-map [o] [otilde])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
373
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
374 (define-key compose-ring-map [space] [degree])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
375 (define-key compose-ring-map [A] [Aring])
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
376 (define-key compose-ring-map [a] [aring])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
378
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
379 ;;; The rest of the compose-map. These are the composed characters
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
380 ;;; that are not accessible via "dead" keys.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
381
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
382 (define-key compose-map " '" "'")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
383 (define-key compose-map " ^" "^")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
384 (define-key compose-map " `" "`")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
385 (define-key compose-map " ~" "~")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
386 (define-key compose-map " " [nobreakspace])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
387 (define-key compose-map " \"" [diaeresis])
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
388 (define-key compose-map " :" [diaeresis])
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
389 (define-key compose-map " *" [degree])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
390
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
391 (define-key compose-map "!!" [exclamdown])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
392 (define-key compose-map "!^" [brokenbar])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
393 (define-key compose-map "!S" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
394 (define-key compose-map "!s" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
395 (define-key compose-map "!P" [paragraph])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
396 (define-key compose-map "!p" [paragraph])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
397
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
398 (define-key compose-map "((" "[")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
399 (define-key compose-map "(-" "{")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
400
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
401 (define-key compose-map "))" "]")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
402 (define-key compose-map ")-" "}")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
403
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
404 (define-key compose-map "++" "#")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
405 (define-key compose-map "+-" [plusminus])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
406
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
407 (define-key compose-map "-(" "{")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
408 (define-key compose-map "-)" "}")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
409 (define-key compose-map "--" "-")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
410 (define-key compose-map "-L" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
411 (define-key compose-map "-l" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
412 (define-key compose-map "-Y" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
413 (define-key compose-map "-y" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
414 (define-key compose-map "-," [notsign])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
415 (define-key compose-map "-|" [notsign])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
416 (define-key compose-map "-^" [macron])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
417 (define-key compose-map "-+" [plusminus])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
418 (define-key compose-map "-:" [division])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
419 (define-key compose-map "-D" [ETH])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
420 (define-key compose-map "-d" [eth])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
421 (define-key compose-map "-a" [ordfeminine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
422
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
423 (define-key compose-map ".^" [periodcentered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
424
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
425 (define-key compose-map "//" "\\")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 (define-key compose-map "/<" "\\")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
427 (define-key compose-map "/^" "|")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 (define-key compose-map "/C" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
429 (define-key compose-map "/c" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430 (define-key compose-map "/U" [mu])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
431 (define-key compose-map "/u" [mu])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 (define-key compose-map "/O" [Ooblique])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 (define-key compose-map "/o" [oslash])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
434
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 (define-key compose-map "0X" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 (define-key compose-map "0x" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 (define-key compose-map "0S" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 (define-key compose-map "0s" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 (define-key compose-map "0C" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 (define-key compose-map "0c" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 (define-key compose-map "0R" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 (define-key compose-map "0r" [registered])
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
443 (define-key compose-map "0^" [degree])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
445 (define-key compose-map "1^" [onesuperior])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
446 (define-key compose-map "14" [onequarter])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
447 (define-key compose-map "12" [onehalf])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 (define-key compose-map "2^" [twosuperior])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 (define-key compose-map "3^" [threesuperior])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452 (define-key compose-map "34" [threequarters])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
454 (define-key compose-map ":-" [division])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 (define-key compose-map "</" "\\")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 (define-key compose-map "<<" [guillemotleft])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
459 (define-key compose-map "=L" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
460 (define-key compose-map "=l" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461 (define-key compose-map "=Y" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 (define-key compose-map "=y" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 (define-key compose-map ">>" [guillemotright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 (define-key compose-map "??" [questiondown])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 (define-key compose-map "AA" "@")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469 (define-key compose-map "Aa" "@")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470 (define-key compose-map "A_" [ordfeminine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
471 (define-key compose-map "A`" [Agrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 (define-key compose-map "A'" [Aacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 (define-key compose-map "A^" [Acircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
474 (define-key compose-map "A~" [Atilde])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
475 (define-key compose-map "A\"" [Adiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
476 (define-key compose-map "A*" [Aring])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
477 (define-key compose-map "AE" [AE])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
478
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 (define-key compose-map "C/" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 (define-key compose-map "C|" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
481 (define-key compose-map "C0" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 (define-key compose-map "CO" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483 (define-key compose-map "Co" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
484 (define-key compose-map "C," [Ccedilla])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 (define-key compose-map "D-" [ETH])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
488 (define-key compose-map "E`" [Egrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489 (define-key compose-map "E'" [Eacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
490 (define-key compose-map "E^" [Ecircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
491 (define-key compose-map "E\"" [Ediaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
492
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 (define-key compose-map "I`" [Igrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494 (define-key compose-map "I'" [Iacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 (define-key compose-map "I^" [Icircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 (define-key compose-map "I\"" [Idiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
498 (define-key compose-map "L-" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 (define-key compose-map "L=" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 (define-key compose-map "N~" [Ntilde])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
503 (define-key compose-map "OX" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 (define-key compose-map "Ox" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 (define-key compose-map "OS" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506 (define-key compose-map "Os" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507 (define-key compose-map "OC" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
508 (define-key compose-map "Oc" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 (define-key compose-map "OR" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
510 (define-key compose-map "Or" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
511 (define-key compose-map "O_" [masculine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 (define-key compose-map "O`" [Ograve])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
513 (define-key compose-map "O'" [Oacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 (define-key compose-map "O^" [Ocircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515 (define-key compose-map "O~" [Otilde])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516 (define-key compose-map "O\"" [Odiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517 (define-key compose-map "O/" [Ooblique])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 (define-key compose-map "P!" [paragraph])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 (define-key compose-map "R0" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 (define-key compose-map "RO" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 (define-key compose-map "Ro" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 (define-key compose-map "S!" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
526 (define-key compose-map "S0" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
527 (define-key compose-map "SO" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 (define-key compose-map "So" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 (define-key compose-map "SS" [ssharp])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
531 (define-key compose-map "TH" [THORN])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533 (define-key compose-map "U`" [Ugrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 (define-key compose-map "U'" [Uacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 (define-key compose-map "U^" [Ucircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 (define-key compose-map "U\"" [Udiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 (define-key compose-map "X0" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
539 (define-key compose-map "XO" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 (define-key compose-map "Xo" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 (define-key compose-map "Y-" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543 (define-key compose-map "Y=" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 (define-key compose-map "Y'" [Yacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 (define-key compose-map "_A" [ordfeminine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 (define-key compose-map "_a" [ordfeminine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 (define-key compose-map "_^" [macron])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 (define-key compose-map "_O" [masculine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
550 (define-key compose-map "_o" [masculine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552 (define-key compose-map "aA" "@")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 (define-key compose-map "aa" "@")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 (define-key compose-map "a_" [ordfeminine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 (define-key compose-map "a-" [ordfeminine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 (define-key compose-map "a`" [agrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 (define-key compose-map "a'" [aacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 (define-key compose-map "a^" [acircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 (define-key compose-map "a~" [atilde])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 (define-key compose-map "a\"" [adiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 (define-key compose-map "a*" [aring])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 (define-key compose-map "ae" [ae])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 (define-key compose-map "c/" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 (define-key compose-map "c|" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 (define-key compose-map "c0" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 (define-key compose-map "cO" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 (define-key compose-map "co" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 (define-key compose-map "c," [ccedilla])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
570
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 (define-key compose-map "d-" [eth])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 (define-key compose-map "e`" [egrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 (define-key compose-map "e'" [eacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 (define-key compose-map "e^" [ecircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 (define-key compose-map "e\"" [ediaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 (define-key compose-map "i`" [igrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 (define-key compose-map "i'" [iacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580 (define-key compose-map "i^" [icircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 (define-key compose-map "i\"" [idiaeresis])
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
582 (define-key compose-map "i:" [idiaeresis])
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 (define-key compose-map "l-" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 (define-key compose-map "l=" [sterling])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
587 (define-key compose-map "n~" [ntilde])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 (define-key compose-map "oX" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 (define-key compose-map "ox" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
591 (define-key compose-map "oC" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 (define-key compose-map "oc" [copyright])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 (define-key compose-map "oR" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 (define-key compose-map "or" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
595 (define-key compose-map "oS" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
596 (define-key compose-map "os" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 (define-key compose-map "o_" [masculine])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598 (define-key compose-map "o`" [ograve])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 (define-key compose-map "o'" [oacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 (define-key compose-map "o^" [ocircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 (define-key compose-map "o~" [otilde])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 (define-key compose-map "o\"" [odiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603 (define-key compose-map "o/" [oslash])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 (define-key compose-map "p!" [paragraph])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 (define-key compose-map "r0" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608 (define-key compose-map "rO" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 (define-key compose-map "ro" [registered])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 (define-key compose-map "s!" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612 (define-key compose-map "s0" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 (define-key compose-map "sO" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 (define-key compose-map "so" [section])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615 (define-key compose-map "ss" [ssharp])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 (define-key compose-map "th" [thorn])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 (define-key compose-map "u`" [ugrave])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 (define-key compose-map "u'" [uacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 (define-key compose-map "u^" [ucircumflex])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 (define-key compose-map "u\"" [udiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623 (define-key compose-map "u/" [mu])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
624
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 (define-key compose-map "x0" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626 (define-key compose-map "xO" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 (define-key compose-map "xo" [currency])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 (define-key compose-map "xx" [multiply])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
630 (define-key compose-map "y-" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
631 (define-key compose-map "y=" [yen])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
632 (define-key compose-map "y'" [yacute])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
633 (define-key compose-map "y\"" [ydiaeresis])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
634
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
635 (define-key compose-map "|C" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
636 (define-key compose-map "|c" [cent])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 (define-key compose-map "||" [brokenbar])
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
639
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
640 ;; Suppose we type these three physical keys: [Multi_key " a]
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
641 ;; Xlib can deliver these keys as the following sequences of keysyms:
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
642 ;;
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
643 ;; - [Multi_key " a] (no surprise here)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
644 ;; - [adiaeresis] (OK, Xlib is doing compose processing for us)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
645 ;; - [Multi_key " adiaeresis] (Huh?)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
646 ;;
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
647 ;; It is the last possibility that is arguably a bug. Xlib can't
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
648 ;; decide whether it's really doing compose processing or not (or
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
649 ;; actually, different parts of Xlib disagree).
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
650 ;;
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
651 ;; So we'll just convert [Multi_key " adiaeresis] to [adiaeresis]
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
652 (defun xlib-input-method-bug-workaround (keymap)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
653 (map-keymap
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
654 (lambda (key value)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
655 (cond
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
656 ((keymapp value)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
657 (xlib-input-method-bug-workaround value))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
658 ((and (sequencep value)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
659 (eq 1 (length value))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
660 (null (lookup-key keymap value)))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
661 (define-key keymap value value))))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
662 keymap))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
663 (xlib-input-method-bug-workaround compose-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
664 (unintern 'xlib-input-method-bug-workaround)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
665
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
666 ;; While we're at it, a similar mechanism will make colon equivalent
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
667 ;; to doublequote for diaeresis processing. Some Xlibs do this.
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
668 (defun alias-colon-to-doublequote (keymap)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
669 (map-keymap
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
670 (lambda (key value)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
671 (when (keymapp value)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
672 (alias-colon-to-doublequote value))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
673 (when (eq key '\")
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
674 (define-key keymap ":" value)))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
675 keymap))
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
676 (alias-colon-to-doublequote compose-map)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
677 (unintern 'alias-colon-to-doublequote)
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
678
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 ;;; Electric dead keys: making a' mean a-acute.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
680
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
681
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 (defun electric-diacritic (&optional count)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 "Modify the previous character with an accent.
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
684 For example, if `:' is bound to this command, then typing `a:'
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 will first insert `a' and then turn it into `\344' (adiaeresis).
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
686 The keys to which this command may be bound (and the accents
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 which it understands) are:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 ' (acute) \301\311\315\323\332\335 \341\351\355\363\372\375
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 ` (grave) \300\310\314\322\331 \340\350\354\362\371
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 : (diaeresis) \304\313\317\326\334 \344\353\357\366\374\377
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 ^ (circumflex) \302\312\316\324\333 \342\352\356\364\373
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 , (cedilla) \307\347
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694 . (ring) \305\345"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
695 (interactive "p")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 (or count (setq count 1))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
697
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698 (if (not (eq last-command 'self-insert-command))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
699 ;; Only do the magic if the two chars were typed in succession.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
700 (self-insert-command count)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
702 ;; This is so that ``a : C-x u'' will transform `adiaeresis' back into `a:'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
703 (self-insert-command count)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 (undo-boundary)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 (delete-char (- count))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 (let* ((c last-command-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
708 (map (cond ((eq c ?') compose-acute-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
709 ((eq c ?`) compose-grave-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 ((eq c ?,) compose-cedilla-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 ((eq c ?:) compose-diaeresis-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 ((eq c ?^) compose-circumflex-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 ((eq c ?~) compose-tilde-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 ((eq c ?.) compose-ring-map)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 (t (error "unknown diacritic: %s (%c)" c c))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
716 (base-char (preceding-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
717 (mod-char (and (>= (downcase base-char) ?a) ; only do alphabetics?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 (<= (downcase base-char) ?z)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719 (lookup-key map (make-string 1 base-char)))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720 (if (and (vectorp mod-char) (= (length mod-char) 1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
721 (setq mod-char (aref mod-char 0)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
722 (if (and mod-char (symbolp mod-char))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
723 (setq mod-char (or (get mod-char character-set-property) mod-char)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
724 (if (and mod-char (> count 0))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 (delete-char -1)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 (setq mod-char c))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
727 (while (> count 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728 (insert mod-char)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
729 (setq count (1- count))))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 50
diff changeset
731 ;; should "::" mean "¨" and ": " mean ":"?
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
732 ;; should we also do
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 ;; (?~
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734 ;; (?A "\303")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735 ;; (?C "\307")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
736 ;; (?D "\320")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
737 ;; (?N "\321")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
738 ;; (?O "\325")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
739 ;; (?a "\343")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 ;; (?c "\347")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
741 ;; (?d "\360")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 ;; (?n "\361")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743 ;; (?o "\365")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
744 ;; (?> "\273")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
745 ;; (?< "\253")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 ;; (? "~")) ; no special code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 ;; (?\/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 ;; (?A "\305") ;; A-with-ring (Norwegian and Danish)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 ;; (?E "\306") ;; AE-ligature (Norwegian and Danish)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 ;; (?O "\330")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 ;; (?a "\345") ;; a-with-ring (Norwegian and Danish)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752 ;; (?e "\346") ;; ae-ligature (Norwegian and Danish)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
753 ;; (?o "\370")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
754 ;; (? "/")) ; no special code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
756
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 ;;; Providing help in the middle of a compose sequence. (Way cool.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
759 (eval-when-compile
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
760 (defsubst next-composable-event ()
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761 (let (event)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
762 (while (progn
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
763 (setq event (next-command-event))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
764 (not (or (key-press-event-p event)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
765 (button-press-event-p event))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
766 (dispatch-event event))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
767 event)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
768
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
769 (defun compose-help (ignore-prompt)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
770 (let* ((keys (apply 'vector (nbutlast (append (this-command-keys) nil))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
771 (map (or (lookup-key function-key-map keys)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
772 (error "can't find map? %s %s" keys (this-command-keys))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
773 binding)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
774 (save-excursion
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
775 (with-output-to-temp-buffer "*Help*"
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
776 (set-buffer "*Help*")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
777 (erase-buffer)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
778 (message "Working...")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
779 (setq ctl-arrow 'compose) ; non-t-non-nil
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
780 (insert "You are typing a compose sequence. So far you have typed: ")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
781 (insert (key-description keys))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
782 (insert "\nCompletions from here are:\n\n")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
783 (map-keymap 'compose-help-mapper map t)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
784 (message "? ")))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
785 (while (keymapp map)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
786 (setq binding (lookup-key map (vector (next-composable-event))))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
787 (if (null binding)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
788 (message "No such key in keymap. Try again.")
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
789 (setq map binding)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
790 binding))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
791
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
792 (put 'compose-help 'isearch-command t) ; so that it doesn't terminate isearch
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
793
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
794 (defun compose-help-mapper (key binding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
795 (if (and (symbolp key)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
796 (get key character-set-property))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
797 (setq key (get key character-set-property)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
798 (if (eq binding 'compose-help) ; suppress that...
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
799 nil
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
800 (if (keymapp binding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
801 (let ((p (point)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
802 (map-keymap 'compose-help-mapper binding t)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
803 (goto-char p)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
804 (while (not (eobp))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 50
diff changeset
805 (if (characterp key)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
806 (insert (make-string 1 key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
807 (insert (single-key-description key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
808 (insert " ")
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
809 (forward-line 1)))
70
131b0175ea99 Import from CVS: tag r20-0b30
cvs
parents: 50
diff changeset
810 (if (characterp key)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
811 (insert (make-string 1 key))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
812 (insert (single-key-description key)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
813 (indent-to 16)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
814 (let ((code (and (vectorp binding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
815 (= 1 (length binding))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
816 (get (aref binding 0) character-set-property))))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
817 (if code
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
818 (insert (make-string 1 code))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
819 (if (stringp binding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
820 (insert binding)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
821 (insert (prin1-to-string binding)))))
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
822 (when (and (vectorp binding) (= 1 (length binding)))
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
823 (indent-to 32)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
824 (insert (symbol-name (aref binding 0)))))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
825 (insert "\n")))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
826
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
827 ;; define it at top-level in the compose map...
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
828 ;;(define-key compose-map [(control h)] 'compose-help)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
829 ;;(define-key compose-map [help] 'compose-help)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 ;; and then define it in each sub-map of the compose map.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 (map-keymap
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
832 (lambda (key binding)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
833 (when (keymapp binding)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
834 ;; (define-key binding [(control h)] 'compose-help)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
835 ;; (define-key binding [help] 'compose-help)
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 183
diff changeset
836 ))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 compose-map nil)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
839 ;; Make redisplay display the accented letters
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 (if (memq (default-value 'ctl-arrow) '(t nil))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 (setq-default ctl-arrow 'iso-8859/1))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 (provide 'x-compose)
155
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
845
43dd3413c7c7 Import from CVS: tag r20-3b4
cvs
parents: 114
diff changeset
846 ;;; x-compose.el ends here