* leim/quail/persian.el: Add some mappings.

(farsi-isiri-9147, farsi-transliterate-banan): Doc fixes.

Fixes: debbugs:11812

leim/ChangeLog

@@ -1,3 +1,8 @@
+2012-08-06  Mohsen BANAN  <libre@mohsen.1.banan.byname.net>
+
+	* quail/persian.el: Add some mappings.  (Bug#11812)
+	(farsi-isiri-9147, farsi-transliterate-banan): Doc fixes.
+
 2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Update .PHONY listings in makefiles.

leim/quail/persian.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
 ;; Author: Mohsen BANAN <libre@mohsen.1.banan.byname.net>
-;; http://mohsen.1.banan.byname.net/contact
+;; X-URL: http://mohsen.1.banan.byname.net/contact
 
 ;; Keywords: multilingual, input method, Farsi, Persian, keyboard
 
@@ -31,7 +31,7 @@
 ;;
 ;; At this time, the following input methods are specified:
 ;;
-;;  - (farsi-isiri-9149) Persian Keyboard based on Islamic Republic of Iran's ISIR-9147
+;;  - (farsi-isiri-9149) Persian Keyboard based on Islamic Republic of Iran's ISIRI-9147
 ;;  - (farsi-transliterate-banan) An intuitive transliteration keyboard for Farsi
 ;;
 ;; Additional documentation for these input methods can be found at:
@@ -50,18 +50,26 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; The keyboard mapping defined here is based on:
+;; فنّاوریِ اطلاعات - چیدمان حروف و علائم فارسی بر صفحه کلید رایانه
+;; استاندارد ملی ایران ۹۱۴۷ − چاپ اول
 ;;
 ;; Institute of Standards and Industrial Research of Iran
 ;; Information Technology – Layout of Persian Letters and Symbols
 ;; on Computer Keyboards
 ;; ISIRI 9147 -- 1st edition
-;; http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147
+;; Published at: http://www.isiri.org/portal/files/std/9147.pdf
+;; Re-Published at: http://www.persoarabic.org/Repub/fpf-isiri-9147
 ;;
-;; The specification is also republished at
-;;     http://www.farsiweb.ir/wiki/Image:Isiri-9147.pdf
-;; and various other sites.
 ;;
-;; ISIRI-6219 is also relevant.
+;; Specification of Iran's Persian Character Set is also relevant:
+;; فنّاوریِ اطلاعات -- تبادل و شیوه‌ی نمایش اطلاعاتِ فارسی بر اساس یونی کُد
+;; استاندارد ملی ایران ۶۲۱۹ −− نسخهی نهایی
+;;
+;; Institute of Standards and Industrial Research of Iran
+;; Information Technology – Persian Information Interchange and Display Mechanism, using Unicode
+;; ISIRI-6219 Final Version
+;; Published at: http://www.isiri.org/portal/files/std/6219.htm
+;; Re-Published at: http://www.persoarabic.org/Repub/fpf-isiri-6219
 ;;
 ;; Layers 1, 2 and 3 of ISIRI-9147 are fully implemented with the
 ;; exception of the Backslash, Alt-Backslash, Shift-Space and
@@ -92,10 +100,10 @@
 
 
 (quail-define-package
- "farsi-isiri-9147" "Farsi" " ف" nil "Farsi input method.
+ "farsi-isiri-9147" "Persian" " ف" nil
-
+ "Farsi keyboard based on ISIRI-9147.
-Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
+  See http://www.persoarabic.org/PLPC/120036 for additional documentation."
-" nil t t t t nil nil nil nil nil t)
+ nil t t t t nil nil nil nil nil t)
 
 ;; Note: the rows of keys below are enclosed in Left-To-Right Override
 ;; embedding, to prevent them from being reordered by the Emacs
@@ -308,8 +316,8 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
 ;; For یک ``yk'', ``y'' is more natural and for این ``ain'', ``i'' is more natural.
 ;;
 ;; The more frequently used keys are mapped to lower case. The less frequently used letter moves to
-;; upper case. For example: ``s'' is س and ``S'' is ص.  ``h'' is ح and ``H''
+;; upper case. For example: ``s'' is س and ``S'' is ص.  ``h'' is ه and ``H''
-;; is ه.
+;; is ح.
 ;;
 ;; Multi-character input is based on \, &, and / prefix
 ;; characters. The letter 'h' is used as a postfix for the following two character mappings:
@@ -317,7 +325,7 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
 ;;
 ;;
 ;; Prefix letter \ is used for two character inputs when an alternate form of a letter
-;; is desired for example \% is: ‌÷ when % is: ٪.
+;; is desired for example '\-' is: '÷' when '-' is: '-'.
 ;;
 ;; Prefix letter & is used for multi-character inputs when special characters are
 ;; desired based on their abbreviate name. For example you can enter &lrm; to enter the
@@ -328,14 +336,15 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
 ;;
 ;; The letter 'h' is used in a number of two character postfix mappings,
 ;; for example ``sh'' ش. So if you need the sequence of ``s'' and ``h'' you
-;; need to repeat the ``s''. For example: سحر = 's' 's' 'h' 'r'.
+;; need to repeat the ``s''. For example: سهم = 's' 's' 'h' 'm'.
 ;;
 
 
 (quail-define-package
- "farsi-transliterate-banan" "Farsi" "ب" t
+ "farsi-transliterate-banan" "Persian" "ب" t
  "Intuitive transliteration keyboard layout for persian/farsi.
-" nil t t t t nil nil nil nil nil t)
+  See http://www.persoarabic.org/PLPC/120036 for additional documentation."
+ nil t t t t nil nil nil nil nil t)
 
 
 (quail-define-rules
@@ -352,7 +361,8 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("cc"  ?ث)
  ("j"  ?ج)
  ("ch" ?چ)
- ("h"  ?ح)
+ ("H"  ?ح)
+ ("hh"  ?ح)
  ("kh" ?خ)
  ("d"  ?د)
  ("Z"  ?ذ)
@@ -370,6 +380,9 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("X"  ?ظ)
  ("w"  ?ع)
  ("q"  ?غ)
+ ("G"  ?غ)
+ ("Gh"  ?غ)
+ ("GG"  ?غ)
  ("f"  ?ف)
  ("Q"  ?ق)
  ("gh" ?ق)
@@ -383,7 +396,7 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("v"  ?و)
  ("u"  ?و)
  ("V" ?ؤ)
- ("H"  ?ه)
+ ("h"  ?ه)
  ("y"  ?ی)
  ("i"  ?ی)
  ("I" ?ئ)
@@ -416,7 +429,7 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("+" ?\u002B)     ;; (ucs-insert #x002B)+   named: علامتِ به‌اضافه
  ("-" ?\u2212)     ;; (ucs-insert #x2212)−   named: علامتِ منها
  ("\\*" ?\u00D7)     ;; (ucs-insert #x00D7)×   named: علامتِ ضرب
- ("\\%" ?\u007F)    ;; (ucs-insert #x00F7)÷   named: علامتِ تقسیم
+ ("\\-" ?\u00F7)    ;; (ucs-insert #x00F7)÷   named: علامتِ تقسیم
  ("<" ?\u003C)     ;; (ucs-insert #x003C)<   named: علامتِ کوچکتر
  ("=" ?\u003D)     ;; (ucs-insert #x003D)=   named: علامتِ مساوی
  (">" ?\u003E)     ;; (ucs-insert #x003E)>   named: علامتِ بزرگتر
@@ -442,7 +455,8 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
  ("}" ?\u007D)     ;; (ucs-insert #x007D)}   named:
  ("\\<" ?\u00AB)     ;; (ucs-insert #x00AB)«   named:
  ("\\>" ?\u00BB)     ;; (ucs-insert #x00BB)»   named:
-
+ ("N" ?\u00AB)     ;; (ucs-insert #x00AB)«   named:
+ ("M" ?\u00BB)     ;; (ucs-insert #x00BB)»   named:
 
 ;;;;;;;;;;;  isiri-6219 Table 3 -- جدول ۳ -  علائم نقطه گذاریِ فارسی
  ("," ?،)  ;; farsi
@@ -486,7 +500,7 @@ Based on ISIRI-9147 Layout of Persian Letters and Symbols on Computer Keyboards.
 
 
 ;;;;;;;;;;;  isiri-6219 Table 8 - Forbidden Characters -- جدول ۸ - نویسه‌هایِ ممنوع
-;;  ;; he ye (ucs-insert 1728) kills emacs-24.0.90
+;;  ;; he ye (ucs-insert 1728)  (ucs-insert #x06c0) kills emacs-24.0.90
 ;; arabic digits 0-9