From: tomo <tomo>
Date: Mon, 11 Mar 2002 03:39:28 +0000 (+0000)
Subject: Reformatted.
X-Git-Tag: r21-2-44-lazy-n7c~18
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=e9743897927573f4053363022196f2abef655a3c;p=chise%2Fxemacs-chise.git

Reformatted.
---

diff --git a/lisp/utf-2000/u00B00-Oriya.el b/lisp/utf-2000/u00B00-Oriya.el
index db8ab22..6ae1a4c 100644
--- a/lisp/utf-2000/u00B00-Oriya.el
+++ b/lisp/utf-2000/u00B00-Oriya.el
@@ -1,588 +1,588 @@
 (define-char
   '((name		. "ORIYA SIGN CANDRABINDU")
-    (ucs		. #x0B01)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B01)	; ଁ
     ))
 (define-char
   '((name		. "ORIYA SIGN ANUSVARA")
-    (ucs		. #x0B02)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B02)	; ଂ
     ))
 (define-char
   '((name		. "ORIYA SIGN VISARGA")
-    (ucs		. #x0B03)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B03)	; ଃ
     ))
 (define-char
   '((name		. "ORIYA LETTER A")
-    (ucs		. #x0B05)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B05)	; ଅ
     ))
 (define-char
   '((name		. "ORIYA LETTER AA")
-    (ucs		. #x0B06)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B06)	; ଆ
     ))
 (define-char
   '((name		. "ORIYA LETTER I")
-    (ucs		. #x0B07)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B07)	; ଇ
     ))
 (define-char
   '((name		. "ORIYA LETTER II")
-    (ucs		. #x0B08)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B08)	; ଈ
     ))
 (define-char
   '((name		. "ORIYA LETTER U")
-    (ucs		. #x0B09)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B09)	; ଉ
     ))
 (define-char
   '((name		. "ORIYA LETTER UU")
-    (ucs		. #x0B0A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B0A)	; ଊ
     ))
 (define-char
   '((name		. "ORIYA LETTER VOCALIC R")
-    (ucs		. #x0B0B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B0B)	; ଋ
     ))
 (define-char
   '((name		. "ORIYA LETTER VOCALIC L")
-    (ucs		. #x0B0C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B0C)	; ଌ
     ))
 (define-char
   '((name		. "ORIYA LETTER E")
-    (ucs		. #x0B0F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B0F)	; ଏ
     ))
 (define-char
   '((name		. "ORIYA LETTER AI")
-    (ucs		. #x0B10)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B10)	; ଐ
     ))
 (define-char
   '((name		. "ORIYA LETTER O")
-    (ucs		. #x0B13)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B13)	; ଓ
     ))
 (define-char
   '((name		. "ORIYA LETTER AU")
-    (ucs		. #x0B14)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B14)	; ଔ
     ))
 (define-char
   '((name		. "ORIYA LETTER KA")
-    (ucs		. #x0B15)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B15)	; କ
     ))
 (define-char
   '((name		. "ORIYA LETTER KHA")
-    (ucs		. #x0B16)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B16)	; ଖ
     ))
 (define-char
   '((name		. "ORIYA LETTER GA")
-    (ucs		. #x0B17)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B17)	; ଗ
     ))
 (define-char
   '((name		. "ORIYA LETTER GHA")
-    (ucs		. #x0B18)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B18)	; ଘ
     ))
 (define-char
   '((name		. "ORIYA LETTER NGA")
-    (ucs		. #x0B19)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B19)	; ଙ
     ))
 (define-char
   '((name		. "ORIYA LETTER CA")
-    (ucs		. #x0B1A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B1A)	; ଚ
     ))
 (define-char
   '((name		. "ORIYA LETTER CHA")
-    (ucs		. #x0B1B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B1B)	; ଛ
     ))
 (define-char
   '((name		. "ORIYA LETTER JA")
-    (ucs		. #x0B1C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B1C)	; ଜ
     ))
 (define-char
   '((name		. "ORIYA LETTER JHA")
-    (ucs		. #x0B1D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B1D)	; ଝ
     ))
 (define-char
   '((name		. "ORIYA LETTER NYA")
-    (ucs		. #x0B1E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B1E)	; ଞ
     ))
 (define-char
   '((name		. "ORIYA LETTER TTA")
-    (ucs		. #x0B1F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B1F)	; ଟ
     ))
 (define-char
   '((name		. "ORIYA LETTER TTHA")
-    (ucs		. #x0B20)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B20)	; ଠ
     ))
 (define-char
   '((name		. "ORIYA LETTER DDA")
-    (ucs		. #x0B21)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B21)	; ଡ
     ))
 (define-char
   '((name		. "ORIYA LETTER DDHA")
-    (ucs		. #x0B22)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B22)	; ଢ
     ))
 (define-char
   '((name		. "ORIYA LETTER NNA")
-    (ucs		. #x0B23)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B23)	; ଣ
     ))
 (define-char
   '((name		. "ORIYA LETTER TA")
-    (ucs		. #x0B24)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B24)	; ତ
     ))
 (define-char
   '((name		. "ORIYA LETTER THA")
-    (ucs		. #x0B25)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B25)	; ଥ
     ))
 (define-char
   '((name		. "ORIYA LETTER DA")
-    (ucs		. #x0B26)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B26)	; ଦ
     ))
 (define-char
   '((name		. "ORIYA LETTER DHA")
-    (ucs		. #x0B27)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B27)	; ଧ
     ))
 (define-char
   '((name		. "ORIYA LETTER NA")
-    (ucs		. #x0B28)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B28)	; ନ
     ))
 (define-char
   '((name		. "ORIYA LETTER PA")
-    (ucs		. #x0B2A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B2A)	; ପ
     ))
 (define-char
   '((name		. "ORIYA LETTER PHA")
-    (ucs		. #x0B2B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B2B)	; ଫ
     ))
 (define-char
   '((name		. "ORIYA LETTER BA")
-    (ucs		. #x0B2C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B2C)	; ବ
     ))
 (define-char
   '((name		. "ORIYA LETTER BHA")
-    (ucs		. #x0B2D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B2D)	; ଭ
     ))
 (define-char
   '((name		. "ORIYA LETTER MA")
-    (ucs		. #x0B2E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B2E)	; ମ
     ))
 (define-char
   '((name		. "ORIYA LETTER YA")
-    (ucs		. #x0B2F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B2F)	; ଯ
     ))
 (define-char
   '((name		. "ORIYA LETTER RA")
-    (ucs		. #x0B30)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B30)	; ର
     ))
 (define-char
   '((name		. "ORIYA LETTER LA")
-    (ucs		. #x0B32)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B32)	; ଲ
     ))
 (define-char
   '((name		. "ORIYA LETTER LLA")
-    (ucs		. #x0B33)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B33)	; ଳ
     ))
 (define-char
   '((name		. "ORIYA LETTER SHA")
-    (ucs		. #x0B36)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B36)	; ଶ
     ))
 (define-char
   '((name		. "ORIYA LETTER SSA")
-    (ucs		. #x0B37)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B37)	; ଷ
     ))
 (define-char
   '((name		. "ORIYA LETTER SA")
-    (ucs		. #x0B38)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B38)	; ସ
     ))
 (define-char
   '((name		. "ORIYA LETTER HA")
-    (ucs		. #x0B39)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B39)	; ହ
     ))
 (define-char
   '((name		. "ORIYA SIGN NUKTA")
-    (ucs		. #x0B3C)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B3C)	; ଼
     ))
 (define-char
   '((name		. "ORIYA SIGN AVAGRAHA")
-    (ucs		. #x0B3D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B3D)	; ଽ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN AA")
-    (ucs		. #x0B3E)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B3E)	; ା
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN I")
-    (ucs		. #x0B3F)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B3F)	; ି
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN II")
-    (ucs		. #x0B40)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B40)	; ୀ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN U")
-    (ucs		. #x0B41)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B41)	; ୁ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN UU")
-    (ucs		. #x0B42)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B42)	; ୂ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN VOCALIC R")
-    (ucs		. #x0B43)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B43)	; ୃ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN E")
-    (ucs		. #x0B47)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B47)	; େ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN AI")
-    (ucs		. #x0B48)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0B47 #x0B56)
     (mirrored		. nil)
+    (->decomposition	#x0B47 #x0B56)
+    (ucs		. #x0B48)	; ୈ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN O")
-    (ucs		. #x0B4B)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0B47 #x0B3E)
     (mirrored		. nil)
+    (->decomposition	#x0B47 #x0B3E)
+    (ucs		. #x0B4B)	; ୋ
     ))
 (define-char
   '((name		. "ORIYA VOWEL SIGN AU")
-    (ucs		. #x0B4C)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0B47 #x0B57)
     (mirrored		. nil)
+    (->decomposition	#x0B47 #x0B57)
+    (ucs		. #x0B4C)	; ୌ
     ))
 (define-char
   '((name		. "ORIYA SIGN VIRAMA")
-    (ucs		. #x0B4D)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B4D)	; ୍
     ))
 (define-char
   '((name		. "ORIYA AI LENGTH MARK")
-    (ucs		. #x0B56)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B56)	; ୖ
     ))
 (define-char
   '((name		. "ORIYA AU LENGTH MARK")
-    (ucs		. #x0B57)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B57)	; ୗ
     ))
 (define-char
   '((name		. "ORIYA LETTER RRA")
-    (ucs		. #x0B5C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0B21 #x0B3C)
     (mirrored		. nil)
+    (->decomposition	#x0B21 #x0B3C)
+    (ucs		. #x0B5C)	; ଡ଼
     ))
 (define-char
   '((name		. "ORIYA LETTER RHA")
-    (ucs		. #x0B5D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0B22 #x0B3C)
     (mirrored		. nil)
+    (->decomposition	#x0B22 #x0B3C)
+    (ucs		. #x0B5D)	; ଢ଼
     ))
 (define-char
   '((name		. "ORIYA LETTER YYA")
-    (ucs		. #x0B5F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B5F)	; ୟ
     ))
 (define-char
   '((name		. "ORIYA LETTER VOCALIC RR")
-    (ucs		. #x0B60)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B60)	; à­ 
     ))
 (define-char
   '((name		. "ORIYA LETTER VOCALIC LL")
-    (ucs		. #x0B61)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B61)	; à­¡
     ))
 (define-char
   '((name		. "ORIYA DIGIT ZERO")
-    (ucs		. #x0B66)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 0)
-    (digit-value	. 0)
-    (numeric-value	. 0)
     (mirrored		. nil)
+    (decimal-digit-value . 0)
+    (digit-value	 . 0)
+    (numeric-value	 . 0)
+    (ucs		. #x0B66)	; à­¦
     ))
 (define-char
   '((name		. "ORIYA DIGIT ONE")
-    (ucs		. #x0B67)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 1)
-    (digit-value	. 1)
-    (numeric-value	. 1)
     (mirrored		. nil)
+    (decimal-digit-value . 1)
+    (digit-value	 . 1)
+    (numeric-value	 . 1)
+    (ucs		. #x0B67)	; à­§
     ))
 (define-char
   '((name		. "ORIYA DIGIT TWO")
-    (ucs		. #x0B68)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 2)
-    (digit-value	. 2)
-    (numeric-value	. 2)
     (mirrored		. nil)
+    (decimal-digit-value . 2)
+    (digit-value	 . 2)
+    (numeric-value	 . 2)
+    (ucs		. #x0B68)	; à­¨
     ))
 (define-char
   '((name		. "ORIYA DIGIT THREE")
-    (ucs		. #x0B69)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 3)
-    (digit-value	. 3)
-    (numeric-value	. 3)
     (mirrored		. nil)
+    (decimal-digit-value . 3)
+    (digit-value	 . 3)
+    (numeric-value	 . 3)
+    (ucs		. #x0B69)	; à­©
     ))
 (define-char
   '((name		. "ORIYA DIGIT FOUR")
-    (ucs		. #x0B6A)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 4)
-    (digit-value	. 4)
-    (numeric-value	. 4)
     (mirrored		. nil)
+    (decimal-digit-value . 4)
+    (digit-value	 . 4)
+    (numeric-value	 . 4)
+    (ucs		. #x0B6A)	; à­ª
     ))
 (define-char
   '((name		. "ORIYA DIGIT FIVE")
-    (ucs		. #x0B6B)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 5)
-    (digit-value	. 5)
-    (numeric-value	. 5)
     (mirrored		. nil)
+    (decimal-digit-value . 5)
+    (digit-value	 . 5)
+    (numeric-value	 . 5)
+    (ucs		. #x0B6B)	; à­«
     ))
 (define-char
   '((name		. "ORIYA DIGIT SIX")
-    (ucs		. #x0B6C)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 6)
-    (digit-value	. 6)
-    (numeric-value	. 6)
     (mirrored		. nil)
+    (decimal-digit-value . 6)
+    (digit-value	 . 6)
+    (numeric-value	 . 6)
+    (ucs		. #x0B6C)	; à­¬
     ))
 (define-char
   '((name		. "ORIYA DIGIT SEVEN")
-    (ucs		. #x0B6D)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 7)
-    (digit-value	. 7)
-    (numeric-value	. 7)
     (mirrored		. nil)
+    (decimal-digit-value . 7)
+    (digit-value	 . 7)
+    (numeric-value	 . 7)
+    (ucs		. #x0B6D)	; à­­
     ))
 (define-char
   '((name		. "ORIYA DIGIT EIGHT")
-    (ucs		. #x0B6E)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 8)
-    (digit-value	. 8)
-    (numeric-value	. 8)
     (mirrored		. nil)
+    (decimal-digit-value . 8)
+    (digit-value	 . 8)
+    (numeric-value	 . 8)
+    (ucs		. #x0B6E)	; à­®
     ))
 (define-char
   '((name		. "ORIYA DIGIT NINE")
-    (ucs		. #x0B6F)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 9)
-    (digit-value	. 9)
-    (numeric-value	. 9)
     (mirrored		. nil)
+    (decimal-digit-value . 9)
+    (digit-value	 . 9)
+    (numeric-value	 . 9)
+    (ucs		. #x0B6F)	; à­¯
     ))
 (define-char
   '((name		. "ORIYA ISSHAR")
-    (ucs		. #x0B70)
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B70)	; à­°
     ))
diff --git a/lisp/utf-2000/u00B80-Tamil.el b/lisp/utf-2000/u00B80-Tamil.el
index 67408d9..b9db174 100644
--- a/lisp/utf-2000/u00B80-Tamil.el
+++ b/lisp/utf-2000/u00B80-Tamil.el
@@ -1,461 +1,461 @@
 (define-char
   '((name		. "TAMIL SIGN ANUSVARA")
-    (ucs		. #x0B82)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0B82)	; ஂ
     ))
 (define-char
   '((name		. "TAMIL SIGN VISARGA")
-    (ucs		. #x0B83)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B83)	; ஃ
     ))
 (define-char
   '((name		. "TAMIL LETTER A")
-    (ucs		. #x0B85)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B85)	; அ
     ))
 (define-char
   '((name		. "TAMIL LETTER AA")
-    (ucs		. #x0B86)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B86)	; ஆ
     ))
 (define-char
   '((name		. "TAMIL LETTER I")
-    (ucs		. #x0B87)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B87)	; இ
     ))
 (define-char
   '((name		. "TAMIL LETTER II")
-    (ucs		. #x0B88)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B88)	; ஈ
     ))
 (define-char
   '((name		. "TAMIL LETTER U")
-    (ucs		. #x0B89)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B89)	; உ
     ))
 (define-char
   '((name		. "TAMIL LETTER UU")
-    (ucs		. #x0B8A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B8A)	; ஊ
     ))
 (define-char
   '((name		. "TAMIL LETTER E")
-    (ucs		. #x0B8E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B8E)	; எ
     ))
 (define-char
   '((name		. "TAMIL LETTER EE")
-    (ucs		. #x0B8F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B8F)	; ஏ
     ))
 (define-char
   '((name		. "TAMIL LETTER AI")
-    (ucs		. #x0B90)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B90)	; ஐ
     ))
 (define-char
   '((name		. "TAMIL LETTER O")
-    (ucs		. #x0B92)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B92)	; ஒ
     ))
 (define-char
   '((name		. "TAMIL LETTER OO")
-    (ucs		. #x0B93)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B93)	; ஓ
     ))
 (define-char
   '((name		. "TAMIL LETTER AU")
-    (ucs		. #x0B94)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0B92 #x0BD7)
     (mirrored		. nil)
+    (->decomposition	#x0B92 #x0BD7)
+    (ucs		. #x0B94)	; ஔ
     ))
 (define-char
   '((name		. "TAMIL LETTER KA")
-    (ucs		. #x0B95)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B95)	; க
     ))
 (define-char
   '((name		. "TAMIL LETTER NGA")
-    (ucs		. #x0B99)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B99)	; ங
     ))
 (define-char
   '((name		. "TAMIL LETTER CA")
-    (ucs		. #x0B9A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B9A)	; ச
     ))
 (define-char
   '((name		. "TAMIL LETTER JA")
-    (ucs		. #x0B9C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B9C)	; ஜ
     ))
 (define-char
   '((name		. "TAMIL LETTER NYA")
-    (ucs		. #x0B9E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B9E)	; ஞ
     ))
 (define-char
   '((name		. "TAMIL LETTER TTA")
-    (ucs		. #x0B9F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0B9F)	; ட
     ))
 (define-char
   '((name		. "TAMIL LETTER NNA")
-    (ucs		. #x0BA3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BA3)	; ண
     ))
 (define-char
   '((name		. "TAMIL LETTER TA")
-    (ucs		. #x0BA4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BA4)	; த
     ))
 (define-char
   '((name		. "TAMIL LETTER NA")
-    (ucs		. #x0BA8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BA8)	; ந
     ))
 (define-char
   '((name		. "TAMIL LETTER NNNA")
-    (ucs		. #x0BA9)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BA9)	; ன
     ))
 (define-char
   '((name		. "TAMIL LETTER PA")
-    (ucs		. #x0BAA)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BAA)	; ப
     ))
 (define-char
   '((name		. "TAMIL LETTER MA")
-    (ucs		. #x0BAE)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BAE)	; à®®
     ))
 (define-char
   '((name		. "TAMIL LETTER YA")
-    (ucs		. #x0BAF)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BAF)	; ய
     ))
 (define-char
   '((name		. "TAMIL LETTER RA")
-    (ucs		. #x0BB0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB0)	; à®°
     ))
 (define-char
   '((name		. "TAMIL LETTER RRA")
-    (ucs		. #x0BB1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB1)	; à®±
     ))
 (define-char
   '((name		. "TAMIL LETTER LA")
-    (ucs		. #x0BB2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB2)	; ல
     ))
 (define-char
   '((name		. "TAMIL LETTER LLA")
-    (ucs		. #x0BB3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB3)	; ள
     ))
 (define-char
   '((name		. "TAMIL LETTER LLLA")
-    (ucs		. #x0BB4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB4)	; à®´
     ))
 (define-char
   '((name		. "TAMIL LETTER VA")
-    (ucs		. #x0BB5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB5)	; வ
     ))
 (define-char
   '((name		. "TAMIL LETTER SSA")
-    (ucs		. #x0BB7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB7)	; à®·
     ))
 (define-char
   '((name		. "TAMIL LETTER SA")
-    (ucs		. #x0BB8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB8)	; ஸ
     ))
 (define-char
   '((name		. "TAMIL LETTER HA")
-    (ucs		. #x0BB9)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BB9)	; ஹ
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN AA")
-    (ucs		. #x0BBE)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BBE)	; ா
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN I")
-    (ucs		. #x0BBF)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BBF)	; ி
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN II")
-    (ucs		. #x0BC0)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0BC0)	; ீ
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN U")
-    (ucs		. #x0BC1)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BC1)	; ு
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN UU")
-    (ucs		. #x0BC2)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BC2)	; ூ
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN E")
-    (ucs		. #x0BC6)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BC6)	; ெ
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN EE")
-    (ucs		. #x0BC7)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BC7)	; ே
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN AI")
-    (ucs		. #x0BC8)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BC8)	; ை
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN O")
-    (ucs		. #x0BCA)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0BC6 #x0BBE)
     (mirrored		. nil)
+    (->decomposition	#x0BC6 #x0BBE)
+    (ucs		. #x0BCA)	; ொ
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN OO")
-    (ucs		. #x0BCB)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0BC7 #x0BBE)
     (mirrored		. nil)
+    (->decomposition	#x0BC7 #x0BBE)
+    (ucs		. #x0BCB)	; ோ
     ))
 (define-char
   '((name		. "TAMIL VOWEL SIGN AU")
-    (ucs		. #x0BCC)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0BC6 #x0BD7)
     (mirrored		. nil)
+    (->decomposition	#x0BC6 #x0BD7)
+    (ucs		. #x0BCC)	; ௌ
     ))
 (define-char
   '((name		. "TAMIL SIGN VIRAMA")
-    (ucs		. #x0BCD)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0BCD)	; ்
     ))
 (define-char
   '((name		. "TAMIL AU LENGTH MARK")
-    (ucs		. #x0BD7)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0BD7)	; ௗ
     ))
 (define-char
   '((name		. "TAMIL DIGIT ONE")
-    (ucs		. #x0BE7)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 1)
-    (digit-value	. 1)
-    (numeric-value	. 1)
     (mirrored		. nil)
+    (decimal-digit-value . 1)
+    (digit-value	 . 1)
+    (numeric-value	 . 1)
+    (ucs		. #x0BE7)	; ௧
     ))
 (define-char
   '((name		. "TAMIL DIGIT TWO")
-    (ucs		. #x0BE8)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 2)
-    (digit-value	. 2)
-    (numeric-value	. 2)
     (mirrored		. nil)
+    (decimal-digit-value . 2)
+    (digit-value	 . 2)
+    (numeric-value	 . 2)
+    (ucs		. #x0BE8)	; ௨
     ))
 (define-char
   '((name		. "TAMIL DIGIT THREE")
-    (ucs		. #x0BE9)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 3)
-    (digit-value	. 3)
-    (numeric-value	. 3)
     (mirrored		. nil)
+    (decimal-digit-value . 3)
+    (digit-value	 . 3)
+    (numeric-value	 . 3)
+    (ucs		. #x0BE9)	; ௩
     ))
 (define-char
   '((name		. "TAMIL DIGIT FOUR")
-    (ucs		. #x0BEA)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 4)
-    (digit-value	. 4)
-    (numeric-value	. 4)
     (mirrored		. nil)
+    (decimal-digit-value . 4)
+    (digit-value	 . 4)
+    (numeric-value	 . 4)
+    (ucs		. #x0BEA)	; ௪
     ))
 (define-char
   '((name		. "TAMIL DIGIT FIVE")
-    (ucs		. #x0BEB)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 5)
-    (digit-value	. 5)
-    (numeric-value	. 5)
     (mirrored		. nil)
+    (decimal-digit-value . 5)
+    (digit-value	 . 5)
+    (numeric-value	 . 5)
+    (ucs		. #x0BEB)	; ௫
     ))
 (define-char
   '((name		. "TAMIL DIGIT SIX")
-    (ucs		. #x0BEC)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 6)
-    (digit-value	. 6)
-    (numeric-value	. 6)
     (mirrored		. nil)
+    (decimal-digit-value . 6)
+    (digit-value	 . 6)
+    (numeric-value	 . 6)
+    (ucs		. #x0BEC)	; ௬
     ))
 (define-char
   '((name		. "TAMIL DIGIT SEVEN")
-    (ucs		. #x0BED)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 7)
-    (digit-value	. 7)
-    (numeric-value	. 7)
     (mirrored		. nil)
+    (decimal-digit-value . 7)
+    (digit-value	 . 7)
+    (numeric-value	 . 7)
+    (ucs		. #x0BED)	; ௭
     ))
 (define-char
   '((name		. "TAMIL DIGIT EIGHT")
-    (ucs		. #x0BEE)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 8)
-    (digit-value	. 8)
-    (numeric-value	. 8)
     (mirrored		. nil)
+    (decimal-digit-value . 8)
+    (digit-value	 . 8)
+    (numeric-value	 . 8)
+    (ucs		. #x0BEE)	; ௮
     ))
 (define-char
   '((name		. "TAMIL DIGIT NINE")
-    (ucs		. #x0BEF)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 9)
-    (digit-value	. 9)
-    (numeric-value	. 9)
     (mirrored		. nil)
+    (decimal-digit-value . 9)
+    (digit-value	 . 9)
+    (numeric-value	 . 9)
+    (ucs		. #x0BEF)	; ௯
     ))
 (define-char
   '((name		. "TAMIL NUMBER TEN")
-    (ucs		. #x0BF0)
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
-    (numeric-value	. 10)
     (mirrored		. nil)
+    (numeric-value	. 10)
+    (ucs		. #x0BF0)	; ௰
     ))
 (define-char
   '((name		. "TAMIL NUMBER ONE HUNDRED")
-    (ucs		. #x0BF1)
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
-    (numeric-value	. 100)
     (mirrored		. nil)
+    (numeric-value	. 100)
+    (ucs		. #x0BF1)	; ௱
     ))
 (define-char
   '((name		. "TAMIL NUMBER ONE THOUSAND")
-    (ucs		. #x0BF2)
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
-    (numeric-value	. 1000)
     (mirrored		. nil)
+    (numeric-value	. 1000)
+    (ucs		. #x0BF2)	; ௲
     ))
diff --git a/lisp/utf-2000/u00C00-Telugu.el b/lisp/utf-2000/u00C00-Telugu.el
index 04e8102..8d61d22 100644
--- a/lisp/utf-2000/u00C00-Telugu.el
+++ b/lisp/utf-2000/u00C00-Telugu.el
@@ -1,591 +1,591 @@
 (define-char
   '((name		. "TELUGU SIGN CANDRABINDU")
-    (ucs		. #x0C01)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C01)	; ఁ
     ))
 (define-char
   '((name		. "TELUGU SIGN ANUSVARA")
-    (ucs		. #x0C02)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C02)	; ం
     ))
 (define-char
   '((name		. "TELUGU SIGN VISARGA")
-    (ucs		. #x0C03)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C03)	; ః
     ))
 (define-char
   '((name		. "TELUGU LETTER A")
-    (ucs		. #x0C05)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C05)	; అ
     ))
 (define-char
   '((name		. "TELUGU LETTER AA")
-    (ucs		. #x0C06)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C06)	; ఆ
     ))
 (define-char
   '((name		. "TELUGU LETTER I")
-    (ucs		. #x0C07)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C07)	; ఇ
     ))
 (define-char
   '((name		. "TELUGU LETTER II")
-    (ucs		. #x0C08)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C08)	; ఈ
     ))
 (define-char
   '((name		. "TELUGU LETTER U")
-    (ucs		. #x0C09)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C09)	; ఉ
     ))
 (define-char
   '((name		. "TELUGU LETTER UU")
-    (ucs		. #x0C0A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C0A)	; ఊ
     ))
 (define-char
   '((name		. "TELUGU LETTER VOCALIC R")
-    (ucs		. #x0C0B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C0B)	; ఋ
     ))
 (define-char
   '((name		. "TELUGU LETTER VOCALIC L")
-    (ucs		. #x0C0C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C0C)	; ఌ
     ))
 (define-char
   '((name		. "TELUGU LETTER E")
-    (ucs		. #x0C0E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C0E)	; ఎ
     ))
 (define-char
   '((name		. "TELUGU LETTER EE")
-    (ucs		. #x0C0F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C0F)	; ఏ
     ))
 (define-char
   '((name		. "TELUGU LETTER AI")
-    (ucs		. #x0C10)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C10)	; ఐ
     ))
 (define-char
   '((name		. "TELUGU LETTER O")
-    (ucs		. #x0C12)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C12)	; ఒ
     ))
 (define-char
   '((name		. "TELUGU LETTER OO")
-    (ucs		. #x0C13)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C13)	; ఓ
     ))
 (define-char
   '((name		. "TELUGU LETTER AU")
-    (ucs		. #x0C14)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C14)	; ఔ
     ))
 (define-char
   '((name		. "TELUGU LETTER KA")
-    (ucs		. #x0C15)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C15)	; క
     ))
 (define-char
   '((name		. "TELUGU LETTER KHA")
-    (ucs		. #x0C16)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C16)	; ఖ
     ))
 (define-char
   '((name		. "TELUGU LETTER GA")
-    (ucs		. #x0C17)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C17)	; గ
     ))
 (define-char
   '((name		. "TELUGU LETTER GHA")
-    (ucs		. #x0C18)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C18)	; ఘ
     ))
 (define-char
   '((name		. "TELUGU LETTER NGA")
-    (ucs		. #x0C19)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C19)	; ఙ
     ))
 (define-char
   '((name		. "TELUGU LETTER CA")
-    (ucs		. #x0C1A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C1A)	; చ
     ))
 (define-char
   '((name		. "TELUGU LETTER CHA")
-    (ucs		. #x0C1B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C1B)	; ఛ
     ))
 (define-char
   '((name		. "TELUGU LETTER JA")
-    (ucs		. #x0C1C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C1C)	; జ
     ))
 (define-char
   '((name		. "TELUGU LETTER JHA")
-    (ucs		. #x0C1D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C1D)	; ఝ
     ))
 (define-char
   '((name		. "TELUGU LETTER NYA")
-    (ucs		. #x0C1E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C1E)	; ఞ
     ))
 (define-char
   '((name		. "TELUGU LETTER TTA")
-    (ucs		. #x0C1F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C1F)	; ట
     ))
 (define-char
   '((name		. "TELUGU LETTER TTHA")
-    (ucs		. #x0C20)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C20)	; à° 
     ))
 (define-char
   '((name		. "TELUGU LETTER DDA")
-    (ucs		. #x0C21)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C21)	; à°¡
     ))
 (define-char
   '((name		. "TELUGU LETTER DDHA")
-    (ucs		. #x0C22)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C22)	; à°¢
     ))
 (define-char
   '((name		. "TELUGU LETTER NNA")
-    (ucs		. #x0C23)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C23)	; à°£
     ))
 (define-char
   '((name		. "TELUGU LETTER TA")
-    (ucs		. #x0C24)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C24)	; à°¤
     ))
 (define-char
   '((name		. "TELUGU LETTER THA")
-    (ucs		. #x0C25)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C25)	; à°¥
     ))
 (define-char
   '((name		. "TELUGU LETTER DA")
-    (ucs		. #x0C26)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C26)	; à°¦
     ))
 (define-char
   '((name		. "TELUGU LETTER DHA")
-    (ucs		. #x0C27)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C27)	; à°§
     ))
 (define-char
   '((name		. "TELUGU LETTER NA")
-    (ucs		. #x0C28)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C28)	; à°¨
     ))
 (define-char
   '((name		. "TELUGU LETTER PA")
-    (ucs		. #x0C2A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C2A)	; à°ª
     ))
 (define-char
   '((name		. "TELUGU LETTER PHA")
-    (ucs		. #x0C2B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C2B)	; à°«
     ))
 (define-char
   '((name		. "TELUGU LETTER BA")
-    (ucs		. #x0C2C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C2C)	; à°¬
     ))
 (define-char
   '((name		. "TELUGU LETTER BHA")
-    (ucs		. #x0C2D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C2D)	; à°­
     ))
 (define-char
   '((name		. "TELUGU LETTER MA")
-    (ucs		. #x0C2E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C2E)	; à°®
     ))
 (define-char
   '((name		. "TELUGU LETTER YA")
-    (ucs		. #x0C2F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C2F)	; à°¯
     ))
 (define-char
   '((name		. "TELUGU LETTER RA")
-    (ucs		. #x0C30)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C30)	; à°°
     ))
 (define-char
   '((name		. "TELUGU LETTER RRA")
-    (ucs		. #x0C31)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C31)	; à°±
     ))
 (define-char
   '((name		. "TELUGU LETTER LA")
-    (ucs		. #x0C32)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C32)	; à°²
     ))
 (define-char
   '((name		. "TELUGU LETTER LLA")
-    (ucs		. #x0C33)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C33)	; à°³
     ))
 (define-char
   '((name		. "TELUGU LETTER VA")
-    (ucs		. #x0C35)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C35)	; à°µ
     ))
 (define-char
   '((name		. "TELUGU LETTER SHA")
-    (ucs		. #x0C36)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C36)	; à°¶
     ))
 (define-char
   '((name		. "TELUGU LETTER SSA")
-    (ucs		. #x0C37)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C37)	; à°·
     ))
 (define-char
   '((name		. "TELUGU LETTER SA")
-    (ucs		. #x0C38)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C38)	; à°¸
     ))
 (define-char
   '((name		. "TELUGU LETTER HA")
-    (ucs		. #x0C39)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C39)	; à°¹
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN AA")
-    (ucs		. #x0C3E)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C3E)	; à°¾
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN I")
-    (ucs		. #x0C3F)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C3F)	; à°¿
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN II")
-    (ucs		. #x0C40)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C40)	; ీ
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN U")
-    (ucs		. #x0C41)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C41)	; ు
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN UU")
-    (ucs		. #x0C42)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C42)	; ూ
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN VOCALIC R")
-    (ucs		. #x0C43)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C43)	; ృ
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN VOCALIC RR")
-    (ucs		. #x0C44)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C44)	; ౄ
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN E")
-    (ucs		. #x0C46)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C46)	; ె
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN EE")
-    (ucs		. #x0C47)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C47)	; ే
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN AI")
-    (ucs		. #x0C48)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
-    (->decomposition	#x0C46 #x0C56)
     (mirrored		. nil)
+    (->decomposition	#x0C46 #x0C56)
+    (ucs		. #x0C48)	; ై
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN O")
-    (ucs		. #x0C4A)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C4A)	; ొ
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN OO")
-    (ucs		. #x0C4B)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C4B)	; ో
     ))
 (define-char
   '((name		. "TELUGU VOWEL SIGN AU")
-    (ucs		. #x0C4C)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C4C)	; ౌ
     ))
 (define-char
   '((name		. "TELUGU SIGN VIRAMA")
-    (ucs		. #x0C4D)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C4D)	; ్
     ))
 (define-char
   '((name		. "TELUGU LENGTH MARK")
-    (ucs		. #x0C55)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C55)	; ౕ
     ))
 (define-char
   '((name		. "TELUGU AI LENGTH MARK")
-    (ucs		. #x0C56)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0C56)	; ౖ
     ))
 (define-char
   '((name		. "TELUGU LETTER VOCALIC RR")
-    (ucs		. #x0C60)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C60)	; à± 
     ))
 (define-char
   '((name		. "TELUGU LETTER VOCALIC LL")
-    (ucs		. #x0C61)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C61)	; ౡ
     ))
 (define-char
   '((name		. "TELUGU DIGIT ZERO")
-    (ucs		. #x0C66)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 0)
-    (digit-value	. 0)
-    (numeric-value	. 0)
     (mirrored		. nil)
+    (decimal-digit-value . 0)
+    (digit-value	 . 0)
+    (numeric-value	 . 0)
+    (ucs		. #x0C66)	; ౦
     ))
 (define-char
   '((name		. "TELUGU DIGIT ONE")
-    (ucs		. #x0C67)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 1)
-    (digit-value	. 1)
-    (numeric-value	. 1)
     (mirrored		. nil)
+    (decimal-digit-value . 1)
+    (digit-value	 . 1)
+    (numeric-value	 . 1)
+    (ucs		. #x0C67)	; ౧
     ))
 (define-char
   '((name		. "TELUGU DIGIT TWO")
-    (ucs		. #x0C68)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 2)
-    (digit-value	. 2)
-    (numeric-value	. 2)
     (mirrored		. nil)
+    (decimal-digit-value . 2)
+    (digit-value	 . 2)
+    (numeric-value	 . 2)
+    (ucs		. #x0C68)	; ౨
     ))
 (define-char
   '((name		. "TELUGU DIGIT THREE")
-    (ucs		. #x0C69)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 3)
-    (digit-value	. 3)
-    (numeric-value	. 3)
     (mirrored		. nil)
+    (decimal-digit-value . 3)
+    (digit-value	 . 3)
+    (numeric-value	 . 3)
+    (ucs		. #x0C69)	; ౩
     ))
 (define-char
   '((name		. "TELUGU DIGIT FOUR")
-    (ucs		. #x0C6A)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 4)
-    (digit-value	. 4)
-    (numeric-value	. 4)
     (mirrored		. nil)
+    (decimal-digit-value . 4)
+    (digit-value	 . 4)
+    (numeric-value	 . 4)
+    (ucs		. #x0C6A)	; ౪
     ))
 (define-char
   '((name		. "TELUGU DIGIT FIVE")
-    (ucs		. #x0C6B)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 5)
-    (digit-value	. 5)
-    (numeric-value	. 5)
     (mirrored		. nil)
+    (decimal-digit-value . 5)
+    (digit-value	 . 5)
+    (numeric-value	 . 5)
+    (ucs		. #x0C6B)	; ౫
     ))
 (define-char
   '((name		. "TELUGU DIGIT SIX")
-    (ucs		. #x0C6C)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 6)
-    (digit-value	. 6)
-    (numeric-value	. 6)
     (mirrored		. nil)
+    (decimal-digit-value . 6)
+    (digit-value	 . 6)
+    (numeric-value	 . 6)
+    (ucs		. #x0C6C)	; ౬
     ))
 (define-char
   '((name		. "TELUGU DIGIT SEVEN")
-    (ucs		. #x0C6D)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 7)
-    (digit-value	. 7)
-    (numeric-value	. 7)
     (mirrored		. nil)
+    (decimal-digit-value . 7)
+    (digit-value	 . 7)
+    (numeric-value	 . 7)
+    (ucs		. #x0C6D)	; à±­
     ))
 (define-char
   '((name		. "TELUGU DIGIT EIGHT")
-    (ucs		. #x0C6E)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 8)
-    (digit-value	. 8)
-    (numeric-value	. 8)
     (mirrored		. nil)
+    (decimal-digit-value . 8)
+    (digit-value	 . 8)
+    (numeric-value	 . 8)
+    (ucs		. #x0C6E)	; à±®
     ))
 (define-char
   '((name		. "TELUGU DIGIT NINE")
-    (ucs		. #x0C6F)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 9)
-    (digit-value	. 9)
-    (numeric-value	. 9)
     (mirrored		. nil)
+    (decimal-digit-value . 9)
+    (digit-value	 . 9)
+    (numeric-value	 . 9)
+    (ucs		. #x0C6F)	; ౯
     ))
diff --git a/lisp/utf-2000/u00C80-Kannada.el b/lisp/utf-2000/u00C80-Kannada.el
index 914051b..7d85021 100644
--- a/lisp/utf-2000/u00C80-Kannada.el
+++ b/lisp/utf-2000/u00C80-Kannada.el
@@ -1,595 +1,595 @@
 (define-char
   '((name		. "KANNADA SIGN ANUSVARA")
-    (ucs		. #x0C82)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C82)	; ಂ
     ))
 (define-char
   '((name		. "KANNADA SIGN VISARGA")
-    (ucs		. #x0C83)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C83)	; ಃ
     ))
 (define-char
   '((name		. "KANNADA LETTER A")
-    (ucs		. #x0C85)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C85)	; ಅ
     ))
 (define-char
   '((name		. "KANNADA LETTER AA")
-    (ucs		. #x0C86)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C86)	; ಆ
     ))
 (define-char
   '((name		. "KANNADA LETTER I")
-    (ucs		. #x0C87)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C87)	; ಇ
     ))
 (define-char
   '((name		. "KANNADA LETTER II")
-    (ucs		. #x0C88)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C88)	; ಈ
     ))
 (define-char
   '((name		. "KANNADA LETTER U")
-    (ucs		. #x0C89)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C89)	; ಉ
     ))
 (define-char
   '((name		. "KANNADA LETTER UU")
-    (ucs		. #x0C8A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C8A)	; ಊ
     ))
 (define-char
   '((name		. "KANNADA LETTER VOCALIC R")
-    (ucs		. #x0C8B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C8B)	; ಋ
     ))
 (define-char
   '((name		. "KANNADA LETTER VOCALIC L")
-    (ucs		. #x0C8C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C8C)	; ಌ
     ))
 (define-char
   '((name		. "KANNADA LETTER E")
-    (ucs		. #x0C8E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C8E)	; ಎ
     ))
 (define-char
   '((name		. "KANNADA LETTER EE")
-    (ucs		. #x0C8F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C8F)	; ಏ
     ))
 (define-char
   '((name		. "KANNADA LETTER AI")
-    (ucs		. #x0C90)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C90)	; ಐ
     ))
 (define-char
   '((name		. "KANNADA LETTER O")
-    (ucs		. #x0C92)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C92)	; ಒ
     ))
 (define-char
   '((name		. "KANNADA LETTER OO")
-    (ucs		. #x0C93)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C93)	; ಓ
     ))
 (define-char
   '((name		. "KANNADA LETTER AU")
-    (ucs		. #x0C94)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C94)	; ಔ
     ))
 (define-char
   '((name		. "KANNADA LETTER KA")
-    (ucs		. #x0C95)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C95)	; ಕ
     ))
 (define-char
   '((name		. "KANNADA LETTER KHA")
-    (ucs		. #x0C96)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C96)	; ಖ
     ))
 (define-char
   '((name		. "KANNADA LETTER GA")
-    (ucs		. #x0C97)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C97)	; ಗ
     ))
 (define-char
   '((name		. "KANNADA LETTER GHA")
-    (ucs		. #x0C98)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C98)	; ಘ
     ))
 (define-char
   '((name		. "KANNADA LETTER NGA")
-    (ucs		. #x0C99)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C99)	; ಙ
     ))
 (define-char
   '((name		. "KANNADA LETTER CA")
-    (ucs		. #x0C9A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C9A)	; ಚ
     ))
 (define-char
   '((name		. "KANNADA LETTER CHA")
-    (ucs		. #x0C9B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C9B)	; ಛ
     ))
 (define-char
   '((name		. "KANNADA LETTER JA")
-    (ucs		. #x0C9C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C9C)	; ಜ
     ))
 (define-char
   '((name		. "KANNADA LETTER JHA")
-    (ucs		. #x0C9D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C9D)	; ಝ
     ))
 (define-char
   '((name		. "KANNADA LETTER NYA")
-    (ucs		. #x0C9E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C9E)	; ಞ
     ))
 (define-char
   '((name		. "KANNADA LETTER TTA")
-    (ucs		. #x0C9F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0C9F)	; ಟ
     ))
 (define-char
   '((name		. "KANNADA LETTER TTHA")
-    (ucs		. #x0CA0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA0)	; ಠ
     ))
 (define-char
   '((name		. "KANNADA LETTER DDA")
-    (ucs		. #x0CA1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA1)	; ಡ
     ))
 (define-char
   '((name		. "KANNADA LETTER DDHA")
-    (ucs		. #x0CA2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA2)	; ಢ
     ))
 (define-char
   '((name		. "KANNADA LETTER NNA")
-    (ucs		. #x0CA3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA3)	; ಣ
     ))
 (define-char
   '((name		. "KANNADA LETTER TA")
-    (ucs		. #x0CA4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA4)	; ತ
     ))
 (define-char
   '((name		. "KANNADA LETTER THA")
-    (ucs		. #x0CA5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA5)	; ಥ
     ))
 (define-char
   '((name		. "KANNADA LETTER DA")
-    (ucs		. #x0CA6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA6)	; ದ
     ))
 (define-char
   '((name		. "KANNADA LETTER DHA")
-    (ucs		. #x0CA7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA7)	; ಧ
     ))
 (define-char
   '((name		. "KANNADA LETTER NA")
-    (ucs		. #x0CA8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CA8)	; ನ
     ))
 (define-char
   '((name		. "KANNADA LETTER PA")
-    (ucs		. #x0CAA)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CAA)	; ಪ
     ))
 (define-char
   '((name		. "KANNADA LETTER PHA")
-    (ucs		. #x0CAB)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CAB)	; ಫ
     ))
 (define-char
   '((name		. "KANNADA LETTER BA")
-    (ucs		. #x0CAC)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CAC)	; ಬ
     ))
 (define-char
   '((name		. "KANNADA LETTER BHA")
-    (ucs		. #x0CAD)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CAD)	; ಭ
     ))
 (define-char
   '((name		. "KANNADA LETTER MA")
-    (ucs		. #x0CAE)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CAE)	; ಮ
     ))
 (define-char
   '((name		. "KANNADA LETTER YA")
-    (ucs		. #x0CAF)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CAF)	; ಯ
     ))
 (define-char
   '((name		. "KANNADA LETTER RA")
-    (ucs		. #x0CB0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB0)	; ರ
     ))
 (define-char
   '((name		. "KANNADA LETTER RRA")
-    (ucs		. #x0CB1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB1)	; ಱ
     ))
 (define-char
   '((name		. "KANNADA LETTER LA")
-    (ucs		. #x0CB2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB2)	; ಲ
     ))
 (define-char
   '((name		. "KANNADA LETTER LLA")
-    (ucs		. #x0CB3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB3)	; ಳ
     ))
 (define-char
   '((name		. "KANNADA LETTER VA")
-    (ucs		. #x0CB5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB5)	; ವ
     ))
 (define-char
   '((name		. "KANNADA LETTER SHA")
-    (ucs		. #x0CB6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB6)	; ಶ
     ))
 (define-char
   '((name		. "KANNADA LETTER SSA")
-    (ucs		. #x0CB7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB7)	; ಷ
     ))
 (define-char
   '((name		. "KANNADA LETTER SA")
-    (ucs		. #x0CB8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB8)	; ಸ
     ))
 (define-char
   '((name		. "KANNADA LETTER HA")
-    (ucs		. #x0CB9)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CB9)	; ಹ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN AA")
-    (ucs		. #x0CBE)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CBE)	; ಾ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN I")
-    (ucs		. #x0CBF)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0CBF)	; ಿ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN II")
-    (ucs		. #x0CC0)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0CBF #x0CD5)
     (mirrored		. nil)
+    (->decomposition	#x0CBF #x0CD5)
+    (ucs		. #x0CC0)	; ೀ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN U")
-    (ucs		. #x0CC1)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CC1)	; ು
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN UU")
-    (ucs		. #x0CC2)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CC2)	; ೂ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN VOCALIC R")
-    (ucs		. #x0CC3)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CC3)	; ೃ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN VOCALIC RR")
-    (ucs		. #x0CC4)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CC4)	; ೄ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN E")
-    (ucs		. #x0CC6)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0CC6)	; ೆ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN EE")
-    (ucs		. #x0CC7)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0CC6 #x0CD5)
     (mirrored		. nil)
+    (->decomposition	#x0CC6 #x0CD5)
+    (ucs		. #x0CC7)	; ೇ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN AI")
-    (ucs		. #x0CC8)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0CC6 #x0CD6)
     (mirrored		. nil)
+    (->decomposition	#x0CC6 #x0CD6)
+    (ucs		. #x0CC8)	; ೈ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN O")
-    (ucs		. #x0CCA)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0CC6 #x0CC2)
     (mirrored		. nil)
+    (->decomposition	#x0CC6 #x0CC2)
+    (ucs		. #x0CCA)	; ೊ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN OO")
-    (ucs		. #x0CCB)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0CCA #x0CD5)
     (mirrored		. nil)
+    (->decomposition	#x0CCA #x0CD5)
+    (ucs		. #x0CCB)	; ೋ
     ))
 (define-char
   '((name		. "KANNADA VOWEL SIGN AU")
-    (ucs		. #x0CCC)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0CCC)	; ೌ
     ))
 (define-char
   '((name		. "KANNADA SIGN VIRAMA")
-    (ucs		. #x0CCD)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0CCD)	; ್
     ))
 (define-char
   '((name		. "KANNADA LENGTH MARK")
-    (ucs		. #x0CD5)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CD5)	; ೕ
     ))
 (define-char
   '((name		. "KANNADA AI LENGTH MARK")
-    (ucs		. #x0CD6)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CD6)	; ೖ
     ))
 (define-char
   '((name		. "KANNADA LETTER FA")
-    (ucs		. #x0CDE)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CDE)	; ೞ
     ))
 (define-char
   '((name		. "KANNADA LETTER VOCALIC RR")
-    (ucs		. #x0CE0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CE0)	; à³ 
     ))
 (define-char
   '((name		. "KANNADA LETTER VOCALIC LL")
-    (ucs		. #x0CE1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0CE1)	; ೡ
     ))
 (define-char
   '((name		. "KANNADA DIGIT ZERO")
-    (ucs		. #x0CE6)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 0)
-    (digit-value	. 0)
-    (numeric-value	. 0)
     (mirrored		. nil)
+    (decimal-digit-value . 0)
+    (digit-value	 . 0)
+    (numeric-value	 . 0)
+    (ucs		. #x0CE6)	; ೦
     ))
 (define-char
   '((name		. "KANNADA DIGIT ONE")
-    (ucs		. #x0CE7)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 1)
-    (digit-value	. 1)
-    (numeric-value	. 1)
     (mirrored		. nil)
+    (decimal-digit-value . 1)
+    (digit-value	 . 1)
+    (numeric-value	 . 1)
+    (ucs		. #x0CE7)	; ೧
     ))
 (define-char
   '((name		. "KANNADA DIGIT TWO")
-    (ucs		. #x0CE8)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 2)
-    (digit-value	. 2)
-    (numeric-value	. 2)
     (mirrored		. nil)
+    (decimal-digit-value . 2)
+    (digit-value	 . 2)
+    (numeric-value	 . 2)
+    (ucs		. #x0CE8)	; ೨
     ))
 (define-char
   '((name		. "KANNADA DIGIT THREE")
-    (ucs		. #x0CE9)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 3)
-    (digit-value	. 3)
-    (numeric-value	. 3)
     (mirrored		. nil)
+    (decimal-digit-value . 3)
+    (digit-value	 . 3)
+    (numeric-value	 . 3)
+    (ucs		. #x0CE9)	; ೩
     ))
 (define-char
   '((name		. "KANNADA DIGIT FOUR")
-    (ucs		. #x0CEA)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 4)
-    (digit-value	. 4)
-    (numeric-value	. 4)
     (mirrored		. nil)
+    (decimal-digit-value . 4)
+    (digit-value	 . 4)
+    (numeric-value	 . 4)
+    (ucs		. #x0CEA)	; ೪
     ))
 (define-char
   '((name		. "KANNADA DIGIT FIVE")
-    (ucs		. #x0CEB)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 5)
-    (digit-value	. 5)
-    (numeric-value	. 5)
     (mirrored		. nil)
+    (decimal-digit-value . 5)
+    (digit-value	 . 5)
+    (numeric-value	 . 5)
+    (ucs		. #x0CEB)	; ೫
     ))
 (define-char
   '((name		. "KANNADA DIGIT SIX")
-    (ucs		. #x0CEC)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 6)
-    (digit-value	. 6)
-    (numeric-value	. 6)
     (mirrored		. nil)
+    (decimal-digit-value . 6)
+    (digit-value	 . 6)
+    (numeric-value	 . 6)
+    (ucs		. #x0CEC)	; ೬
     ))
 (define-char
   '((name		. "KANNADA DIGIT SEVEN")
-    (ucs		. #x0CED)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 7)
-    (digit-value	. 7)
-    (numeric-value	. 7)
     (mirrored		. nil)
+    (decimal-digit-value . 7)
+    (digit-value	 . 7)
+    (numeric-value	 . 7)
+    (ucs		. #x0CED)	; à³­
     ))
 (define-char
   '((name		. "KANNADA DIGIT EIGHT")
-    (ucs		. #x0CEE)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 8)
-    (digit-value	. 8)
-    (numeric-value	. 8)
     (mirrored		. nil)
+    (decimal-digit-value . 8)
+    (digit-value	 . 8)
+    (numeric-value	 . 8)
+    (ucs		. #x0CEE)	; à³®
     ))
 (define-char
   '((name		. "KANNADA DIGIT NINE")
-    (ucs		. #x0CEF)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 9)
-    (digit-value	. 9)
-    (numeric-value	. 9)
     (mirrored		. nil)
+    (decimal-digit-value . 9)
+    (digit-value	 . 9)
+    (numeric-value	 . 9)
+    (ucs		. #x0CEF)	; ೯
     ))
diff --git a/lisp/utf-2000/u00D00-Malayalam.el b/lisp/utf-2000/u00D00-Malayalam.el
index dd6dfc6..8f4aa2a 100644
--- a/lisp/utf-2000/u00D00-Malayalam.el
+++ b/lisp/utf-2000/u00D00-Malayalam.el
@@ -1,579 +1,579 @@
 (define-char
   '((name		. "MALAYALAM SIGN ANUSVARA")
-    (ucs		. #x0D02)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D02)	; ം
     ))
 (define-char
   '((name		. "MALAYALAM SIGN VISARGA")
-    (ucs		. #x0D03)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D03)	; ഃ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER A")
-    (ucs		. #x0D05)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D05)	; അ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER AA")
-    (ucs		. #x0D06)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D06)	; ആ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER I")
-    (ucs		. #x0D07)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D07)	; ഇ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER II")
-    (ucs		. #x0D08)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D08)	; ഈ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER U")
-    (ucs		. #x0D09)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D09)	; ഉ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER UU")
-    (ucs		. #x0D0A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D0A)	; ഊ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER VOCALIC R")
-    (ucs		. #x0D0B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D0B)	; ഋ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER VOCALIC L")
-    (ucs		. #x0D0C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D0C)	; ഌ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER E")
-    (ucs		. #x0D0E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D0E)	; എ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER EE")
-    (ucs		. #x0D0F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D0F)	; ഏ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER AI")
-    (ucs		. #x0D10)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D10)	; ഐ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER O")
-    (ucs		. #x0D12)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D12)	; ഒ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER OO")
-    (ucs		. #x0D13)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D13)	; ഓ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER AU")
-    (ucs		. #x0D14)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D14)	; ഔ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER KA")
-    (ucs		. #x0D15)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D15)	; ക
     ))
 (define-char
   '((name		. "MALAYALAM LETTER KHA")
-    (ucs		. #x0D16)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D16)	; ഖ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER GA")
-    (ucs		. #x0D17)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D17)	; ഗ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER GHA")
-    (ucs		. #x0D18)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D18)	; ഘ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER NGA")
-    (ucs		. #x0D19)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D19)	; ങ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER CA")
-    (ucs		. #x0D1A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D1A)	; ച
     ))
 (define-char
   '((name		. "MALAYALAM LETTER CHA")
-    (ucs		. #x0D1B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D1B)	; ഛ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER JA")
-    (ucs		. #x0D1C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D1C)	; ജ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER JHA")
-    (ucs		. #x0D1D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D1D)	; ഝ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER NYA")
-    (ucs		. #x0D1E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D1E)	; ഞ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER TTA")
-    (ucs		. #x0D1F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D1F)	; ട
     ))
 (define-char
   '((name		. "MALAYALAM LETTER TTHA")
-    (ucs		. #x0D20)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D20)	; à´ 
     ))
 (define-char
   '((name		. "MALAYALAM LETTER DDA")
-    (ucs		. #x0D21)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D21)	; à´¡
     ))
 (define-char
   '((name		. "MALAYALAM LETTER DDHA")
-    (ucs		. #x0D22)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D22)	; à´¢
     ))
 (define-char
   '((name		. "MALAYALAM LETTER NNA")
-    (ucs		. #x0D23)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D23)	; à´£
     ))
 (define-char
   '((name		. "MALAYALAM LETTER TA")
-    (ucs		. #x0D24)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D24)	; à´¤
     ))
 (define-char
   '((name		. "MALAYALAM LETTER THA")
-    (ucs		. #x0D25)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D25)	; à´¥
     ))
 (define-char
   '((name		. "MALAYALAM LETTER DA")
-    (ucs		. #x0D26)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D26)	; à´¦
     ))
 (define-char
   '((name		. "MALAYALAM LETTER DHA")
-    (ucs		. #x0D27)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D27)	; à´§
     ))
 (define-char
   '((name		. "MALAYALAM LETTER NA")
-    (ucs		. #x0D28)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D28)	; à´¨
     ))
 (define-char
   '((name		. "MALAYALAM LETTER PA")
-    (ucs		. #x0D2A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D2A)	; à´ª
     ))
 (define-char
   '((name		. "MALAYALAM LETTER PHA")
-    (ucs		. #x0D2B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D2B)	; à´«
     ))
 (define-char
   '((name		. "MALAYALAM LETTER BA")
-    (ucs		. #x0D2C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D2C)	; à´¬
     ))
 (define-char
   '((name		. "MALAYALAM LETTER BHA")
-    (ucs		. #x0D2D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D2D)	; à´­
     ))
 (define-char
   '((name		. "MALAYALAM LETTER MA")
-    (ucs		. #x0D2E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D2E)	; à´®
     ))
 (define-char
   '((name		. "MALAYALAM LETTER YA")
-    (ucs		. #x0D2F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D2F)	; à´¯
     ))
 (define-char
   '((name		. "MALAYALAM LETTER RA")
-    (ucs		. #x0D30)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D30)	; à´°
     ))
 (define-char
   '((name		. "MALAYALAM LETTER RRA")
-    (ucs		. #x0D31)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D31)	; à´±
     ))
 (define-char
   '((name		. "MALAYALAM LETTER LA")
-    (ucs		. #x0D32)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D32)	; à´²
     ))
 (define-char
   '((name		. "MALAYALAM LETTER LLA")
-    (ucs		. #x0D33)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D33)	; à´³
     ))
 (define-char
   '((name		. "MALAYALAM LETTER LLLA")
-    (ucs		. #x0D34)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D34)	; à´´
     ))
 (define-char
   '((name		. "MALAYALAM LETTER VA")
-    (ucs		. #x0D35)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D35)	; à´µ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER SHA")
-    (ucs		. #x0D36)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D36)	; à´¶
     ))
 (define-char
   '((name		. "MALAYALAM LETTER SSA")
-    (ucs		. #x0D37)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D37)	; à´·
     ))
 (define-char
   '((name		. "MALAYALAM LETTER SA")
-    (ucs		. #x0D38)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D38)	; à´¸
     ))
 (define-char
   '((name		. "MALAYALAM LETTER HA")
-    (ucs		. #x0D39)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D39)	; à´¹
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN AA")
-    (ucs		. #x0D3E)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D3E)	; à´¾
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN I")
-    (ucs		. #x0D3F)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D3F)	; à´¿
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN II")
-    (ucs		. #x0D40)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D40)	; ീ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN U")
-    (ucs		. #x0D41)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0D41)	; ു
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN UU")
-    (ucs		. #x0D42)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0D42)	; ൂ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN VOCALIC R")
-    (ucs		. #x0D43)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0D43)	; ൃ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN E")
-    (ucs		. #x0D46)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D46)	; െ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN EE")
-    (ucs		. #x0D47)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D47)	; േ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN AI")
-    (ucs		. #x0D48)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D48)	; ൈ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN O")
-    (ucs		. #x0D4A)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0D46 #x0D3E)
     (mirrored		. nil)
+    (->decomposition	#x0D46 #x0D3E)
+    (ucs		. #x0D4A)	; ൊ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN OO")
-    (ucs		. #x0D4B)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0D47 #x0D3E)
     (mirrored		. nil)
+    (->decomposition	#x0D47 #x0D3E)
+    (ucs		. #x0D4B)	; ോ
     ))
 (define-char
   '((name		. "MALAYALAM VOWEL SIGN AU")
-    (ucs		. #x0D4C)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0D46 #x0D57)
     (mirrored		. nil)
+    (->decomposition	#x0D46 #x0D57)
+    (ucs		. #x0D4C)	; ൌ
     ))
 (define-char
   '((name		. "MALAYALAM SIGN VIRAMA")
-    (ucs		. #x0D4D)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0D4D)	; ്
     ))
 (define-char
   '((name		. "MALAYALAM AU LENGTH MARK")
-    (ucs		. #x0D57)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D57)	; ൗ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER VOCALIC RR")
-    (ucs		. #x0D60)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D60)	; ൠ
     ))
 (define-char
   '((name		. "MALAYALAM LETTER VOCALIC LL")
-    (ucs		. #x0D61)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D61)	; ൡ
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT ZERO")
-    (ucs		. #x0D66)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 0)
-    (digit-value	. 0)
-    (numeric-value	. 0)
     (mirrored		. nil)
+    (decimal-digit-value . 0)
+    (digit-value	 . 0)
+    (numeric-value	 . 0)
+    (ucs		. #x0D66)	; ൦
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT ONE")
-    (ucs		. #x0D67)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 1)
-    (digit-value	. 1)
-    (numeric-value	. 1)
     (mirrored		. nil)
+    (decimal-digit-value . 1)
+    (digit-value	 . 1)
+    (numeric-value	 . 1)
+    (ucs		. #x0D67)	; ൧
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT TWO")
-    (ucs		. #x0D68)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 2)
-    (digit-value	. 2)
-    (numeric-value	. 2)
     (mirrored		. nil)
+    (decimal-digit-value . 2)
+    (digit-value	 . 2)
+    (numeric-value	 . 2)
+    (ucs		. #x0D68)	; ൨
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT THREE")
-    (ucs		. #x0D69)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 3)
-    (digit-value	. 3)
-    (numeric-value	. 3)
     (mirrored		. nil)
+    (decimal-digit-value . 3)
+    (digit-value	 . 3)
+    (numeric-value	 . 3)
+    (ucs		. #x0D69)	; ൩
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT FOUR")
-    (ucs		. #x0D6A)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 4)
-    (digit-value	. 4)
-    (numeric-value	. 4)
     (mirrored		. nil)
+    (decimal-digit-value . 4)
+    (digit-value	 . 4)
+    (numeric-value	 . 4)
+    (ucs		. #x0D6A)	; ൪
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT FIVE")
-    (ucs		. #x0D6B)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 5)
-    (digit-value	. 5)
-    (numeric-value	. 5)
     (mirrored		. nil)
+    (decimal-digit-value . 5)
+    (digit-value	 . 5)
+    (numeric-value	 . 5)
+    (ucs		. #x0D6B)	; ൫
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT SIX")
-    (ucs		. #x0D6C)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 6)
-    (digit-value	. 6)
-    (numeric-value	. 6)
     (mirrored		. nil)
+    (decimal-digit-value . 6)
+    (digit-value	 . 6)
+    (numeric-value	 . 6)
+    (ucs		. #x0D6C)	; ൬
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT SEVEN")
-    (ucs		. #x0D6D)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 7)
-    (digit-value	. 7)
-    (numeric-value	. 7)
     (mirrored		. nil)
+    (decimal-digit-value . 7)
+    (digit-value	 . 7)
+    (numeric-value	 . 7)
+    (ucs		. #x0D6D)	; ൭
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT EIGHT")
-    (ucs		. #x0D6E)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 8)
-    (digit-value	. 8)
-    (numeric-value	. 8)
     (mirrored		. nil)
+    (decimal-digit-value . 8)
+    (digit-value	 . 8)
+    (numeric-value	 . 8)
+    (ucs		. #x0D6E)	; ൮
     ))
 (define-char
   '((name		. "MALAYALAM DIGIT NINE")
-    (ucs		. #x0D6F)
     (general-category	number decimal-digit) ; Normative Category
     (bidi-category	. "L")
-    (decimal-digit-value . 9)
-    (digit-value	. 9)
-    (numeric-value	. 9)
     (mirrored		. nil)
+    (decimal-digit-value . 9)
+    (digit-value	 . 9)
+    (numeric-value	 . 9)
+    (ucs		. #x0D6F)	; ൯
     ))
diff --git a/lisp/utf-2000/u00D80-Sinhala.el b/lisp/utf-2000/u00D80-Sinhala.el
index 55e6494..895cc32 100644
--- a/lisp/utf-2000/u00D80-Sinhala.el
+++ b/lisp/utf-2000/u00D80-Sinhala.el
@@ -1,564 +1,564 @@
 (define-char
   '((name		. "SINHALA SIGN ANUSVARAYA")
-    (ucs		. #x0D82)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D82)	; ං
     ))
 (define-char
   '((name		. "SINHALA SIGN VISARGAYA")
-    (ucs		. #x0D83)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D83)	; ඃ
     ))
 (define-char
   '((name		. "SINHALA LETTER AYANNA")
-    (ucs		. #x0D85)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D85)	; අ
     ))
 (define-char
   '((name		. "SINHALA LETTER AAYANNA")
-    (ucs		. #x0D86)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D86)	; ආ
     ))
 (define-char
   '((name		. "SINHALA LETTER AEYANNA")
-    (ucs		. #x0D87)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D87)	; ඇ
     ))
 (define-char
   '((name		. "SINHALA LETTER AEEYANNA")
-    (ucs		. #x0D88)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D88)	; ඈ
     ))
 (define-char
   '((name		. "SINHALA LETTER IYANNA")
-    (ucs		. #x0D89)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D89)	; ඉ
     ))
 (define-char
   '((name		. "SINHALA LETTER IIYANNA")
-    (ucs		. #x0D8A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D8A)	; ඊ
     ))
 (define-char
   '((name		. "SINHALA LETTER UYANNA")
-    (ucs		. #x0D8B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D8B)	; උ
     ))
 (define-char
   '((name		. "SINHALA LETTER UUYANNA")
-    (ucs		. #x0D8C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D8C)	; ඌ
     ))
 (define-char
   '((name		. "SINHALA LETTER IRUYANNA")
-    (ucs		. #x0D8D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D8D)	; ඍ
     ))
 (define-char
   '((name		. "SINHALA LETTER IRUUYANNA")
-    (ucs		. #x0D8E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D8E)	; ඎ
     ))
 (define-char
   '((name		. "SINHALA LETTER ILUYANNA")
-    (ucs		. #x0D8F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D8F)	; ඏ
     ))
 (define-char
   '((name		. "SINHALA LETTER ILUUYANNA")
-    (ucs		. #x0D90)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D90)	; ඐ
     ))
 (define-char
   '((name		. "SINHALA LETTER EYANNA")
-    (ucs		. #x0D91)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D91)	; එ
     ))
 (define-char
   '((name		. "SINHALA LETTER EEYANNA")
-    (ucs		. #x0D92)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D92)	; ඒ
     ))
 (define-char
   '((name		. "SINHALA LETTER AIYANNA")
-    (ucs		. #x0D93)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D93)	; ඓ
     ))
 (define-char
   '((name		. "SINHALA LETTER OYANNA")
-    (ucs		. #x0D94)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D94)	; ඔ
     ))
 (define-char
   '((name		. "SINHALA LETTER OOYANNA")
-    (ucs		. #x0D95)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D95)	; ඕ
     ))
 (define-char
   '((name		. "SINHALA LETTER AUYANNA")
-    (ucs		. #x0D96)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D96)	; ඖ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA KAYANNA")
-    (ucs		. #x0D9A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D9A)	; ක
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA KAYANNA")
-    (ucs		. #x0D9B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D9B)	; ඛ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA GAYANNA")
-    (ucs		. #x0D9C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D9C)	; ග
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA GAYANNA")
-    (ucs		. #x0D9D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D9D)	; ඝ
     ))
 (define-char
   '((name		. "SINHALA LETTER KANTAJA NAASIKYAYA")
-    (ucs		. #x0D9E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D9E)	; ඞ
     ))
 (define-char
   '((name		. "SINHALA LETTER SANYAKA GAYANNA")
-    (ucs		. #x0D9F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0D9F)	; ඟ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA CAYANNA")
-    (ucs		. #x0DA0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA0)	; ච
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA CAYANNA")
-    (ucs		. #x0DA1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA1)	; ඡ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA JAYANNA")
-    (ucs		. #x0DA2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA2)	; ජ
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA JAYANNA")
-    (ucs		. #x0DA3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA3)	; ඣ
     ))
 (define-char
   '((name		. "SINHALA LETTER TAALUJA NAASIKYAYA")
-    (ucs		. #x0DA4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA4)	; ඤ
     ))
 (define-char
   '((name		. "SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA")
-    (ucs		. #x0DA5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA5)	; ඥ
     ))
 (define-char
   '((name		. "SINHALA LETTER SANYAKA JAYANNA")
-    (ucs		. #x0DA6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA6)	; ඦ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA TTAYANNA")
-    (ucs		. #x0DA7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA7)	; ට
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA TTAYANNA")
-    (ucs		. #x0DA8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA8)	; ඨ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA DDAYANNA")
-    (ucs		. #x0DA9)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DA9)	; ඩ
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA DDAYANNA")
-    (ucs		. #x0DAA)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DAA)	; ඪ
     ))
 (define-char
   '((name		. "SINHALA LETTER MUURDHAJA NAYANNA")
-    (ucs		. #x0DAB)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DAB)	; ණ
     ))
 (define-char
   '((name		. "SINHALA LETTER SANYAKA DDAYANNA")
-    (ucs		. #x0DAC)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DAC)	; ඬ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA TAYANNA")
-    (ucs		. #x0DAD)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DAD)	; ත
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA TAYANNA")
-    (ucs		. #x0DAE)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DAE)	; ථ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA DAYANNA")
-    (ucs		. #x0DAF)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DAF)	; ද
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA DAYANNA")
-    (ucs		. #x0DB0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB0)	; ධ
     ))
 (define-char
   '((name		. "SINHALA LETTER DANTAJA NAYANNA")
-    (ucs		. #x0DB1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB1)	; න
     ))
 (define-char
   '((name		. "SINHALA LETTER SANYAKA DAYANNA")
-    (ucs		. #x0DB3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB3)	; ඳ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA PAYANNA")
-    (ucs		. #x0DB4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB4)	; ප
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA PAYANNA")
-    (ucs		. #x0DB5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB5)	; ඵ
     ))
 (define-char
   '((name		. "SINHALA LETTER ALPAPRAANA BAYANNA")
-    (ucs		. #x0DB6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB6)	; බ
     ))
 (define-char
   '((name		. "SINHALA LETTER MAHAAPRAANA BAYANNA")
-    (ucs		. #x0DB7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB7)	; භ
     ))
 (define-char
   '((name		. "SINHALA LETTER MAYANNA")
-    (ucs		. #x0DB8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB8)	; ම
     ))
 (define-char
   '((name		. "SINHALA LETTER AMBA BAYANNA")
-    (ucs		. #x0DB9)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DB9)	; ඹ
     ))
 (define-char
   '((name		. "SINHALA LETTER YAYANNA")
-    (ucs		. #x0DBA)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DBA)	; ය
     ))
 (define-char
   '((name		. "SINHALA LETTER RAYANNA")
-    (ucs		. #x0DBB)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DBB)	; ර
     ))
 (define-char
   '((name		. "SINHALA LETTER DANTAJA LAYANNA")
-    (ucs		. #x0DBD)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DBD)	; ල
     ))
 (define-char
   '((name		. "SINHALA LETTER VAYANNA")
-    (ucs		. #x0DC0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC0)	; ව
     ))
 (define-char
   '((name		. "SINHALA LETTER TAALUJA SAYANNA")
-    (ucs		. #x0DC1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC1)	; ශ
     ))
 (define-char
   '((name		. "SINHALA LETTER MUURDHAJA SAYANNA")
-    (ucs		. #x0DC2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC2)	; ෂ
     ))
 (define-char
   '((name		. "SINHALA LETTER DANTAJA SAYANNA")
-    (ucs		. #x0DC3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC3)	; ස
     ))
 (define-char
   '((name		. "SINHALA LETTER HAYANNA")
-    (ucs		. #x0DC4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC4)	; හ
     ))
 (define-char
   '((name		. "SINHALA LETTER MUURDHAJA LAYANNA")
-    (ucs		. #x0DC5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC5)	; ළ
     ))
 (define-char
   '((name		. "SINHALA LETTER FAYANNA")
-    (ucs		. #x0DC6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DC6)	; ෆ
     ))
 (define-char
   '((name		. "SINHALA SIGN AL-LAKUNA")
-    (ucs		. #x0DCA)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0DCA)	; ්
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN AELA-PILLA")
-    (ucs		. #x0DCF)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DCF)	; ා
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KETTI AEDA-PILLA")
-    (ucs		. #x0DD0)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DD0)	; ැ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN DIGA AEDA-PILLA")
-    (ucs		. #x0DD1)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DD1)	; ෑ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KETTI IS-PILLA")
-    (ucs		. #x0DD2)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0DD2)	; ි
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN DIGA IS-PILLA")
-    (ucs		. #x0DD3)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0DD3)	; ී
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KETTI PAA-PILLA")
-    (ucs		. #x0DD4)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0DD4)	; ු
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN DIGA PAA-PILLA")
-    (ucs		. #x0DD6)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0DD6)	; ූ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN GAETTA-PILLA")
-    (ucs		. #x0DD8)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DD8)	; ෘ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KOMBUVA")
-    (ucs		. #x0DD9)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DD9)	; ෙ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN DIGA KOMBUVA")
-    (ucs		. #x0DDA)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0DD9 #x0DCA)
     (mirrored		. nil)
+    (->decomposition	#x0DD9 #x0DCA)
+    (ucs		. #x0DDA)	; ේ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KOMBU DEKA")
-    (ucs		. #x0DDB)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DDB)	; ෛ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA")
-    (ucs		. #x0DDC)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0DD9 #x0DCF)
     (mirrored		. nil)
+    (->decomposition	#x0DD9 #x0DCF)
+    (ucs		. #x0DDC)	; ො
     ))
 (define-char
-  '((name		. "SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA")
-    (ucs		. #x0DDD)
+  '((name . "SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA")
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0DDC #x0DCA)
     (mirrored		. nil)
+    (->decomposition	#x0DDC #x0DCA)
+    (ucs		. #x0DDD)	; ෝ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA")
-    (ucs		. #x0DDE)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
-    (->decomposition	#x0DD9 #x0DDF)
     (mirrored		. nil)
+    (->decomposition	#x0DD9 #x0DDF)
+    (ucs		. #x0DDE)	; ෞ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN GAYANUKITTA")
-    (ucs		. #x0DDF)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DDF)	; ෟ
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN DIGA GAETTA-PILLA")
-    (ucs		. #x0DF2)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DF2)	; à·²
     ))
 (define-char
   '((name		. "SINHALA VOWEL SIGN DIGA GAYANUKITTA")
-    (ucs		. #x0DF3)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DF3)	; à·³
     ))
 (define-char
   '((name		. "SINHALA PUNCTUATION KUNDDALIYA")
-    (ucs		. #x0DF4)
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0DF4)	; à·´
     ))