Define a "function name" for each translation that isn't ASCII. Use

these function names in iso-transl-char-map.

1 files changed, 221 insertions, 97 deletions

diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index 7b2deedef70..70f1774060a 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -67,104 +67,131 @@
 ;; The two-character mnemonics are intended to be available in all languages.
 ;; The ones beginning with `*' have one-character synonyms, but a
 ;; language-specific table might override the short form for its own use.
+
+;; When a translation is non-ASCII, we use a symbol name
+;; whose "function definition" is a translation, rather than
+;; writing the translation directly here.
+;; That is for the sake of C-x 8 C-h.
 (defvar iso-transl-char-map
-  '(("* "   . [160])(" "   . [160])
-    ("*!"   . [161])("!"   . [161])
-    ("\"\"" . [168])
-    ("\"A"  . [196])
-    ("\"E"  . [203])
-    ("\"I"  . [207])
-    ("\"O"  . [214])
-    ("\"U"  . [220])
-    ("\"a"  . [228])
-    ("\"e"  . [235])
-    ("\"i"  . [239])
-    ("\"o"  . [246])
-    ("\"s"  . [223])
-    ("\"u"  . [252])
-    ("\"y"  . [255])
-    ("''"   . [180])
-    ("'A"   . [193])
-    ("'E"   . [201])
-    ("'I"   . [205])
-    ("'O"   . [211])
-    ("'U"   . [218])
-    ("'Y"   . [221])
-    ("'a"   . [225])
-    ("'e"   . [233])
-    ("'i"   . [237])
-    ("'o"   . [243])
-    ("'u"   . [250])
-    ("'y"   . [253])
-    ("*$"   . [164])("$"   . [164])
-    ("*+"   . [177])("+"   . [177])
-    (",,"   . [184])
-    (",C"   . [199])
-    (",c"   . [231])
-    ("*-"   . [173])("-"   . [173])
-    ("*."   . [183])("."   . [183])
-    ("//"   . [247])
-    ("/A"   . [197])
-    ("/E"   . [198])
-    ("/O"   . [216])
-    ("/a"   . [229])
-    ("/e"   . [230])
-    ("/o"   . [248])
-    ("1/2"  . [189])
-    ("1/4"  . [188])
-    ("3/4"  . [190])
-    ("*<"   . [171])("<"   . [171])
-    ("*="   . [175])("="   . [175])
-    ("*>"   . [187])(">"   . [187])
-    ("*?"   . [191])("?"   . [191])
-    ("*C"   . [169])("C"   . [169])
-    ("*L"   . [163])("L"   . [163])
-    ("*P"   . [182])("P"   . [182])
-    ("*R"   . [174])("R"   . [174])
-    ("*S"   . [167])("S"   . [167])
-    ("*Y"   . [165])("Y"   . [165])
-    ("^1"   . [185])
-    ("^2"   . [178])
-    ("^3"   . [179])
-    ("^A"   . [194])
-    ("^E"   . [202])
-    ("^I"   . [206])
-    ("^O"   . [212])
-    ("^U"   . [219])
-    ("^a"   . [226])
-    ("^e"   . [234])
-    ("^i"   . [238])
-    ("^o"   . [244])
-    ("^u"   . [251])
-    ("_a"   . [170])
-    ("_o"   . [186])
-    ("`A"   . [192])
-    ("`E"   . [200])
-    ("`I"   . [204])
-    ("`O"   . [210])
-    ("`U"   . [217])
-    ("`a"   . [224])
-    ("`e"   . [232])
-    ("`i"   . [236])
-    ("`o"   . [242])
-    ("`u"   . [249])
-    ("*c"   . [162])("c"   . [162])
-    ("*o"   . [176])("o"   . [176])
-    ("*u"   . [181])("u"   . [181])
-    ("*m"   . [181])("m"   . [181])
-    ("*x"   . [215])("x"   . [215])
-    ("*|"   . [166])("|"   . [166])
-    ("~A"   . [195])
-    ("~D"   . [208])
-    ("~N"   . [209])
-    ("~O"   . [213])
-    ("~T"   . [222])
-    ("~a"   . [227])
-    ("~d"   . [240])
-    ("~n"   . [241])
-    ("~o"   . [245])
-    ("~t"   . [254])
-    ("~~"   . [172])
+  '(("* "   . iso-transl-no-break-space)
+    (" "    . iso-transl-no-break-space)
+    ("*!"   . iso-transl-inverted-exclamation-mark)
+    ("!"    . iso-transl-inverted-exclamation-mark)
+    ("\"\"" . iso-transl-diaeresis)
+    ("\"A"  . iso-transl-A-umlaut)
+    ("\"E"  . iso-transl-E-umlaut)
+    ("\"I"  . iso-transl-I-umlaut)
+    ("\"O"  . iso-transl-O-umlaut)
+    ("\"U"  . iso-transl-U-umlaut)
+    ("\"a"  . iso-transl-a-umlaut)
+    ("\"e"  . iso-transl-e-umlaut)
+    ("\"i"  . iso-transl-i-umlaut)
+    ("\"o"  . iso-transl-o-umlaut)
+    ("\"s"  . iso-transl-ss)
+    ("\"u"  . iso-transl-u-umlaut)
+    ("\"y"  . iso-transl-y-umlaut)
+    ("''"   . iso-transl-acute-accent)
+    ("'A"   . iso-transl-A-acute)
+    ("'E"   . iso-transl-E-acute)
+    ("'I"   . iso-transl-I-acute)
+    ("'O"   . iso-transl-O-acute)
+    ("'U"   . iso-transl-U-acute)
+    ("'Y"   . iso-transl-Y-acute)
+    ("'a"   . iso-transl-a-acute)
+    ("'e"   . iso-transl-e-acute)
+    ("'i"   . iso-transl-i-acute)
+    ("'o"   . iso-transl-o-acute)
+    ("'u"   . iso-transl-u-acute)
+    ("'y"   . iso-transl-y-acute)
+    ("*$"   . iso-transl-general-currency-sign)
+    ("$"    . iso-transl-general-currency-sign)
+    ("*+"   . iso-transl-plus-or-minus-sign)
+    ("+"    . iso-transl-plus-or-minus-sign)
+    (",,"   . iso-transl-cedilla)
+    (",C"   . iso-transl-C-cedilla)
+    (",c"   . iso-transl-c-cedilla)
+    ("*-"   . iso-transl-soft-hyphen)
+    ("-"    . iso-transl-soft-hyphen)
+    ("*."   . iso-transl-middle-dot)
+    ("."    . iso-transl-middle-dot)
+    ("//"   . iso-transl-division-sign)
+    ("/A"   . iso-transl-A-slash)
+    ("/E"   . iso-transl-E-slash)
+    ("/O"   . iso-transl-O-slash)
+    ("/a"   . iso-transl-a-slash)
+    ("/e"   . iso-transl-e-slash)
+    ("/o"   . iso-transl-o-slash)
+    ("1/2"  . iso-transl-one-half)
+    ("1/4"  . iso-transl-one-quarter)
+    ("3/4"  . iso-transl-three-quarters)
+    ("*<"   . iso-transl-angle-left)
+    ("<"    . iso-transl-angle-left)
+    ("*="   . iso-transl-macron)
+    ("="    . iso-transl-macron)
+    ("*>"   . iso-transl-angle-right)
+    (">"    . iso-transl-angle-right)
+    ("*?"   . iso-transl-inverted-question-mark)
+    ("?"    . iso-transl-inverted-question-mark)
+    ("*C"   . iso-transl-copyright-sign)
+    ("C"    . iso-transl-copyright-sign)
+    ("*L"   . iso-transl-pound-sign)
+    ("L"    . iso-transl-pound-sign)
+    ("*P"   . iso-transl-pilcrow)
+    ("P"    . iso-transl-pilcrow)
+    ("*R"   . iso-transl-registered-sign)
+    ("R"    . iso-transl-registered-sign)
+    ("*S"   . iso-transl-section-sign)
+    ("S"    . iso-transl-section-sign)
+    ("*Y"   . iso-transl-yen-sign)
+    ("Y"    . iso-transl-yen-sign)
+    ("^1"   . iso-transl-superscript-1)
+    ("^2"   . iso-transl-superscript-2)
+    ("^3"   . iso-transl-superscript-3)
+    ("^A"   . iso-transl-A-caret)
+    ("^E"   . iso-transl-E-caret)
+    ("^I"   . iso-transl-I-caret)
+    ("^O"   . iso-transl-O-caret)
+    ("^U"   . iso-transl-U-caret)
+    ("^a"   . iso-transl-a-caret)
+    ("^e"   . iso-transl-E-caret)
+    ("^i"   . iso-transl-I-caret)
+    ("^o"   . iso-transl-O-caret)
+    ("^u"   . iso-transl-U-caret)
+    ("_a"   . iso-transl-ordinal-indicator-feminine)
+    ("_o"   . iso-transl-ordinal-indicator-masculine)
+    ("`A"   . iso-transl-A-grave)
+    ("`E"   . iso-transl-E-grave)
+    ("`I"   . iso-transl-I-grave)
+    ("`O"   . iso-transl-O-grave)
+    ("`U"   . iso-transl-U-grave)
+    ("`a"   . iso-transl-a-grave)
+    ("`e"   . iso-transl-e-grave)
+    ("`i"   . iso-transl-i-grave)
+    ("`o"   . iso-transl-o-grave)
+    ("`u"   . iso-transl-u-grave)
+    ("*c"   . iso-transl-cent-sign)
+    ("c"    . iso-transl-cent-sign)
+    ("*o"   . iso-transl-degree-sign)
+    ("o"    . iso-transl-degree-sign)
+    ("*u"   . iso-transl-micro-sign)
+    ("u"    . iso-transl-micro-sign)
+    ("*m"   . iso-transl-micro-sign)
+    ("m"    . iso-transl-micro-sign)
+    ("*x"   . iso-transl-multiplication-sign)
+    ("x"    . iso-transl-multiplication-sign)
+    ("*|"   . iso-transl-broken-vertical-line)
+    ("|"    . iso-transl-broken-vertical-line)
+    ("~A"   . iso-transl-A-tilde)
+    ("~D"   . iso-transl-D-stroke)
+    ("~N"   . iso-transl-N-tilde)
+    ("~O"   . iso-transl-O-tilde)
+    ("~T"   . iso-transl-THORN)
+    ("~a"   . iso-transl-a-tilde)
+    ("~d"   . iso-transl-d-stroke)
+    ("~n"   . iso-transl-n-tilde)
+    ("~o"   . iso-transl-o-tilde)
+    ("~t"   . iso-transl-thorn)
+    ("~~"   . iso-transl-not-sign)
     ("' "   . "'")
     ("` "   . "`")
     ("\" "  . "\"")
