Merge from emacs-24; up to 2012-05-01T00:16:02Z!rgm@gnu.org

[bpt/emacs.git] / lisp / language / indian.el

diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 3414da2..e77f745 100644 (file)
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -1,8 +1,7 @@
 ;;; indian.el --- Indian languages support -*- coding: utf-8; -*-
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1997, 1999, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -47,7 +46,7 @@
  "Devanagari" '((charset unicode)
                (coding-system utf-8)
                (coding-priority utf-8)
-               (input-method . "dev-aiba")
+               (input-method . "devanagari-aiba")
                (documentation . "\
 Such languages using Devanagari script as Hindi and Marathi
 are supported in this language environment."))
@@ -198,15 +197,14 @@ South Indian language Malayalam is supported in this language environment."))
 
 (defconst gurmukhi-composable-pattern
   (let ((table
-        '(("a" . "[\u0A01-\u0A02]")    ; SIGN ADAK BINDI .. BINDI
-          ("A" . "\u0A03]")            ; SIGN VISARGA
+        '(("a" . "[\u0A01-\u0A02\u0A70]") ; SIGN ADAK BINDI .. BINDI, TIPPI
+          ("A" . "\u0A03")             ; SIGN VISARGA
           ("V" . "[\u0A05-\u0A14]")    ; independent vowel
           ("C" . "[\u0A15-\u0A39\u0A59-\u0A5E]")       ; consonant
-          ("Y" . "[\u0A2F\u0A30\u0A35\u0A39]") ; YA, RA, VA, HA
+          ("Y" . "[\u0A2F-u0A30\u0A35\u0A39]") ; YA, RA, VA, HA
           ("n" . "\u0A3C")             ; NUKTA
           ("v" . "[\u0A3E-\u0A4C]")    ; vowel sign
           ("H" . "\u0A4D")             ; VIRAMA
-          ("a" . "\u0A70")             ; TIPPI
           ("N" . "\u200C")             ; ZWNJ
           ("J" . "\u200D")             ; ZWJ
           ("X" . "[\u0A00-\u0A7F]")))) ; all coverage
@@ -226,7 +224,7 @@ South Indian language Malayalam is supported in this language environment."))
 (defconst gujarati-composable-pattern
   (let ((table
         '(("a" . "[\u0A81-\u0A82]")    ; SIGN CANDRABINDU .. ANUSVARA
-          ("A" . "\u0A83]")            ; SIGN VISARGA
+          ("A" . "\u0A83")             ; SIGN VISARGA
           ("V" . "[\u0A85-\u0A94\u0AE0-\u0AE1]") ; independent vowel
           ("C" . "[\u0A95-\u0AB9]")    ; consonant
           ("R" . "\u0AB0")             ; RA
@@ -258,7 +256,7 @@ South Indian language Malayalam is supported in this language environment."))
           ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23-\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38-\u0B39]") ; consonant with below form
           ("R" . "\u0B30")             ; RA
           ("n" . "\u0B3C")             ; NUKTA
-          ("v" . "[\u0B3E-\u0B44\u0B47\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign
+          ("v" . "[\u0B3E-\u0B4C\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign
           ("H" . "\u0B4D")             ; VIRAMA
           ("N" . "\u200C")             ; ZWNJ
           ("J" . "\u200D")             ; ZWJ
@@ -281,7 +279,7 @@ South Indian language Malayalam is supported in this language environment."))
         '(("a" . "\u0B82")             ; SIGN ANUSVARA
           ("V" . "[\u0B85-\u0B94]")    ; independent vowel
           ("C" . "[\u0B95-\u0BB9]")    ; consonant
-          ("v" . "[\u0BBE-\u0BC8\u0BD7]") ; vowel sign
+          ("v" . "[\u0BBE-\u0BCC\u0BD7]") ; vowel sign
           ("H" . "\u0BCD")             ; VIRAMA
           ("N" . "\u200C")             ; ZWNJ
           ("J" . "\u200D")             ; ZWJ
@@ -351,7 +349,7 @@ South Indian language Malayalam is supported in this language environment."))
           ("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel
           ("C" . "[\u0D15-\u0D39]")              ; consonant 
           ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]")  ; YA, RA, LA, VA
-          ("v" . "[\u0D3E-\u0D48\u0D57\u0D62-\u0D63]") ; postbase matra
+          ("v" . "[\u0D3E-\u0D4C\u0D57\u0D62-\u0D63]") ; postbase matra
           ("H" . "\u0D4D")                       ; SIGN VIRAMA
           ("N" . "\u200C")                       ; ZWNJ
           ("J" . "\u200D")                       ; ZWJ
@@ -390,5 +388,4 @@ South Indian language Malayalam is supported in this language environment."))
 
 (provide 'indian)
 
-;; arch-tag: 83aa8fc7-7ee2-4364-a6e5-498f5e3b8c2f
 ;;; indian.el ends here