view lisp/mule/cyril-util.el @ 4451:e214ff9f9507

Use char-tables, not vectors, to instantiate the display table specifiers. 2007-07-21 Aidan Kehoe <kehoea@parhasard.net> * mule/cyril-util.el: * mule/cyril-util.el (cyrillic-encode-koi8-r-char): Removed. * mule/cyril-util.el (cyrillic-encode-alternativnyj-char): Removed. No-one uses these functions in google.com/codesearch, GNU have a comment doubting their utility, and their implementation is trivial. * mule/cyril-util.el (cyrillic-language-alist): Reformatted. * mule/cyril-util.el (standard-display-table)): Removed. It wasn't used anyway. * mule/cyril-util.el (standard-display-cyrillic-translit): Rewrite it to work with character tables as display tables, and not to abort with an error. 2007-07-21 Aidan Kehoe <kehoea@parhasard.net> * disp-table.el: * disp-table.el (make-display-table): Moved earlier in the file in a weak attempt at making syncing with GNU easier. * disp-table.el (frob-display-table): Autoload it, accept TAG-SET, for editing specifiers. * disp-table.el (describe-display-table): Have it handle character sets. * disp-table.el (standard-display-8bit-1): * disp-table.el (standard-display-8bit): * disp-table.el (standard-display-default-1): * disp-table.el (standard-display-ascii): * disp-table.el (standard-display-g1): * disp-table.el (standard-display-graphic): * disp-table.el (standard-display-underline): * disp-table.el (standard-display-european): Rework them all to use put-char-table, remove-char-table instead of aset. Limit standard-display-g1, standard-display-graphic to TTYs; have standard-display-underline work on X11 too. * font.el (font-caps-display-table): Use put-char-table instead of aset when editing a display table. * x-init.el: * x-init.el (tab): Create the initial display table as a char-table, not a vector.
author Aidan Kehoe <kehoea@parhasard.net>
date Mon, 24 Dec 2007 20:22:08 +0100
parents 465bd3c7d932
children 1f0aa40cafe0
line wrap: on
line source

;;; cyril-util.el ---  utilities for Cyrillic scripts -*- coding: iso-2022-7bit; -*-

;; Copyright (C) 1997  Free Software Foundation, Inc.
;; Copyright (C) 2002 Ben Wing.

;; Keywords: mule, multilingual, Cyrillic

;; This file is part of XEmacs.

;; XEmacs is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.

;; XEmacs is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
;; General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING.  If not, write to the Free
;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.

;;; Synched up with: Emacs 21.1 (language/cyril-util.el).

;;; Commentary:

;;; #### Remove this, use the one in packages instead, but with the below
;;; standard-display-cyrillic-translit. This file is unfortunately shadowed
;;; if you have the Mule packages installed!

;;; Code:


;; Display 

;; Written by Valery Alexeev <valery@math.uga.edu>.

(defvar cyrillic-language-alist
      '(("Belorussian") ("Bulgarian") ("Macedonian") ("Russian") ("Serbian")
        ("Ukrainian"))
      "*List of known Cyrillic languages")