@@ -175,6 +202,103 @@ Each element has the form (STRING . VECTOR).
 The sequence STRING of ASCII chars translates into the
 sequence VECTOR.  (VECTOR is normally one character long.)")
 
+(defalias 'iso-transl-no-break-space [160])
+(defalias 'iso-transl-inverted-exclamation-mark [161])
+(defalias 'iso-transl-cent-sign [162])
+(defalias 'iso-transl-pound-sign [163])
+(defalias 'iso-transl-general-currency-sign [164])
+(defalias 'iso-transl-yen-sign [165])
+(defalias 'iso-transl-broken-vertical-line [166])
+(defalias 'iso-transl-section-sign [167])
+(defalias 'iso-transl-diaeresis [168])
+(defalias 'iso-transl-copyright-sign [169])
+(defalias 'iso-transl-ordinal-indicator-feminine [170])
+(defalias 'iso-transl-angle-left [171])
+(defalias 'iso-transl-not-sign [172])
+(defalias 'iso-transl-soft-hyphen [173])
+(defalias 'iso-transl-registered-sign [174])
+(defalias 'iso-transl-macron [175])
+(defalias 'iso-transl-degree-sign [176])
+(defalias 'iso-transl-plus-or-minus-sign [177])
+(defalias 'iso-transl-superscript-2 [178])
+(defalias 'iso-transl-superscript-3 [179])
+(defalias 'iso-transl-acute-accent [180])
+(defalias 'iso-transl-micro-sign [181])
+(defalias 'iso-transl-pilcrow [182])
+(defalias 'iso-transl-middle-dot [183])
+(defalias 'iso-transl-cedilla [184])
+(defalias 'iso-transl-superscript-1 [185])
+(defalias 'iso-transl-ordinal-indicator-masculine [186])
+(defalias 'iso-transl-angle-right [187])
+(defalias 'iso-transl-one-quarter [188])
+(defalias 'iso-transl-one-half [189])
+(defalias 'iso-transl-three-quarters [190])
+(defalias 'iso-transl-inverted-question-mark [191])
+(defalias 'iso-transl-A-grave [192])
+(defalias 'iso-transl-A-acute [193])
+(defalias 'iso-transl-A-caret [194])
+(defalias 'iso-transl-A-tilde [195])
+(defalias 'iso-transl-A-umlaut [196])
+(defalias 'iso-transl-A-slash [197])
+(defalias 'iso-transl-E-slash [198])
+(defalias 'iso-transl-C-cedilla [199])
+(defalias 'iso-transl-E-grave [200])
+(defalias 'iso-transl-E-acute [201])
+(defalias 'iso-transl-E-caret [202])
+(defalias 'iso-transl-E-umlaut [203])
+(defalias 'iso-transl-I-grave [204])
+(defalias 'iso-transl-I-acute [205])
+(defalias 'iso-transl-I-caret [206])
+(defalias 'iso-transl-I-umlaut [207])
+(defalias 'iso-transl-D-stroke [208])
+(defalias 'iso-transl-N-tilde [209])
+(defalias 'iso-transl-O-grave [210])
+(defalias 'iso-transl-O-acute [211])
+(defalias 'iso-transl-O-caret [212])
+(defalias 'iso-transl-O-tilde [213])
+(defalias 'iso-transl-O-umlaut [214])
+(defalias 'iso-transl-multiplication-sign [215])
+(defalias 'iso-transl-O-slash [216])
+(defalias 'iso-transl-U-grave [217])
+(defalias 'iso-transl-U-acute [218])
+(defalias 'iso-transl-U-caret [219])
+(defalias 'iso-transl-U-umlaut [220])
+(defalias 'iso-transl-Y-acute [221])
+(defalias 'iso-transl-THORN [222])
+(defalias 'iso-transl-ss [223])
+(defalias 'iso-transl-a-grave [224])
+(defalias 'iso-transl-a-acute [225])
+(defalias 'iso-transl-a-caret [226])
+(defalias 'iso-transl-a-tilde [227])
+(defalias 'iso-transl-a-umlaut [228])
+(defalias 'iso-transl-a-slash [229])
+(defalias 'iso-transl-e-slash [230])
+(defalias 'iso-transl-c-cedilla [231])
+(defalias 'iso-transl-e-grave [232])
+(defalias 'iso-transl-e-acute [233])
+(defalias 'iso-transl-E-caret [234])
+(defalias 'iso-transl-e-umlaut [235])
+(defalias 'iso-transl-i-grave [236])
+(defalias 'iso-transl-i-acute [237])
+(defalias 'iso-transl-I-caret [238])
+(defalias 'iso-transl-i-umlaut [239])
+(defalias 'iso-transl-d-stroke [240])
+(defalias 'iso-transl-n-tilde [241])
+(defalias 'iso-transl-o-grave [242])
+(defalias 'iso-transl-o-acute [243])
+(defalias 'iso-transl-O-caret [244])
+(defalias 'iso-transl-o-tilde [245])
+(defalias 'iso-transl-o-umlaut [246])
+(defalias 'iso-transl-division-sign [247])
+(defalias 'iso-transl-o-slash [248])
+(defalias 'iso-transl-u-grave [249])
+(defalias 'iso-transl-u-acute [250])
+(defalias 'iso-transl-U-caret [251])
+(defalias 'iso-transl-u-umlaut [252])
+(defalias 'iso-transl-y-acute [253])
+(defalias 'iso-transl-thorn [254])
+(defalias 'iso-transl-y-umlaut [255])
+
 ;; Language-specific translation lists.
 (defvar iso-transl-language-alist
   '(("Esperanto"