("Ukrainian"): Fix nonascii-translation.

(cyrillic-alternativnyj-decode-table): Fix some entries.

diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index d0e428b4d0e6110655a49c9aac80a8c1bbcd137e..41c074aad526eca54af2262296577c1759cae18a 100644 (file)
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -300,16 +300,19 @@ This works wheher or not the table is is Unicode-based or
  "Ukrainian" `((coding-system koi8-u)
              (coding-priority koi8-u)
               (nonascii-translation
-               . ,(get 'cyrillic-koi8-r-nonascii-translation-table
+               . ,(get 'cyrillic-koi8-u-nonascii-translation-table
                        'translation-table))
               (input-method . "ukrainian-computer")
              (features code-pages)
              (documentation
-              . "Support for Ukrainian with koi8-u character set."))
+              . "Support for Ukrainian with KOI8-U character set."))
  '("Cyrillic"))
 
 ;;; ALTERNATIVNYJ stuff
 
+;; Fixme: It's unclear what's the correct table.  I've found
+;; statements both that it's the same as cp866 and somewhat different,
+;; but nothing that looks definitive.
 (defvar cyrillic-alternativnyj-decode-table
   [
    0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
@@ -336,7 +339,7 @@ This works wheher or not the table is is Unicode-based or
    ?\e$,2 4\e(B  ?\e$,2 T\e(B  ?\e$,2 L\e(B  ?\e$,2 <\e(B  ?\e$,2  \e(B  ?\e$,2 \\e(B  ?\e$,2 ~\e(B  ?\e$,2 \7f\e(B  ?\e$,2 z\e(B  ?\e$,2 t\e(B  ?\e$,2!)\e(B  ?\e$,2!&\e(B  ?\e$,2! \e(B  ?\e$,2 p\e(B  ?\e$,2!,\e(B  ?\e$,2!'\e(B
    ?\e$,2!(\e(B  ?\e$,2!$\e(B  ?\e$,2!%\e(B  ?\e$,2 y\e(B  ?\e$,2 x\e(B  ?\e$,2 r\e(B  ?\e$,2 s\e(B  ?\e$,2!+\e(B  ?\e$,2!*\e(B  ?\e$,2 8\e(B  ?\e$,2 ,\e(B  ?\e$,2!H\e(B  ?\e$,2!D\e(B  ?\e$,2!L\e(B  ?\e$,2!P\e(B  ?\e$,2!@\e(B
    ?\e,L`\e(B  ?\e,La\e(B  ?\e,Lb\e(B  ?\e,Lc\e(B  ?\e,Ld\e(B  ?\e,Le\e(B  ?\e,Lf\e(B  ?\e,Lg\e(B  ?\e,Lh\e(B  ?\e,Li\e(B  ?\e,Lj\e(B  ?\e,Lk\e(B  ?\e,Ll\e(B  ?\e,Lm\e(B  ?\e,Ln\e(B  ?\e,Lo\e(B
-   ?\e,L!\e(B  ?\e,Lq\e(B  ?\e,L$\e(B  ?\e,Lt\e(B  ?\e,L'\e(B  ?\e,Lw\e(B  ?\e,L.\e(B  ?\e,L~\e(B  248 249 250 251 ?\e,Lp\e(B  253 254 ?\e,L \e(B]
+   ?\e,L!\e(B  ?\e,Lq\e(B  ?\e,L$\e(B  ?\e,Lt\e(B  ?\e,L'\e(B  ?\e,Lw\e(B  ?\e,L.\e(B  ?\e,L~\e(B  ?\e,A0\e(B  ?\e$,1s"\e(B  ?\e,A7\e(B  ?\e$,1x:\e(B  ?\e,Lp\e(B  ?\e,A$\e(B  ?\e$,2!`\e(B  ?\e,L \e(B]
   "Cyrillic ALTERNATIVNYJ decoding table.")
 
 (let ((table (make-translation-table-from-vector
@@ -372,6 +375,8 @@ This works wheher or not the table is is Unicode-based or
 
 (cyrillic-unify-encoding 'cyrillic-alternativnyj-encode-table)
 
+;; Fixme: Check the cp866 here and in alias below.  See comment on the
+;; decode table above.
 (make-coding-system
  'cyrillic-alternativnyj 4 ?A
  "ALTERNATIVNYJ (CP866) 8-bit encoding for Cyrillic."