Mercurial > hg > xemacs-beta
comparison lisp/x-compose.el @ 5260:dceee3855f15
Add support for the X11 dead-stroke in x-compose.el.
2010-09-05 Aidan Kehoe <kehoea@parhasard.net>
* x-compose.el (define-compose-map, compose-map)
(decide-on-bindings): Support the precomposed characters with
stroke here too, necessary for Polish and Danish, among others.
* x-init.el (x-initialize-compose): Add the appropriate map
autoloads and bindings here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 05 Sep 2010 20:31:05 +0100 |
| parents | fdc76fec36d3 |
| children | f00192e1cd49 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
| 5259:02c282ae97cb | 5260:dceee3855f15 |
|---|---|
| 154 finally return (cons 'progn result)))) | 154 finally return (cons 'progn result)))) |
| 155 (define-compose-map compose-map compose-acute-map compose-grave-map | 155 (define-compose-map compose-map compose-acute-map compose-grave-map |
| 156 compose-cedilla-map compose-diaeresis-map compose-circumflex-map | 156 compose-cedilla-map compose-diaeresis-map compose-circumflex-map |
| 157 compose-tilde-map compose-ring-map compose-caron-map compose-macron-map | 157 compose-tilde-map compose-ring-map compose-caron-map compose-macron-map |
| 158 compose-breve-map compose-dot-map compose-doubleacute-map | 158 compose-breve-map compose-dot-map compose-doubleacute-map |
| 159 compose-ogonek-map compose-hook-map compose-horn-map)) | 159 compose-ogonek-map compose-hook-map compose-horn-map compose-stroke-map)) |
| 160 | 160 |
| 161 (define-key compose-map 'acute compose-acute-map) | 161 (define-key compose-map 'acute compose-acute-map) |
| 162 (define-key compose-map 'grave compose-grave-map) | 162 (define-key compose-map 'grave compose-grave-map) |
| 163 (define-key compose-map 'cedilla compose-cedilla-map) | 163 (define-key compose-map 'cedilla compose-cedilla-map) |
| 164 (define-key compose-map 'diaeresis compose-diaeresis-map) | 164 (define-key compose-map 'diaeresis compose-diaeresis-map) |
| 169 (define-key compose-map 'macron compose-macron-map) | 169 (define-key compose-map 'macron compose-macron-map) |
| 170 (define-key compose-map 'doubleacute compose-doubleacute-map) | 170 (define-key compose-map 'doubleacute compose-doubleacute-map) |
| 171 (define-key compose-map 'ogonek compose-ogonek-map) | 171 (define-key compose-map 'ogonek compose-ogonek-map) |
| 172 (define-key compose-map 'breve compose-breve-map) | 172 (define-key compose-map 'breve compose-breve-map) |
| 173 (define-key compose-map 'abovedot compose-dot-map) | 173 (define-key compose-map 'abovedot compose-dot-map) |
| 174 (define-key compose-map 'stroke compose-stroke-map) | |
| 174 | 175 |
| 175 ;;(define-key function-key-map [multi-key] compose-map) | 176 ;;(define-key function-key-map [multi-key] compose-map) |
| 176 | 177 |
| 177 ;; The following is necessary, because one can't rebind [degree] | 178 ;; The following is necessary, because one can't rebind [degree] |
| 178 ;; and use it to insert the degree sign! | 179 ;; and use it to insert the degree sign! |
| 193 (define-key compose-map [?^] compose-circumflex-map) | 194 (define-key compose-map [?^] compose-circumflex-map) |
| 194 (define-key compose-map [tilde] compose-tilde-map) | 195 (define-key compose-map [tilde] compose-tilde-map) |
| 195 (define-key compose-map [~] compose-tilde-map) | 196 (define-key compose-map [~] compose-tilde-map) |
| 196 (define-key compose-map [degree] compose-ring-map) | 197 (define-key compose-map [degree] compose-ring-map) |
| 197 (define-key compose-map [?*] compose-ring-map) | 198 (define-key compose-map [?*] compose-ring-map) |
| 199 (define-key compose-map [stroke] compose-stroke-map) | |
| 198 | 200 |
| 199 (loop | 201 (loop |
| 200 for (keysym character-code map) | 202 for (keysym character-code map) |
| 201 in '((caron #x02C7 compose-caron-map) | 203 in '((caron #x02C7 compose-caron-map) |
| 202 (macron #x00AF compose-macron-map) | 204 (macron #x00AF compose-macron-map) |
| 562 (compose-hook-map [?z] #x0225) ;; SMALL Z WITH HOOK | 564 (compose-hook-map [?z] #x0225) ;; SMALL Z WITH HOOK |
| 563 (compose-horn-map [space] #x031b) | 565 (compose-horn-map [space] #x031b) |
| 564 (compose-horn-map [?O] #x01A0) ;; CAPITAL O WITH HORN | 566 (compose-horn-map [?O] #x01A0) ;; CAPITAL O WITH HORN |
| 565 (compose-horn-map [?U] #x01AF) ;; CAPITAL U WITH HORN | 567 (compose-horn-map [?U] #x01AF) ;; CAPITAL U WITH HORN |
| 566 (compose-horn-map [?o] #x01A1) ;; SMALL O WITH HORN | 568 (compose-horn-map [?o] #x01A1) ;; SMALL O WITH HORN |
| 567 (compose-horn-map [?u] #x01B0))) ;; SMALL U WITH HORN | 569 (compose-horn-map [?u] #x01B0) ;; SMALL U WITH HORN |
| 570 (compose-stroke-map [?A] #x023a) ;; CAPITAL A WITH STROKE | |
| 571 (compose-stroke-map [?a] #x2c65) ;; SMALL A WITH STROKE | |
| 572 (compose-stroke-map [?B] #x0243) ;; CAPITAL B WITH STROKE | |
| 573 (compose-stroke-map [?b] #x0180) ;; SMALL B WITH STROKE | |
| 574 (compose-stroke-map [?C] #x023b) ;; CAPITAL C WITH STROKE | |
| 575 (compose-stroke-map [?c] #x023c) ;; SMALL C WITH STROKE | |
| 576 (compose-stroke-map [?D] #x0110) ;; CAPITAL D WITH STROKE | |
| 577 (compose-stroke-map [?d] #x0111) ;; SMALL D WITH STROKE | |
| 578 (compose-stroke-map [?E] #x0246) ;; CAPITAL E WITH STROKE | |
| 579 (compose-stroke-map [?e] #x0247) ;; SMALL E WITH STROKE | |
| 580 (compose-stroke-map [?G] #x01e4) ;; CAPITAL G WITH STROKE | |
| 581 (compose-stroke-map [?g] #x01e5) ;; SMALL G WITH STROKE | |
| 582 (compose-stroke-map [?H] #x0126) ;; CAPITAL H WITH STROKE | |
| 583 (compose-stroke-map [?h] #x0127) ;; SMALL H WITH STROKE | |
| 584 (compose-stroke-map [?I] #x0197) ;; CAPITAL I WITH STROKE | |
| 585 (compose-stroke-map [?i] #x0268) ;; SMALL I WITH STROKE | |
| 586 (compose-stroke-map [?J] #x0248) ;; CAPITAL J WITH STROKE | |
| 587 (compose-stroke-map [?j] #x0249) ;; SMALL J WITH STROKE | |
| 588 (compose-stroke-map [?K] #xa740) ;; CAPITAL K WITH STROKE | |
| 589 (compose-stroke-map [?k] #xa741) ;; SMALL K WITH STROKE | |
| 590 (compose-stroke-map [?L] #x0141) ;; CAPITAL L WITH STROKE | |
| 591 (compose-stroke-map [?l] #x0142) ;; SMALL L WITH STROKE | |
| 592 (compose-stroke-map [?O] #x00d8) ;; CAPITAL O WITH STROKE | |
| 593 (compose-stroke-map [?o] #x00f8) ;; SMALL O WITH STROKE | |
| 594 (compose-stroke-map [?P] #x2c63) ;; CAPITAL P WITH STROKE | |
| 595 (compose-stroke-map [?p] #x1d7d) ;; SMALL P WITH STROKE | |
| 596 (compose-stroke-map [?R] #x024c) ;; CAPITAL R WITH STROKE | |
| 597 (compose-stroke-map [?r] #x024d) ;; SMALL R WITH STROKE | |
| 598 (compose-stroke-map [?T] #x0166) ;; CAPITAL T WITH STROKE | |
| 599 (compose-stroke-map [?t] #x0167) ;; SMALL T WITH STROKE | |
| 600 (compose-stroke-map [?Y] #x024e) ;; CAPITAL Y WITH STROKE | |
| 601 (compose-stroke-map [?y] #x024f) ;; SMALL Y WITH STROKE | |
| 602 (compose-stroke-map [?Z] #x01b5) ;; CAPITAL Z WITH STROKE | |
| 603 (compose-stroke-map [?z] #x01b6) ;; SMALL Z WITH STROKE | |
| 604 )) | |
| 568 | 605 |
| 569 | 606 |
| 570 ;;; The rest of the compose-map. These are the composed characters | 607 ;;; The rest of the compose-map. These are the composed characters |
| 571 ;;; that are not accessible via "dead" keys. | 608 ;;; that are not accessible via "dead" keys. |
| 572 | 609 |