Add Arabic support.

4 files changed, 26 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce5baa1b1a1..962b1618fbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2010-08-25  Kenichi Handa  <handa@m17n.org>
+
+        * language/misc-lang.el ("Arabic"): New language environment.
+        Setup composition-function-table for Arabic characters.
+
+        * international/fontset.el (setup-default-fontset): Fix typo for
+        arabic OTF spec (fini->fina).
+
 2010-08-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (prog-mode-map): New var.
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index ecb2088de89..753b1ab25e7 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -433,7 +433,7 @@
                (nil . "koi8-r"))
 
      (arabic ,(font-spec :registry "iso10646-1"
-                         :otf '(arab nil (init medi fini liga)))
+                         :otf '(arab nil (init medi fina liga)))
              (nil . "MuleArabic-0")
              (nil . "MuleArabic-1")
              (nil . "MuleArabic-2")
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index c961decfed5..91b4e42807d 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2179,7 +2179,7 @@ See `set-language-info-alist' for use in programs."
     ("af" . "Latin-1") ; Afrikaans
     ("am" "Ethiopic" utf-8) ; Amharic
     ("an" . "Latin-9") ; Aragonese
-    ; ar Arabic glibc uses 8859-6
+    ("ar" . "Arabic")
     ; as Assamese
     ; ay Aymara
     ("az" . "UTF-8") ; Azerbaijani
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index 2431c9d9e99..e2e4f29dd9e 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -40,8 +40,9 @@
 IPA is International Phonetic Alphabet for English, French, German
 and Italian.")))
 
-;; This is for Arabic.  But, as we still don't have Arabic language
-;; support, we at least define a coding system here.
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Arabic
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define-coding-system 'iso-8859-6
   "ISO-8859-6 based encoding (MIME:ISO-8859-6)."
@@ -58,6 +59,19 @@ and Italian.")))
   :mime-charset 'windows-1256)
 (define-coding-system-alias 'cp1256 'windows-1256)
 
+(set-language-info-alist
+ "Arabic" '((charset unicode)
+            (coding-system utf-8 iso-8859-6 windows-1256)
+            (coding-priority utf-8 iso-8859-6 windows-1256)
+            (input-method . "arabic")
+            (sample-text . "Arabic      السّلام عليكم")
+            (documentation . "Bidirectional editing is supported.")))
+
+(set-char-table-range
+ composition-function-table
+ '(#x600 . #x6FF)
+ (list ["[\u0600-\u06FF]+" 0 font-shape-gstring]))
+
 (provide 'misc-lang)
 
 ;; arch-tag: 6953585c-1a1a-4c09-be82-a2518afb6074