Doc fixes. Change coding to

iso-2022-7bit.
(latin1-display) <defgroup>: Add :link.
(latin1-display) <function>: Set variable latin1-display.

1 files changed, 394 insertions, 390 deletions

diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 511ff03e816..0bcf85cd01c 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -1,4 +1,4 @@
-;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*- coding: emacs-mule -*-
+;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 2000 Free Software Foundation, Inc.
 
@@ -34,12 +34,12 @@
 
 ;; For the Latin charsets the ASCII sequences are mostly consistent
 ;; with the Quail prefix input sequences.  Latin-4 uses the Quail
-;; postfix sequences as a prefix method isn't defined for Latin-4.
+;; postfix sequences since a prefix method isn't defined for Latin-4.
 
-;; A different approach is taken in the DOS display tables in
+;; [A different approach is taken in the DOS display tables in
 ;; term/internal.el, and the relevant ASCII sequences from there are
 ;; available as an alternative; see `latin1-display-mnemonic'.  Only
-;; these sequences are used for Cyrillic, Greek and Hebrew.
+;; these sequences are used for Cyrillic, Greek and Hebrew.]
 
 ;; If you don't even have Latin-1, see iso-ascii.el and use the
 ;; complete tables from internal.el.  The ASCII sequences used here
@@ -59,6 +59,7 @@ environments.")
 (defgroup latin1-display ()
   "Set up display tables for ISO8859 characters using Latin-1."
   :version "21.1"
+  :link '(emacs-commentary-link "latin1-disp")
   :group 'i18n)
 
 (defcustom latin1-display-format "{%s}"
@@ -99,8 +100,11 @@ See option `latin1-display' for the method.  The members of the list
 must be in `latin1-display-sets'.  With no arguments, reset the
 display for all of `latin1-display-sets'. See also `latin1-display-setup'."
   (if sets
-      (mapc #'latin1-display-setup sets)
-    (mapc #'latin1-display-reset latin1-display-sets)))
+      (progn (mapc #'latin1-display-setup sets)
+	     (setq latin1-display t))
+    (mapc #'latin1-display-reset latin1-display-sets)
+    (setq latin1-display nil))
+  (redraw-display))
 
 (defcustom latin1-display-mnemonic nil
   "Non-nil means to display potentially more mnemonic sequences.
@@ -123,8 +127,8 @@ formatted using `latin1-display-format'."
 
 (defun latin1-display-identities (charset)
   "Display each character in CHARSET as the corresponding Latin-1 character.
-CHARSET is a symbol naming a language environment using an ISO8859
-character set."
+CHARSET is a symbol which is the nickname of a language environment
+using an ISO8859 character set."
   (if (eq charset 'cyrillic)
       (setq charset 'cyrillic-iso))
   (let ((i 32)
@@ -137,7 +141,7 @@ character set."
 
 (defun latin1-display-reset (language)
   "Set up the default display for each character of LANGUAGE's charset.
-CHARSET is a symbol naming a language environment using an ISO8859
+LANGUAGE is a symbol naming a language environment using an ISO8859
 character set."
   (if (eq language 'cyrillic)
       (setq language 'cyrillic-iso))
@@ -204,66 +208,66 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?と "'C" "C'")
-	 (?ひ "'D" "/D")
-	 (?え "'S" "S'")
-	 (?よ "'c" "c'")
-	 (?を "'d" "/d")
-	 (?で "'L" "L'")
-	 (?ん "'n" "n'")
-	 (?び "'N" "N'")
-	 (?も "'r" "r'")
-	 (?ぢ "'R" "R'")
-	 (?じ "'s" "s'")
-	 (?ぞ "'z" "z'")
-	 (?ぎ "'Z" "Z'")
-	 (?ぃ "`A" "A;")
-	 (?ぬ "`E" "E;")
-	 (?ぅ "`L" "/L")
-	 (?が "`S" ",S")
-	 (?む "`T" ",T")
-	 (?け "`Z" "Z^.")
-	 (?こ "`a" "a;")
-	 (?さ "`l" "/l")
-	 (?れ "`e" "e;")
-	 (?ぜ "`s" ",s")
-	 (?�� "`t" ",t")
-	 (?ち "`z" "z^.")
-	 (?�� "`." "'.")
-	 (?づ "~A" "A(")
-	 (?な "~C" "C<")
-	 (?ぱ "~D" "D<")
-	 (?の "~E" "E<")
-	 (?ゎ "~e" "e<")
-	 (?ぇ "~L" "L<")
-	 (?ぴ "~N" "N<")
-	 (?ぷ "~O" "O''")
-	 (?ぺ "~R" "R<")
-	 (?か "~S" "S<")
-	 (?き "~T" "T<")
-	 (?ぽ "~U" "U''")
-	 (?ぐ "~Z" "Z<")
-	 (?ゅ "~a" "a(}")
-	 (?り "~c" "c<")
-	 (?ゑ "~d" "d<")
-	 (?し "~l" "l<")
-	 (?�� "~n" "n<")
-	 (?�� "~o" "o''")
-	 (?�� "~r" "r<")
-	 (?せ "~s" "s<")
-	 (?そ "~t" "t<")
-	 (?�� "~u" "u''")
-	 (?だ "~z" "z<")
-	 (?す "~v" "'<")			; ?い in latin-pre
-	 (?い "~~" "'(")
-	 (?�� "uu" "u^0")
-	 (?ほ "UU" "U^0")
-	 (?て "\"A")
-	 (?ゆ "\"a")
-	 (?ね "\"E" "E:")
-	 (?ろ "\"e")
-	 (?た "''" "'")
-	 (?す "'<")			; Lynx's rendering of caron
+       '((?,BF(B "'C" "C'")
+	 (?,BP(B "'D" "/D")
+	 (?,B&(B "'S" "S'")
+	 (?,Bf(B "'c" "c'")
+	 (?,Bp(B "'d" "/d")
+	 (?,BE(B "'L" "L'")
+	 (?,Bq(B "'n" "n'")
+	 (?,BQ(B "'N" "N'")
+	 (?,B`(B "'r" "r'")
+	 (?,B@(B "'R" "R'")
+	 (?,B6(B "'s" "s'")
+	 (?,B<(B "'z" "z'")
+	 (?,B,(B "'Z" "Z'")
+	 (?,B!(B "`A" "A;")
+	 (?,BJ(B "`E" "E;")
+	 (?,B#(B "`L" "/L")
+	 (?,B*(B "`S" ",S")
+	 (?,B^(B "`T" ",T")
+	 (?,B/(B "`Z" "Z^.")
+	 (?,B1(B "`a" "a;")
+	 (?,B3(B "`l" "/l")
+	 (?,Bj(B "`e" "e;")
+	 (?,B:(B "`s" ",s")
+	 (?,B~(B "`t" ",t")
+	 (?,B?(B "`z" "z^.")
+	 (?,B(B "`." "'.")
+	 (?,BC(B "~A" "A(")
+	 (?,BH(B "~C" "C<")
+	 (?,BO(B "~D" "D<")
+	 (?,BL(B "~E" "E<")
+	 (?,Bl(B "~e" "e<")
+	 (?,B%(B "~L" "L<")
+	 (?,BR(B "~N" "N<")
+	 (?,BU(B "~O" "O''")
+	 (?,BX(B "~R" "R<")
+	 (?,B)(B "~S" "S<")
+	 (?,B+(B "~T" "T<")
+	 (?,B[(B "~U" "U''")
+	 (?,B.(B "~Z" "Z<")
+	 (?,Bc(B "~a" "a(}")
+	 (?,Bh(B "~c" "c<")
+	 (?,Bo(B "~d" "d<")
+	 (?,B5(B "~l" "l<")
+	 (?,Br(B "~n" "n<")
+	 (?,Bu(B "~o" "o''")
+	 (?,Bx(B "~r" "r<")
+	 (?,B9(B "~s" "s<")
+	 (?,B;(B "~t" "t<")
+	 (?,B{(B "~u" "u''")
+	 (?,B>(B "~z" "z<")
+	 (?,B7(B "~v" "'<")			; ?,B"(B in latin-pre
+	 (?,B"(B "~~" "'(")
+	 (?,By(B "uu" "u^0")
+	 (?,BY(B "UU" "U^0")
+	 (?,BD(B "\"A")
+	 (?,Bd(B "\"a")
+	 (?,BK(B "\"E" "E:")
+	 (?,Bk(B "\"e")
+	 (?,B=(B "''" "'")
+	 (?,B7(B "'<")			; Lynx's rendering of caron
 	 ))))
 
    ((eq set 'latin-3)
@@ -273,34 +277,34 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?Γ "/H")
-	 (?Δ "~`" "'(")
-	 (?Θ "^H" "H^")
-	 (?Ω "^h" "h^")
-	 (?Λ ".I" "I^.")
-	 (?Μ ",S")
-	 (?Ν "~G" "G(")
-	 (?Ξ "^J" "J^")
-	 (?Ρ ".Z" "Z^.")
-	 (?Τ "/h")
-	 (?�ｹ ".i" "i^.")
-	 (?�ｺ ",s")
-	 (?�ｻ "~g" "g(")
-	 (?�ｼ "^j" "j^")
-	 (?α ".Z" "z^.")
-	 (?η ".c" "C^.")
-	 (?θ "^C" "C^")
-	 (?ψ ".G" "G^.")
-	 (?�ﾘ "^G" "G^")
-	 (?�ﾝ "~U" "U(")
-	 (?�ﾞ "^S" "S^")
-	 (?�� ".C" "c^.")
-	 (?�� "^c" "c^")
-	 (?�� ".g" "g^.")
-	 (?�� "^g" "g^")
-	 (?�� "~u" "u(")
-	 (?�� "^s" "s^")
-	 (?�� "/." "^.")))))
+       '((?,C!(B "/H")
+	 (?,C"(B "~`" "'(")
+	 (?,C&(B "^H" "H^")
+	 (?,C6(B "^h" "h^")
+	 (?,C)(B ".I" "I^.")
+	 (?,C*(B ",S")
+	 (?,C+(B "~G" "G(")
+	 (?,C,(B "^J" "J^")
+	 (?,C/(B ".Z" "Z^.")
+	 (?,C1(B "/h")
+	 (?,C9(B ".i" "i^.")
+	 (?,C:(B ",s")
+	 (?,C;(B "~g" "g(")
+	 (?,C<(B "^j" "j^")
+	 (?,C?(B ".Z" "z^.")
+	 (?,CE(B ".c" "C^.")
+	 (?,CF(B "^C" "C^")
+	 (?,CU(B ".G" "G^.")
+	 (?,CX(B "^G" "G^")
+	 (?,C](B "~U" "U(")
+	 (?,C^(B "^S" "S^")
+	 (?,Ce(B ".C" "c^.")
+	 (?,Cf(B "^c" "c^")
+	 (?,Cu(B ".g" "g^.")
+	 (?,Cx(B "^g" "g^")
+	 (?,C}(B "~u" "u(")
+	 (?,C~(B "^s" "s^")
+	 (?,C(B "/." "^.")))))
 
    ((eq set 'latin-4)
     (when (or force
@@ -309,55 +313,55 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?┌ "A," "A;")
-	 (?┐ "k/" "kk")
-	 (?┘ "R," ",R")
-	 (?├ "I~" "?I")
-	 (?┬ "L," ",L")
-	 (?┼ "S~" "S<")
-	 (?━ "E-")
-	 (?┃ "G," ",G")
-	 (?┏ "T/" "/T")
-	 (?┛ "Z~" "Z<")
-	 (?┳ "a," "a;")
-	 (?┫ "';")
-	 (?┻ "r," ",r")
-	 (?┠ "i~" "~i")
-	 (?┯ "l," ",l")
-	 (?┨ "'<")
-	 (?┿ "s~" "s<")
-	 (?┝ "e-")
-	 (?┰ "g," ",g")
-	 (?┥ "t/" "/t")
-	 (?┸ "N/" "NG")
-	 (?╂ "z~" "z<")
-	 (?�ｿ "n/" "ng")
-	 (?�ﾀ "A-")
-	 (?�ﾇ "I," "I;")
-	 (?�ﾈ "C~" "C<")
-	 (?�ﾊ "E," "E;")
-	 (?�ﾌ "E." "E^.")
-	 (?�ﾏ "I-")
-	 (?�ﾑ "N," ",N")
-	 (?�ﾒ "O-")
-	 (?�ﾓ "K," ",K")
-	 (?�ﾙ "U," "U;")
-	 (?�ﾝ "U~" "~U")
-	 (?�ﾞ "U-")
-	 (?�� "a-")
-	 (?�� "i," "i;")
-	 (?�� "c~" "c<")
-	 (?�� "e," "e;")
-	 (?�� "e." "e^.")
-	 (?�� "i-")
-	 (?�� "d/" "/d")
-	 (?�� "n," ",n")
-	 (?�� "o-")
-	 (?�� "k," ",k")
-	 (?�� "u," "u;")
-	 (?�� "u~" "~u")
-	 (?�� "u-")
-	 (?�� "^.")))))
+       '((?,D!(B "A," "A;")
+	 (?,D"(B "k/" "kk")
+	 (?,D#(B "R," ",R")
+	 (?,D%(B "I~" "?I")
+	 (?,D&(B "L," ",L")
+	 (?,D)(B "S~" "S<")
+	 (?,D*(B "E-")
+	 (?,D+(B "G," ",G")
+	 (?,D,(B "T/" "/T")
+	 (?,D.(B "Z~" "Z<")
+	 (?,D1(B "a," "a;")
+	 (?,D2(B "';")
+	 (?,D3(B "r," ",r")
+	 (?,D5(B "i~" "~i")
+	 (?,D6(B "l," ",l")
+	 (?,D7(B "'<")
+	 (?,D9(B "s~" "s<")
+	 (?,D:(B "e-")
+	 (?,D;(B "g," ",g")
+	 (?,D<(B "t/" "/t")
+	 (?,D=(B "N/" "NG")
+	 (?,D>(B "z~" "z<")
+	 (?,D?(B "n/" "ng")
+	 (?,D@(B "A-")
+	 (?,DG(B "I," "I;")
+	 (?,DH(B "C~" "C<")
+	 (?,DJ(B "E," "E;")
+	 (?,DL(B "E." "E^.")
+	 (?,DO(B "I-")
+	 (?,DQ(B "N," ",N")
+	 (?,DR(B "O-")
+	 (?,DS(B "K," ",K")
+	 (?,DY(B "U," "U;")
+	 (?,D](B "U~" "~U")
+	 (?,D^(B "U-")
+	 (?,D`(B "a-")
+	 (?,Dg(B "i," "i;")
+	 (?,Dh(B "c~" "c<")
+	 (?,Dj(B "e," "e;")
+	 (?,Dl(B "e." "e^.")
+	 (?,Do(B "i-")
+	 (?,Dp(B "d/" "/d")
+	 (?,Dq(B "n," ",n")
+	 (?,Dr(B "o-")
+	 (?,Ds(B "k," ",k")
+	 (?,Dy(B "u," "u;")
+	 (?,D}(B "u~" "~u")
+	 (?,D~(B "u-")
+	 (?,D(B "^.")))))
 
    ((eq set 'latin-5)
     (when (or force
@@ -366,15 +370,15 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?昨 "~g" "g(")
-	 (?災 "~G" "G(")
-	 (?在 ".I" "I^.")
-	 (?�� ",s")
-	 (?材 ",S")
-	 (?碕 "^e" "e<")			; from latin-post
-	 (?作 ".e" "e^.")
-	 (?搾 "\"i" "i-")		; from latin-post
-	 (?�� ".i" "i.")))))
+       '((?,Mp(B "~g" "g(")
+	 (?,MP(B "~G" "G(")
+	 (?,M](B ".I" "I^.")
+	 (?,M~(B ",s")
+	 (?,M^(B ",S")
+	 (?,Mj(B "^e" "e<")			; from latin-post
+	 (?,Ml(B ".e" "e^.")
+	 (?,Mo(B "\"i" "i-")		; from latin-post
+	 (?,M}(B ".i" "i.")))))
 
    ((eq set 'latin-8)
     (when (or force
@@ -383,37 +387,37 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?升 ".B" "B`")
-	 (?召 ".b" "b`")
-	 (?唱 ".c" "c`")
-	 (?商 ".C" "C`")
-	 (?嘗 ".D" "D`")
-	 (?将 ".d" "d`")
-	 (?昇 "`w")
-	 (?妾 "`W")
-	 (?昭 "'w" "w'")
-	 (?宵 "'W" "W'")
-	 (?松 "`y")
-	 (?小 "`Y")
-	 (?廠 ".f" "f`")
-	 (?床 ".F" "F`")
-	 (?承 ".g" "g`")
-	 (?彰 ".G" "G`")
-	 (?招 ".m" "m`")
-	 (?抄 ".M" "M`")
-	 (?昌 ".p" "p`")
-	 (?捷 ".P" "P`")
-	 (?樵 ".s" "s`")
-	 (?晶 ".S" "S`")
-	 (?樟 "\"w")
-	 (?梢 "\"W")
-	 (?条 "^w" "w^")
-	 (?紹 "^W" "W^")
-	 (?譲 ".t" "t`")
-	 (?訟 ".T" "T`")
-	 (?�� "^y" "y^")
-	 (?鉦 "^Y" "Y^")
-	 (?庄 "\"Y")))))
+       '((?,_!(B ".B" "B`")
+	 (?,_"(B ".b" "b`")
+	 (?,_%(B ".c" "c`")
+	 (?,_$(B ".C" "C`")
+	 (?,_&(B ".D" "D`")
+	 (?,_+(B ".d" "d`")
+	 (?,_8(B "`w")
+	 (?,_((B "`W")
+	 (?,_:(B "'w" "w'")
+	 (?,_*(B "'W" "W'")
+	 (?,_<(B "`y")
+	 (?,_,(B "`Y")
+	 (?,_1(B ".f" "f`")
+	 (?,_0(B ".F" "F`")
+	 (?,_3(B ".g" "g`")
+	 (?,_2(B ".G" "G`")
+	 (?,_5(B ".m" "m`")
+	 (?,_4(B ".M" "M`")
+	 (?,_9(B ".p" "p`")
+	 (?,_7(B ".P" "P`")
+	 (?,_?(B ".s" "s`")
+	 (?,_;(B ".S" "S`")
+	 (?,_>(B "\"w")
+	 (?,_=(B "\"W")
+	 (?,_p(B "^w" "w^")
+	 (?,_P(B "^W" "W^")
+	 (?,_w(B ".t" "t`")
+	 (?,_W(B ".T" "T`")
+	 (?,_~(B "^y" "y^")
+	 (?,_^(B "^Y" "Y^")
+	 (?,_/(B "\"Y")))))
 
    ((eq set 'latin-9)
     (when (or force
@@ -422,14 +426,14 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?耳 "~s" "s<")
-	 (?示 "~S" "S<")
-	 (?痔 "Euro" "E=")
-	 (?失 "~z" "z<")
-	 (?雫 "~Z" "Z<")
-	 (?疾 "\"Y")
-	 (?漆 "oe")
-	 (?湿 "OE")))))
+       '((?,b((B "~s" "s<")
+	 (?,b&(B "~S" "S<")
+	 (?,b$(B "Euro" "E=")
+	 (?,b8(B "~z" "z<")
+	 (?,b4(B "~Z" "Z<")
+	 (?,b>(B "\"Y")
+	 (?,b=(B "oe")
+	 (?,b<(B "OE")))))
 
    ((eq set 'greek)
     (when (or force
@@ -437,82 +441,82 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?�｡ "9'")
-	 (?�｢ "'9")
-	 (?�ｯ "-M")
-	 (?�ｵ "'%")
-	 (?�ｶ "'A")
-	 (?�ｸ "'E")
-	 (?�ｹ "'H")
-	 (?�ｺ "'I")
-	 (?�ｼ "'O")
-	 (?�ｾ "'Y")
-	 (?�ｿ "W%")
-	 (?�ﾀ "i3")
-	 (?�ﾃ "G*")
-	 (?�ﾄ "D*")
-	 (?�ﾈ "TH")
-	 (?�ﾋ "L*")
-	 (?�ﾎ "C*")
-	 (?�ﾐ "P*")
-	 (?�ﾓ "S*")
-	 (?�ﾖ "F*")
-	 (?�ﾘ "Q*")
-	 (?�ﾙ "W*")
-	 (?�ﾚ "\"I")
-	 (?�ﾛ "\"Y")
-	 (?�ﾜ "a%")
-	 (?�ﾝ "e%")
-	 (?�ﾞ "y%")
-	 (?�ﾟ "i%")
-	 (?�� "u3")
-	 (?�� "a*")
-	 (?�� "b*")
-	 (?�� "g*")
-	 (?�� "d*")
-	 (?�� "e*")
-	 (?�� "z*")
-	 (?�� "y*")
-	 (?�� "h*")
-	 (?�� "i*")
-	 (?�� "k")
-	 (?�� "l*")
-	 (?�� "m*")
-	 (?�� "n*")
-	 (?�� "c*")
-	 (?�� "p*")
-	 (?�� "r*")
-	 (?�� "*s")
-	 (?�� "s*")
-	 (?�� "t*")
-	 (?�� "u")
-	 (?�� "f*")
-	 (?�� "x*")
-	 (?�� "q*")
-	 (?�� "w*")
-	 (?�� "\"i")
-	 (?�� "\"u")
-	 (?�� "'o")
-	 (?�� "'u")
-	 (?�� "'w")))
+       '((?,F!(B "9'")
+	 (?,F"(B "'9")
+	 (?,F/(B "-M")
+	 (?,F5(B "'%")
+	 (?,F6(B "'A")
+	 (?,F8(B "'E")
+	 (?,F9(B "'H")
+	 (?,F:(B "'I")
+	 (?,F<(B "'O")
+	 (?,F>(B "'Y")
+	 (?,F?(B "W%")
+	 (?,F@(B "i3")
+	 (?,FC(B "G*")
+	 (?,FD(B "D*")
+	 (?,FH(B "TH")
+	 (?,FK(B "L*")
+	 (?,FN(B "C*")
+	 (?,FP(B "P*")
+	 (?,FS(B "S*")
+	 (?,FV(B "F*")
+	 (?,FX(B "Q*")
+	 (?,FY(B "W*")
+	 (?,FZ(B "\"I")
+	 (?,F[(B "\"Y")
+	 (?,F\(B "a%")
+	 (?,F](B "e%")
+	 (?,F^(B "y%")
+	 (?,F_(B "i%")
+	 (?,F`(B "u3")
+	 (?,Fa(B "a*")
+	 (?,Fb(B "b*")
+	 (?,Fc(B "g*")
+	 (?,Fd(B "d*")
+	 (?,Fe(B "e*")
+	 (?,Ff(B "z*")
+	 (?,Fg(B "y*")
+	 (?,Fh(B "h*")
+	 (?,Fi(B "i*")
+	 (?,Fj(B "k")
+	 (?,Fk(B "l*")
+	 (?,Fl(B "m*")
+	 (?,Fm(B "n*")
+	 (?,Fn(B "c*")
+	 (?,Fp(B "p*")
+	 (?,Fq(B "r*")
+	 (?,Fr(B "*s")
+	 (?,Fs(B "s*")
+	 (?,Ft(B "t*")
+	 (?,Fu(B "u")
+	 (?,Fv(B "f*")
+	 (?,Fw(B "x*")
+	 (?,Fx(B "q*")
+	 (?,Fy(B "w*")
+	 (?,Fz(B "\"i")
+	 (?,F{(B "\"u")
+	 (?,F|(B "'o")
+	 (?,F}(B "'u")
+	 (?,F~(B "'w")))
       (mapc
        (lambda (l)
 	 (aset standard-display-table (car l) (string-to-vector (cadr l))))
-       '((?�ﾁ "A")
-	 (?�ﾂ "B")
-	 (?�ﾅ "E")
-	 (?�ﾆ "Z")
-	 (?�ﾇ "H")
-	 (?�ﾉ "I")
-	 (?�ﾊ "J")
-	 (?�ﾌ "M")
-	 (?�ﾍ "N")
-	 (?�ﾏ "O")
-	 (?�ﾑ "P")
-	 (?�ﾔ "T")
-	 (?�ﾕ "Y")
-	 (?�ﾗ "X")
-	 (?�� "o")))))
+       '((?,FA(B "A")
+	 (?,FB(B "B")
+	 (?,FE(B "E")
+	 (?,FF(B "Z")
+	 (?,FG(B "H")
+	 (?,FI(B "I")
+	 (?,FJ(B "J")
+	 (?,FL(B "M")
+	 (?,FM(B "N")
+	 (?,FO(B "O")
+	 (?,FQ(B "P")
+	 (?,FT(B "T")
+	 (?,FU(B "Y")
+	 (?,FW(B "X")
+	 (?,Fo(B "o")))))
 
    ((eq set 'hebrew)
     (when (or force
@@ -529,34 +533,34 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (aset standard-display-table (car l) (string-to-vector (cadr l))))
-       '((?衣 "=2")
-	 (?謂 "A+")
-	 (?違 "B+")
-	 (?遺 "G+")
-	 (?医 "D+")
-	 (?井 "H+")
-	 (?亥 "W+")
-	 (?域 "Z+")
-	 (?育 "X+")
-	 (?郁 "Tj")
-	 (?磯 "J+")
-	 (?一 "K%")
-	 (?壱 "K+")
-	 (?溢 "L+")
-	 (?逸 "M%")
-	 (?稲 "M+")
-	 (?茨 "N%")
-	 (?芋 "N+")
-	 (?鰯 "S+")
-	 (?允 "E+")
-	 (?印 "P%")
-	 (?咽 "P+")
-	 (?員 "Zj")
-	 (?因 "ZJ")
-	 (?姻 "Q+")
-	 (?引 "R+")
-	 (?飲 "Sh")
-	 (?淫 "T+")))))
+       '((?,H_(B "=2")
+	 (?,H`(B "A+")
+	 (?,Ha(B "B+")
+	 (?,Hb(B "G+")
+	 (?,Hc(B "D+")
+	 (?,Hd(B "H+")
+	 (?,He(B "W+")
+	 (?,Hf(B "Z+")
+	 (?,Hg(B "X+")
+	 (?,Hh(B "Tj")
+	 (?,Hi(B "J+")
+	 (?,Hj(B "K%")
+	 (?,Hk(B "K+")
+	 (?,Hl(B "L+")
+	 (?,Hm(B "M%")
+	 (?,Hn(B "M+")
+	 (?,Ho(B "N%")
+	 (?,Hp(B "N+")
+	 (?,Hq(B "S+")
+	 (?,Hr(B "E+")
+	 (?,Hs(B "P%")
+	 (?,Ht(B "P+")
+	 (?,Hu(B "Zj")
+	 (?,Hv(B "ZJ")
+	 (?,Hw(B "Q+")
+	 (?,Hx(B "R+")
+	 (?,Hy(B "Sh")
+	 (?,Hz(B "T+")))))
 
    ((eq set 'cyrillic)
     (setq set 'cyrillic-iso)
@@ -565,104 +569,104 @@ is.  If FORCE is non-nil, set up the display regardless."
       (mapc
        (lambda (l)
 	 (apply 'latin1-display-char l))
-       '((?犬 "Dj")
-	 (?献 "Gj")
-	 (?研 "IE")
-	 (?見 "Lj")
-	 (?謙 "Nj")
-	 (?賢 "Ts")
-	 (?軒 "Kj")
-	 (?鍵 "V%")
-	 (?険 "Dzh")
-	 (?験 "B=")
-	 (?元 "�")
-	 (?原 "D")
-	 (?幻 "Z%")
-	 (?弦 "3")
-	 (?減 "U")
-	 (?源 "J=")
-	 (?現 "L=")
-	 (?諺 "P=")
-	 (?古 "Y")
-	 (?呼 "�")
-	 (?姑 "C=")
-	 (?孤 "C%")
-	 (?己 "S%")
-	 (?庫 "Sc")
-	 (?弧 "=\"")
-	 (?戸 "Y=")
-	 (?故 "%\"")
-	 (?枯 "Ee")
-	 (?湖 "Yu")
-	 (?狐 "Ya")
-	 (?袴 "b")
-	 (?股 "v=")
-	 (?胡 "g=")
-	 (?菰 "g")
-	 (?誇 "z%")
-	 (?跨 "z=")
-	 (?鈷 "u")
-	 (?雇 "j=")
-	 (?顧 "k")
-	 (?鼓 "l=")
-	 (?五 "m=")
-	 (?互 "n=")
-	 (?午 "n")
-	 (?呉 "p")
-	 (?娯 "t=")
-	 (?御 "f=")
-	 (?梧 "c=")
-	 (?檎 "c%")
-	 (?瑚 "s%")
-	 (?碁 "sc")
-	 (?語 "='")
-	 (?誤 "y=")
-	 (?護 "%'")
-	 (?醐 "ee")
-	 (?乞 "yu")
-	 (?鯉 "ya")
-	 (?交 "N0")
-	 (?侯 "dj")
-	 (?候 "gj")
-	 (?倖 "ie")
-	 (?勾 "lj")
-	 (?厚 "nj")
-	 (?口 "ts")
-	 (?向 "kj")
-	 (?�� "v%")
-	 (?�� "dzh")))
+       '((?,L"(B "Dj")
+	 (?,L#(B "Gj")
+	 (?,L$(B "IE")
+	 (?,L)(B "Lj")
+	 (?,L*(B "Nj")
+	 (?,L+(B "Ts")
+	 (?,L,(B "Kj")
+	 (?,L.(B "V%")
+	 (?,L/(B "Dzh")
+	 (?,L1(B "B=")
+	 (?,L3(B "�")
+	 (?,L4(B "D")
+	 (?,L6(B "Z%")
+	 (?,L7(B "3")
+	 (?,L8(B "U")
+	 (?,L9(B "J=")
+	 (?,L;(B "L=")
+	 (?,L?(B "P=")
+	 (?,LC(B "Y")
+	 (?,LD(B "�")
+	 (?,LF(B "C=")
+	 (?,LG(B "C%")
+	 (?,LH(B "S%")
+	 (?,LI(B "Sc")
+	 (?,LJ(B "=\"")
+	 (?,LK(B "Y=")
+	 (?,LL(B "%\"")
+	 (?,LM(B "Ee")
+	 (?,LN(B "Yu")
+	 (?,LO(B "Ya")
+	 (?,LQ(B "b")
+	 (?,LR(B "v=")
+	 (?,LS(B "g=")
+	 (?,LT(B "g")
+	 (?,LV(B "z%")
+	 (?,LW(B "z=")
+	 (?,LX(B "u")
+	 (?,LY(B "j=")
+	 (?,LZ(B "k")
+	 (?,L[(B "l=")
+	 (?,L\(B "m=")
+	 (?,L](B "n=")
+	 (?,L_(B "n")
+	 (?,L`(B "p")
+	 (?,Lb(B "t=")
+	 (?,Ld(B "f=")
+	 (?,Lf(B "c=")
+	 (?,Lg(B "c%")
+	 (?,Lh(B "s%")
+	 (?,Li(B "sc")
+	 (?,Lj(B "='")
+	 (?,Lk(B "y=")
+	 (?,Ll(B "%'")
+	 (?,Lm(B "ee")
+	 (?,Ln(B "yu")
+	 (?,Lo(B "ya")
+	 (?,Lp(B "N0")
+	 (?,Lr(B "dj")
+	 (?,Ls(B "gj")
+	 (?,Lt(B "ie")
+	 (?,Ly(B "lj")
+	 (?,Lz(B "nj")
+	 (?,L{(B "ts")
+	 (?,L|(B "kj")
+	 (?,L~(B "v%")
+	 (?,L(B "dzh")))
       (mapc
        (lambda (l)
 	 (aset standard-display-table (car l) (string-to-vector (cadr l))))
-       '((?牽 "⇒")
-	 (?硯 "S")
-	 (?絹 "I")
-	 (?県 "�ﾏ")
-	 (?肩 "J")
-	 (?佼 "��")
-	 (?�� "〒")
-	 (?遣 "-")
-	 (?顕 "A")
-	 (?鹸 "B")
-	 (?厳 "E")
-	 (?玄 "K")
-	 (?絃 "M")
-	 (?舷 "H")
-	 (?言 "O")
-	 (?限 "P")
-	 (?乎 "C")
-	 (?個 "T")
-	 (?固 "X")
-	 (?糊 "a")
-	 (?虎 "e")
-	 (?伍 "o")
-	 (?吾 "c")
-	 (?後 "y")
-	 (?悟 "x")
-	 (?光 "s")
-	 (?公 "i")
-	 (?功 "��")
-	 (?効 "j")))))
+       '((?,L!(B ",AK(B")
+	 (?,L%(B "S")
+	 (?,L&(B "I")
+	 (?,L'(B ",AO(B")
+	 (?,L((B "J")
+	 (?,Lq(B ",Ak(B")
+	 (?,L}(B ",A'(B")
+	 (?,L-(B "-")
+	 (?,L0(B "A")
+	 (?,L2(B "B")
+	 (?,L5(B "E")
+	 (?,L:(B "K")
+	 (?,L<(B "M")
+	 (?,L=(B "H")
+	 (?,L>(B "O")
+	 (?,L@(B "P")
+	 (?,LA(B "C")
+	 (?,LB(B "T")
+	 (?,LE(B "X")
+	 (?,LP(B "a")
+	 (?,LU(B "e")
+	 (?,L^(B "o")
+	 (?,La(B "c")
+	 (?,Lc(B "y")
+	 (?,Le(B "x")
+	 (?,Lu(B "s")
+	 (?,Lv(B "i")
+	 (?,Lw(B ",Ao(B")
+	 (?,Lx(B "j")))))
 
    (t (error "Unsupported character set: %S" set)))