X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5ed99d3685cc8d13f8e4c63ad449a6e4d63c8eb0..037f82a7e72fa7bdc7b1d507f9b760884aecf2f0:/lisp/international/iso-transl.el

diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 49b1f6ef23..1436cf8c57 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -1,9 +1,10 @@
-;;; iso-transl.el --- keyboard input definitions for ISO 8859-1  -*- coding: iso-8859-1 -*-
+;;; iso-transl.el --- keyboard input for ISO 10646 chars -*- coding: utf-8 -*-
 
-;; Copyright (C) 1987, 1993-1999, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1993-1999, 2001-2016 Free Software Foundation,
+;; Inc.
 
 ;; Author: Howard Gayle
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: i18n
 
 ;; This file is part of GNU Emacs.
@@ -35,10 +36,13 @@
 ;; to make all of the Alt keys autoload, and it is not clear
 ;; that the dead accent keys SHOULD autoload this package.
 
+;; This package supports all characters defined by ISO 8859-1, along
+;; with a few other ISO 10646 characters commonly used in English and
+;; basic math.
+
 ;;; Code:
 
 ;;; Provide some binding for startup:
-;;;###autoload (or key-translation-map (setq key-translation-map (make-sparse-keymap)))
 ;;;###autoload (define-key key-translation-map "\C-x8" 'iso-transl-ctl-x-8-map)
 ;;;###autoload (autoload 'iso-transl-ctl-x-8-map "iso-transl" "Keymap for C-x 8 prefix." t 'keymap)
 
