merge changes in emacs-23 branch

[gnu-emacs] / leim / quail / arabic.el

diff --git a/leim/quail/arabic.el b/leim/quail/arabic.el
index e0a351098e31fe14258433cd408ea2cfb62379c5..cb77183bc966876701a2a339946dcf2a69e6f09f 100644 (file)
--- a/leim/quail/arabic.el
+++ b/leim/quail/arabic.el
@@ -1,15 +1,16 @@
 ;;; arabic.el --- Quail package for inputting Arabic   -*- coding: utf-8;-*-
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
-;; Written by James Cloos <cloos@jhcloos.com>
+;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+;; Author: James Cloos <cloos@jhcloos.com>
 ;; Keywords: mule, input method, Arabic
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs 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.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -33,50 +32,50 @@
 Based on Arabic table in X Keyboard Configuration DB.
 " nil t t t t nil nil nil nil nil t)
 
-;;  ذّ 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0) -_ =+
-;;      ضَ صً ثُ قٌ فﻹ غإ ع` ه÷ خ× ح؛ ج{ د} <>
-;;       ش\ سS ي[ ب] لﻷ اأ تـ ن، م/ ك: ط"
-;;        ئ~ ءْ ؤِ رٍ ﻻﻵ ىآ ة' و, ز. ظ؟
+;;  ذّ 1! 2@ 3# 4$ 5% 6^ 7& 8* 9) 0( -_ =+
+;;      ضَ صً ثُ قٌ فﻹ غإ ع` ه÷ خ× ح؛ ج< د> <>
+;;       شِ سٍ ي] ب[ لﻷ اأ تـ ن، م/ ك: ط"
+;;        ئ~ ءْ ؤ} ر{ ﻻﻵ ىآ ة' و, ز. ظ؟
 ;;
 
 (quail-define-rules
  ("`" ?ذ)
+ ("~" ?ّ)
 
  ("Q" ?َ)
  ("W" ?ً)
  ("E" ?ُ)
  ("R" ?ٌ)
- ("T" ?ﻹ)
+ ("T" ["لإ"])
  ("Y" ?إ)
  ("U" ?`)
  ("I" ?÷)
  ("O" ?×)
  ("P" ?؛)
-
- ("A" ?\\)
- ("S" ?S)
- ("D" ?[)
- ("F" ?])
- ("G" ?ﻷ)
+ ("{" ?<)
+ ("}" ?>)
+
+ ("A" ?ِ)
+ ("S" ?ٍ)
+ ("D" ?\])
+ ("F" ?\[)
+ ("G" ["لأ"])
  ("H" ?أ)
  ("J" ?ـ)
  ("K" ?،)
  ("L" ?/)
- (";" ?:)
 
  ("Z" ?~)
  ("X" ?ْ)
- ("C" ?ِ)
- ("V" ?ٍ)
- ("B" ?ﻵ)
+ ("C" ?})
+ ("V" ?{)
+ ("B" ["لآ"])
  ("N" ?آ)
  ("M" ?')
  ("<" ?,)
  (">" ?.)
  ("?" ?؟)
 
- ("`" ?ذ)
-
  ("q" ?ض)
  ("w" ?ص)
  ("e" ?ث)
@@ -87,6 +86,8 @@ Based on Arabic table in X Keyboard Configuration DB.
  ("i" ?ه)
  ("o" ?خ)
  ("p" ?ح)
+ ("[" ?ج)
+ ("]" ?د)
 
  ("a" ?ش)
  ("s" ?س)
@@ -98,19 +99,18 @@ Based on Arabic table in X Keyboard Configuration DB.
  ("k" ?ن)
  ("l" ?م)
  (";" ?ك)
+ ("'" ?ط)
 
  ("z" ?ئ)
  ("x" ?ء)
  ("c" ?ؤ)
  ("v" ?ر)
- ("b" ?ﻻ)
+ ("b" ["لا"])
  ("n" ?ى)
  ("m" ?ة)
  ("," ?و)
  ("." ?ز)
- ("/" ?ظ)
-
- ("'" ?ط))
+ ("/" ?ظ))
 
 ;; arch-tag: 7e81e2af-5ea5-417f-bfe7-dfa6fd955cb5
 ;;; arabic.el ends here