Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / leim / quail / cyrillic.el

diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index 8240485..c1d8424 100644 (file)
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1,6 +1,6 @@
 ;;; cyrillic.el --- Quail package for inputting Cyrillic characters
 
-;; Copyright (C) 1997-1998, 2001-2011  Free Software Foundation, Inc.
+;; Copyright (C) 1997-1998, 2001-2013 Free Software Foundation, Inc.
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
 ;;   2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
@@ -27,7 +27,7 @@
 ;;; Commentary:
 
 ;; These methods use a mixture of 8859-5 and Unicode.  Quail, used
-;; with ucs-tables provides suport for translating on the fly to
+;; with ucs-tables provides support for translating on the fly to
 ;; what's appropriate for aa buffer's file coding system, so the
 ;; encoding shouldn't matter too much provided it supports the
 ;; necessary characters.
@@ -42,7 +42,7 @@
 ;; in typewriters for ages but it has been superseded on desktops by
 ;; a variation of this layout, implemented in M$ Windows software.
 ;; The Windows layout is greatly preferred because of the comma and
-;; period being placed more conviniently and, of course, because of
+;; period being placed more conveniently and, of course, because of
 ;; the popularity of Windows software. This layout is a common option
 ;; in X Windows and console layouts for GNU/Linux.  [See
 ;; `russian-computer' below.]
@@ -163,7 +163,7 @@
 ;; commented out because quail-update-leim-list-file ignores
 ;; commented-out lines.
 (if nil
-    (quail-define-package 
+    (quail-define-package
      "cyrillic-jcuken" "Russian" "\e,L69\e(B" nil
      "\e,L9FC:5=\e(B Russian typewriter layout (ISO 8859-5 encoding)."))
 
@@ -608,7 +608,7 @@
 ;; layout.  In fact, Microsoft shipped for a while a layout that was lacking
 ;; two characters, precisely the "GHE_WITH_UPTURN" and the apostrophe.  The
 ;; latest versions of Windows software do have the "GHE_WITH_UPTURN" in the
-;; ukrainian keyborad layout but the apostrophe is still not there, whereas
+;; ukrainian keyboard layout but the apostrophe is still not there, whereas
 ;; there is one letter, "Cyrillic_YO", not used in ukrainian.  Ukrainians
 ;; normally replace the "Cyrillic_YO" by the apostrophe sign and live
 ;; happily with this little change.  [See "ukrainian-computer" below.]
@@ -1236,6 +1236,79 @@ Unicode based."
  ("." ?\e$,1(n\e(B)
  ("/" ?.))
 
+(quail-define-package
+ "bulgarian-alt-phonetic" "Bulgarian" "\e$,1(1(=(D\e(B"
+ nil
+ "Bulgarian alternative Phonetic keyboard layout, producing Unicode.
+
+This phonetic layout replaces all the Latin letters with Bulgarian
+\(Cyrillic\) letters based on similarities in their pronunciation or look.
+
+Note that, since the letters '\e,Li\e(B', '\e,Ll\e(B', '\e,Ln\e(B' and '\e,Lo\e(B' are attached to the
+']', '\', '`' and '[' keys respectively, Caps Lock does not affect them."
+nil t t t t nil nil nil nil nil t)
+
+;;  \e$,1(N\e(B  1! 2@ 3\e$,1uV\e(B 4$ 5% 6\e$,1tL\e(B 7\e,A'\e(B 8* 9( 0) -\e$,1rs\e(B =+ \e$,1(l(}\e(B
+;;      \e$,1(G\e(B  \e$,1(H\e(B  \e$,1(5\e(B  \e$,1(@\e(B  \e$,1(B\e(B  \e$,1(J\e(B  \e$,1(C\e(B  \e$,1(8\e(B  \e$,1(>\e(B  \e$,1(?\e(B  \e$,1(O\e(B  \e$,1(I\e(B
+;;       \e,L0\e(B  \e$,1(A\e(B  \e$,1(4\e(B  \e$,1(D\e(B  \e$,1(3\e(B  \e$,1(E\e(B  \e$,1(9\e(B  \e$,1(:\e(B  \e$,1(;\e(B  :; '"
+;;        \e$,1(7\e(B  \e$,1(6\e(B  \e$,1(F\e(B  \e$,1(2\e(B  \e$,1(1\e(B  \e$,1(=\e(B  \e$,1(<\e(B  ,\e$,1r~\e(B .\e$,1r|\e(B /?
+
+(quail-define-rules
+ ("#" ?\e,Lp\e(B)
+ ("&" ?\e,A'\e(B)
+ ("/#" ?#)
+ ("/&" ?&)
+ ("/<" ?<)
+ ("/>" ?>)
+ ("/[" ?\[)
+ ("/\\" ?\\)
+ ("/]" ?\])
+ ("/^" ?^)
+ ("/_" ?_)
+ ("/`" ?`)
+ ("/{" ?{)
+ ("/|" ?|)
+ ("/}" ?})
+ ("/~" ?~)
+ ("<" ?\e$,1r~\e(B)
+ (">" ?\e$,1r|\e(B)
+ ("A" ?\e$,1(0\e(B) ("a" ?\e$,1(P\e(B)
+ ("B" ?\e$,1(1\e(B) ("b" ?\e$,1(Q\e(B)
+ ("C" ?\e$,1(F\e(B) ("c" ?\e$,1(f\e(B)
+ ("D" ?\e$,1(4\e(B) ("d" ?\e$,1(T\e(B)
+ ("E" ?\e$,1(5\e(B) ("e" ?\e$,1(U\e(B)
+ ("F" ?\e$,1(D\e(B) ("f" ?\e$,1(d\e(B)
+ ("G" ?\e$,1(3\e(B) ("g" ?\e$,1(S\e(B)
+ ("H" ?\e$,1(E\e(B) ("h" ?\e$,1(e\e(B)
+ ("I" ?\e$,1(8\e(B) ("i" ?\e$,1(X\e(B)
+ ("J" ?\e$,1(9\e(B) ("j" ?\e$,1(Y\e(B)
+ ("K" ?\e$,1(:\e(B) ("k" ?\e$,1(Z\e(B)
+ ("L" ?\e$,1(;\e(B) ("l" ?\e$,1([\e(B)
+ ("M" ?\e$,1(<\e(B) ("m" ?\e$,1(\\e(B)
+ ("N" ?\e$,1(=\e(B) ("n" ?\e$,1(]\e(B)
+ ("O" ?\e$,1(>\e(B) ("o" ?\e$,1(^\e(B)
+ ("P" ?\e$,1(?\e(B) ("p" ?\e$,1(_\e(B)
+ ("Q" ?\e$,1(G\e(B) ("q" ?\e$,1(g\e(B)
+ ("R" ?\e$,1(@\e(B) ("r" ?\e$,1(`\e(B)
+ ("S" ?\e$,1(A\e(B) ("s" ?\e$,1(a\e(B)
+ ("T" ?\e$,1(B\e(B) ("t" ?\e$,1(b\e(B)
+ ("U" ?\e$,1(C\e(B) ("u" ?\e$,1(c\e(B)
+ ("V" ?\e$,1(2\e(B) ("v" ?\e$,1(R\e(B)
+ ("W" ?\e$,1(H\e(B) ("w" ?\e$,1(h\e(B)
+ ("X" ?\e$,1(6\e(B) ("x" ?\e$,1(V\e(B)
+ ("Y" ?\e$,1(J\e(B) ("y" ?\e$,1(j\e(B)
+ ("Z" ?\e$,1(7\e(B) ("z" ?\e$,1(W\e(B)
+ ("[" ?\e$,1(o\e(B)
+ ("\\" ?\e$,1(l\e(B)
+ ("]" ?\e$,1(i\e(B)
+ ("^" ?\e$,1tL\e(B)
+ ("_" ?\e$,1rs\e(B)
+ ("`" ?\e$,1(n\e(B)
+ ("{" ?\e$,1(O\e(B)
+ ("|" ?\e$,1(}\e(B)
+ ("}" ?\e$,1(I\e(B)
+ ("~" ?\e$,1(N\e(B))
+
 ;; From `Bulgarian-PHO.kmap for Yudit', Alexander Shopov
 ;; <al_shopov@web.bg>.