@@ -73,125 +77,150 @@
 ;; language-specific table might override the short form for its own use.
 
 (defvar iso-transl-char-map
-  '(("* "   . [? ])
-    (" "    . [? ])
-    ("*!"   . [?¡])
-    ("!"    . [?¡])
-    ("\"\"" . [?¨])
-    ("\"A"  . [?Ä])
-    ("\"E"  . [?Ë])
-    ("\"I"  . [?Ï])
-    ("\"O"  . [?Ö])
-    ("\"U"  . [?Ü])
-    ("\"a"  . [?ä])
-    ("\"e"  . [?ë])
-    ("\"i"  . [?ï])
-    ("\"o"  . [?ö])
-    ("\"s"  . [?ß])
-    ("\"u"  . [?ü])
-    ("\"y"  . [?ÿ])
-    ("''"   . [?´])
-    ("'A"   . [?Á])
-    ("'E"   . [?É])
-    ("'I"   . [?Í])
-    ("'O"   . [?Ó])
-    ("'U"   . [?Ú])
-    ("'Y"   . [?Ý])
-    ("'a"   . [?á])
-    ("'e"   . [?é])
-    ("'i"   . [?í])
-    ("'o"   . [?ó])
-    ("'u"   . [?ú])
-    ("'y"   . [?ý])
-    ("*$"   . [?¤])
-    ("$"    . [?¤])
-    ("*+"   . [?±])
-    ("+"    . [?±])
-    (",,"   . [?¸])
-    (",C"   . [?Ç])
-    (",c"   . [?ç])
-    ("*-"   . [?­])
-    ("-"    . [?­])
-    ("*."   . [?·])
-    ("."    . [?·])
-    ("//"   . [?÷])
-    ("/A"   . [?Å])
-    ("/E"   . [?Æ])
-    ("/O"   . [?Ø])
-    ("/a"   . [?å])
-    ("/e"   . [?æ])
-    ("/o"   . [?ø])
-    ("1/2"  . [?½])
-    ("1/4"  . [?¼])
-    ("3/4"  . [?¾])
-    ("*<"   . [?«])
-    ("<"    . [?«])
-    ("*="   . [?¯])
-    ("="    . [?¯])
-    ("*>"   . [?»])
-    (">"    . [?»])
-    ("*?"   . [?¿])
-    ("?"    . [?¿])
-    ("*C"   . [?©])
-    ("C"    . [?©])
-    ("*L"   . [?£])
-    ("L"    . [?£])
-    ("*P"   . [?¶])
-    ("P"    . [?¶])
-    ("*R"   . [?®])
-    ("R"    . [?®])
-    ("*S"   . [?§])
-    ("S"    . [?§])
-    ("*Y"   . [?¥])
-    ("Y"    . [?¥])
-    ("^1"   . [?¹])
-    ("^2"   . [?²])
-    ("^3"   . [?³])
-    ("^A"   . [?Â])
-    ("^E"   . [?Ê])
-    ("^I"   . [?Î])
-    ("^O"   . [?Ô])
-    ("^U"   . [?Û])
-    ("^a"   . [?â])
-    ("^e"   . [?ê])
-    ("^i"   . [?î])
-    ("^o"   . [?ô])
-    ("^u"   . [?û])
-    ("_a"   . [?ª])
-    ("_o"   . [?º])
-    ("`A"   . [?À])
-    ("`E"   . [?È])
-    ("`I"   . [?Ì])
-    ("`O"   . [?Ò])
-    ("`U"   . [?Ù])
-    ("`a"   . [?à])
-    ("`e"   . [?è])
-    ("`i"   . [?ì])
-    ("`o"   . [?ò])
-    ("`u"   . [?ù])
-    ("*c"   . [?¢])
-    ("c"    . [?¢])
-    ("*o"   . [?°])
-    ("o"    . [?°])
-    ("*u"   . [?µ])
-    ("u"    . [?µ])
-    ("*m"   . [?µ])
-    ("m"    . [?µ])
-    ("*x"   . [?×])
-    ("x"    . [?×])
-    ("*|"   . [?¦])
-    ("|"    . [?¦])
-    ("~A"   . [?Ã])
-    ("~D"   . [?Ð])
-    ("~N"   . [?Ñ])
-    ("~O"   . [?Õ])
-    ("~T"   . [?Þ])
-    ("~a"   . [?ã])
-    ("~d"   . [?ð])
-    ("~n"   . [?ñ])
-    ("~o"   . [?õ])
-    ("~t"   . [?þ])
-    ("~~"   . [?¬])
+  '(("* "   . [? ])
+    (" "    . [? ])
+    ("*!"   . [?¡])
+    ("!"    . [?¡])
+    ("\"\"" . [?¨])
+    ("\"A"  . [?Ä])
+    ("\"E"  . [?Ë])
+    ("\"I"  . [?Ï])
+    ("\"O"  . [?Ö])
+    ("\"U"  . [?Ü])
+    ("\"a"  . [?ä])
+    ("\"e"  . [?ë])
+    ("\"i"  . [?ï])
+    ("\"o"  . [?ö])
+    ("\"s"  . [?ß])
+    ("\"u"  . [?ü])
+    ("\"y"  . [?ÿ])
+    ("''"   . [?´])
+    ("'A"   . [?Á])
+    ("'E"   . [?É])
+    ("'I"   . [?Í])
+    ("'O"   . [?Ó])
+    ("'U"   . [?Ú])
+    ("'Y"   . [?Ý])
+    ("'a"   . [?á])
+    ("'e"   . [?é])
+    ("'i"   . [?í])
+    ("'o"   . [?ó])
+    ("'u"   . [?ú])
+    ("'y"   . [?ý])
+    ("*$"   . [?¤])
+    ("$"    . [?¤])
+    ("*+"   . [?±])
+    ("+"    . [?±])
+    (",,"   . [?¸])
+    (",C"   . [?Ç])
+    (",c"   . [?ç])
+    ("*-"   . [?­])
+    ("-"    . [?­])
+    ("*."   . [?·])
+    ("."    . [?·])
+    ("//"   . [?÷])
+    ("/A"   . [?Å])
+    ("/E"   . [?Æ])
+    ("/O"   . [?Ø])
+    ("/a"   . [?Ã¥])
+    ("/e"   . [?æ])
+    ("/o"   . [?ø])
+    ("1/2"  . [?½])
+    ("1/4"  . [?¼])
+    ("3/4"  . [?¾])
+    ("*<"   . [?«])
+    ("<"    . [?«])
+    ("*="   . [?¯])
+    ("="    . [?¯])
+    ("*>"   . [?»])
+    (">"    . [?»])
+    ("*?"   . [?¿])
+    ("?"    . [?¿])
+    ("*C"   . [?©])
+    ("C"    . [?©])
+    ("*L"   . [?£])
+    ("L"    . [?£])
+    ("*P"   . [?¶])
+    ("P"    . [?¶])
+    ("*R"   . [?®])
+    ("R"    . [?®])
+    ("*S"   . [?§])
+    ("S"    . [?§])
+    ("*Y"   . [?Â¥])
+    ("Y"    . [?Â¥])
+    ("^1"   . [?¹])
+    ("^2"   . [?²])
+    ("^3"   . [?³])
+    ("^A"   . [?Â])
+    ("^E"   . [?Ê])
+    ("^I"   . [?Î])
+    ("^O"   . [?Ô])
+    ("^U"   . [?Û])
+    ("^a"   . [?â])
+    ("^e"   . [?ê])
+    ("^i"   . [?î])
+    ("^o"   . [?ô])
+    ("^u"   . [?û])
+    ("_a"   . [?ª])
+    ("_o"   . [?º])
+    ("`A"   . [?À])
+    ("`E"   . [?È])
+    ("`I"   . [?Ì])
+    ("`O"   . [?Ò])
+    ("`U"   . [?Ù])
+    ("`a"   . [?à])
+    ("`e"   . [?è])
+    ("`i"   . [?ì])
+    ("`o"   . [?ò])
+    ("`u"   . [?ù])
+    ("*c"   . [?¢])
+    ("c"    . [?¢])
+    ("*o"   . [?°])
+    ("o"    . [?°])
+    ("*u"   . [?µ])
+    ("u"    . [?µ])
+    ("*m"   . [?µ])
+    ("m"    . [?µ])
+    ("*x"   . [?×])
+    ("x"    . [?×])
+    ("*|"   . [?¦])
+    ("|"    . [?¦])
+    ("~A"   . [?Ã])
+    ("~D"   . [?Ð])
+    ("~N"   . [?Ñ])
+    ("~O"   . [?Õ])
+    ("~T"   . [?Þ])
+    ("~a"   . [?ã])
+    ("~d"   . [?ð])
+    ("~n"   . [?ñ])
+    ("~o"   . [?õ])
+    ("~t"   . [?þ])
+    ("~~"   . [?¬])
+    ("_h"   . [?‐])
+    ("_H"   . [?‑])
+    ("_f"   . [?‒])
+    ("_n"   . [?–])
+    ("_m"   . [?—])
+    ("_q"   . [?―])
+    ("["    . [?‘])
+    ("]"    . [?’])
+    ("{"    . [?“])
+    ("}"    . [?”])
+    ("1+"   . [?†])
+    ("2+"   . [?‡])
+    ("**"   . [?•])
+    ("*'"   . [?′])
+    ("*\""  . [?″])
+    ("*E"   . [?€])
+    ("No"   . [?№])
+    ("a<"   . [?←])
+    ("a>"   . [?→])
+    ("a="   . [?↔])
+    ("_-"   . [?−])
+    ("~="   . [?≈])
+    ("/="   . [?≠])
+    ("_<"   . [?≤])
+    ("_>"   . [?≥])
     ("' "   . "'")
     ("` "   . "`")
     ("\" "  . "\"")
@@ -205,37 +234,37 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
 ;; Language-specific translation lists.
 (defvar iso-transl-language-alist
   '(("Esperanto"
-     ("C"  . [?Æ])
-     ("G"  . [?Ø])
-     ("H"  . [?¦])
-     ("J"  . [?¬])
-     ("S"  . [?Þ])
-     ("U"  . [?Ý])
-     ("c"  . [?æ])
-     ("g"  . [?ø])
-     ("h"  . [?¶])
-     ("j"  . [?¼])
-     ("s"  . [?þ])
-     ("u"  . [?ý]))
+     ("C"  . [?Æ])
+     ("G"  . [?Ø])
+     ("H"  . [?¦])
+     ("J"  . [?¬])
+     ("S"  . [?Þ])
+     ("U"  . [?Ý])
+     ("c"  . [?æ])
+     ("g"  . [?ø])
+     ("h"  . [?¶])
+     ("j"  . [?¼])
+     ("s"  . [?þ])
+     ("u"  . [?ý]))
     ("French"
-     ("C"  . [?Ç])
-     ("c"  . [?ç]))
+     ("C"  . [?Ç])
+     ("c"  . [?ç]))
     ("German"
-     ("A"  . [?Ä])
-     ("O"  . [?Ö])
-     ("U"  . [?Ü])
-     ("a"  . [?ä])
-     ("o"  . [?ö])
-     ("s"  . [?ß])
-     ("u"  . [?ü]))
+     ("A"  . [?Ä])
+     ("O"  . [?Ö])
+     ("U"  . [?Ü])
+     ("a"  . [?ä])
+     ("o"  . [?ö])
+     ("s"  . [?ß])
+     ("u"  . [?ü]))
     ("Portuguese"
-     ("C"  . [?Ç])
-     ("c"  . [?ç]))
+     ("C"  . [?Ç])
+     ("c"  . [?ç]))
     ("Spanish"
-     ("!"  . [?¡])
-     ("?"  . [?¿])
-     ("N"  . [?Ñ])
-     ("n"  . [?ñ]))))
+     ("!"  . [?¡])
+     ("?"  . [?¿])
+     ("N"  . [?Ñ])
+     ("n"  . [?ñ]))))
 
 (defvar iso-transl-ctl-x-8-map nil
   "Keymap for C-x 8 prefix.")
@@ -283,11 +312,6 @@ sequence VECTOR.  (VECTOR is normally one character long.)")
 ;; with a language-specific mapping by using `M-x iso-transl-set-language'.
 (iso-transl-define-keys iso-transl-char-map)
 
-(define-key isearch-mode-map "\C-x" nil)
-(define-key isearch-mode-map [?\C-x t] 'isearch-other-control-char)
-(define-key isearch-mode-map "\C-x8" nil)
-
-
 (provide 'iso-transl)
 
 ;;; iso-transl.el ends here