;;;###autoload
(defun standard-display-cyrillic-translit (&optional cyrillic-language)
  "Display a cyrillic buffer using a transliteration.
For readability, the table is slightly
different from the one used for the input method `cyrillic-translit'.

The argument is a string which specifies which language you are using;
that affects the choice of transliterations slightly.
Possible values are listed in 'cyrillic-language-alist'.
If the argument is t, we use the default cyrillic transliteration.
If the argument is nil, we return the display table to its standard state."
  (interactive
   (list
    (let* ((completion-ignore-case t))
      (completing-read
       "Cyrillic language (default nil): "
       cyrillic-language-alist nil t nil nil nil))))
  (when (equal cyrillic-language "")
    (setq cyrillic-language nil))
  (frob-display-table
   (lambda (display-table)
     (if (null cyrillic-language)
         (if (char-table-p display-table)
             (remove-char-table 'cyrillic-iso8859-5 display-table))
       (put-display-table ?,LP(B "a"   display-table)
       (put-display-table ?,LQ(B "b"   display-table)
       (put-display-table ?,LR(B "v"   display-table)
       (put-display-table ?,LS(B "g"   display-table)
       (put-display-table ?,LT(B "d"   display-table)
       (put-display-table ?,LU(B "e"   display-table)
       (put-display-table ?,Lq(B "yo"  display-table)
       (put-display-table ?,LV(B "zh"  display-table)
       (put-display-table ?,LW(B "z"   display-table)
       (put-display-table ?,LX(B "i"   display-table)
       (put-display-table ?,LY(B "j"   display-table)
       (put-display-table ?,LZ(B "k"   display-table)
       (put-display-table ?,L[(B "l"   display-table)
       (put-display-table ?,L\(B "m"   display-table)
       (put-display-table ?,L](B "n"   display-table)
       (put-display-table ?,L^(B "o"   display-table)
       (put-display-table ?,L_(B "p"   display-table)
       (put-display-table ?,L`(B "r"   display-table)
       (put-display-table ?,La(B "s"   display-table)
       (put-display-table ?,Lb(B "t"   display-table)
       (put-display-table ?,Lc(B "u"   display-table)
       (put-display-table ?,Ld(B "f"   display-table)
       (put-display-table ?,Le(B "kh"  display-table)
       (put-display-table ?,Lf(B "ts"  display-table)
       (put-display-table ?,Lg(B "ch"  display-table)
       (put-display-table ?,Lh(B "sh"  display-table)
       (put-display-table ?,Li(B "sch" display-table)
       (put-display-table ?,Lj(B "~"   display-table)
       (put-display-table ?,Lk(B "y"   display-table)
       (put-display-table ?,Ll(B "'"   display-table)
       (put-display-table ?,Lm(B "e'"  display-table)
       (put-display-table ?,Ln(B "yu"  display-table)
       (put-display-table ?,Lo(B "ya"  display-table)
       (put-display-table ?,L0(B "A"   display-table)
       (put-display-table ?,L1(B "B"   display-table)
       (put-display-table ?,L2(B "V"   display-table)
       (put-display-table ?,L3(B "G"   display-table)
       (put-display-table ?,L4(B "D"   display-table)
       (put-display-table ?,L5(B "E"   display-table)
       (put-display-table ?,L!(B "Yo"  display-table)
       (put-display-table ?,L6(B "Zh"  display-table)
       (put-display-table ?,L7(B "Z"   display-table)
       (put-display-table ?,L8(B "I"   display-table)
       (put-display-table ?,L9(B "J"   display-table)
       (put-display-table ?,L:(B "K"   display-table)
       (put-display-table ?,L;(B "L"   display-table)
       (put-display-table ?,L<(B "M"   display-table)
       (put-display-table ?,L=(B "N"   display-table)
       (put-display-table ?,L>(B "O"   display-table)
       (put-display-table ?,L?(B "P"   display-table)
       (put-display-table ?,L@(B "R"   display-table)
       (put-display-table ?,LA(B "S"   display-table)
       (put-display-table ?,LB(B "T"   display-table)
       (put-display-table ?,LC(B "U"   display-table)
       (put-display-table ?,LD(B "F"   display-table)
       (put-display-table ?,LE(B "Kh"  display-table)
       (put-display-table ?,LF(B "Ts"  display-table)
       (put-display-table ?,LG(B "Ch"  display-table)
       (put-display-table ?,LH(B "Sh"  display-table)
       (put-display-table ?,LI(B "Sch" display-table)
       (put-display-table ?,LJ(B "~"   display-table)
       (put-display-table ?,LK(B "Y"   display-table)
       (put-display-table ?,LL(B "'"   display-table)
       (put-display-table ?,LM(B "E'"  display-table)
       (put-display-table ?,LN(B "Yu"  display-table)
       (put-display-table ?,LO(B "Ya"  display-table)
       (put-display-table ?,Lt(B "ie"  display-table)
       (put-display-table ?,Lw(B "i"   display-table)
       (put-display-table ?,L~(B "u"   display-table)
       (put-display-table ?,Lr(B "dj"  display-table)
       (put-display-table ?,L{(B "chj" display-table)
       (put-display-table ?,Ls(B "gj"  display-table)
       (put-display-table ?,Lu(B "s"   display-table)
       (put-display-table ?,L|(B "k"   display-table)
       (put-display-table ?,Lv(B "i"   display-table)
       (put-display-table ?,Lx(B "j"   display-table)
       (put-display-table ?,Ly(B "lj"  display-table)
       (put-display-table ?,Lz(B "nj"  display-table)
       (put-display-table ?,L(B "dz"  display-table)
       (put-display-table ?,L$(B "Ye"  display-table)
       (put-display-table ?,L'(B "Yi"  display-table)
       (put-display-table ?,L.(B "U"   display-table)
       (put-display-table ?,L"(B "Dj"  display-table)
       (put-display-table ?,L+(B "Chj" display-table)
       (put-display-table ?,L#(B "Gj"  display-table)
       (put-display-table ?,L%(B "S"   display-table)
       (put-display-table ?,L,(B "K"   display-table)
       (put-display-table ?,L&(B "I"   display-table)
       (put-display-table ?,L((B "J"   display-table)
       (put-display-table ?,L)(B "Lj"  display-table)
       (put-display-table ?,L*(B "Nj"  display-table)
       (put-display-table ?,L/(B "Dj"  display-table)
    
       (when (equal cyrillic-language "Bulgarian")
         (put-display-table ?,Li(B "sht"  display-table)
         (put-display-table ?,LI(B "Sht"  display-table)
         (put-display-table ?,Ln(B "iu"   display-table)
         (put-display-table ?,LN(B "Iu"   display-table)
         (put-display-table ?,Lo(B "ia"   display-table)
         (put-display-table ?,LO(B "Ia"   display-table))

       (when (equal cyrillic-language "Ukrainian") ; based on the official 
                                        ; transliteration table
         (put-display-table ?,LX(B "y"    display-table)
         (put-display-table ?,L8(B "Y"    display-table)
         (put-display-table ?,LY(B "i"    display-table)
         (put-display-table ?,L9(B "Y"    display-table)
         (put-display-table ?,Ln(B "iu"   display-table)
         (put-display-table ?,Lo(B "ia"   display-table)))) nil))
;;
(provide 'cyril-util)

;; Local Variables:
;; coding: iso-2022-7bit
;; End:

;;; cyril-util.el ends here