From: tomo <tomo>
Date: Sun, 10 Mar 2002 16:53:54 +0000 (+0000)
Subject: Reformatted.
X-Git-Tag: r21-2-44-lazy-n7c~20
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ba3f396b4c5d2c741855af5b2b78a41b1b0e590e;p=chise%2Fxemacs-chise.git.1

Reformatted.
---

diff --git a/lisp/utf-2000/u00080-C1.el b/lisp/utf-2000/u00080-C1.el
index 806e965..d28f319 100644
--- a/lisp/utf-2000/u00080-C1.el
+++ b/lisp/utf-2000/u00080-C1.el
@@ -1,192 +1,192 @@
 (define-char
-  '((ucs		. #x0080)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0080)	; €
     ))
 (define-char
-  '((ucs		. #x0081)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0081)	; 
     ))
 (define-char
-  '((ucs		. #x0082)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0082)	; ‚
     ))
 (define-char
-  '((ucs		. #x0083)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0083)	; ƒ
     ))
 (define-char
-  '((ucs		. #x0084)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0084)	; „
     ))
 (define-char
-  '((ucs		. #x0085)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "B")
     (mirrored		. nil)
+    (ucs		. #x0085)	; …
     ))
 (define-char
-  '((ucs		. #x0086)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0086)	; †
     ))
 (define-char
-  '((ucs		. #x0087)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0087)	; ‡
     ))
 (define-char
-  '((ucs		. #x0088)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0088)	; ˆ
     ))
 (define-char
-  '((ucs		. #x0089)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0089)	; ‰
     ))
 (define-char
-  '((ucs		. #x008A)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x008A)	; Š
     ))
 (define-char
-  '((ucs		. #x008B)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x008B)	; ‹
     ))
 (define-char
-  '((ucs		. #x008C)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x008C)	; Œ
     ))
 (define-char
-  '((ucs		. #x008D)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x008D)	; 
     ))
 (define-char
-  '((ucs		. #x008E)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x008E)	; Ž
     ))
 (define-char
-  '((ucs		. #x008F)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x008F)	; 
     ))
 (define-char
-  '((ucs		. #x0090)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0090)	; 
     ))
 (define-char
-  '((ucs		. #x0091)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0091)	; ‘
     ))
 (define-char
-  '((ucs		. #x0092)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0092)	; ’
     ))
 (define-char
-  '((ucs		. #x0093)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0093)	; “
     ))
 (define-char
-  '((ucs		. #x0094)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0094)	; ”
     ))
 (define-char
-  '((ucs		. #x0095)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0095)	; •
     ))
 (define-char
-  '((ucs		. #x0096)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0096)	; –
     ))
 (define-char
-  '((ucs		. #x0097)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0097)	; —
     ))
 (define-char
-  '((ucs		. #x0098)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0098)	; ˜
     ))
 (define-char
-  '((ucs		. #x0099)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x0099)	; ™
     ))
 (define-char
-  '((ucs		. #x009A)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x009A)	; š
     ))
 (define-char
-  '((ucs		. #x009B)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x009B)	; ›
     ))
 (define-char
-  '((ucs		. #x009C)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x009C)	; œ
     ))
 (define-char
-  '((ucs		. #x009D)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x009D)	; 
     ))
 (define-char
-  '((ucs		. #x009E)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x009E)	; ž
     ))
 (define-char
-  '((ucs		. #x009F)
-    (general-category	other control) ; Normative Category
+  '((general-category	other control) ; Normative Category
     (bidi-category	. "BN")
     (mirrored		. nil)
+    (ucs		. #x009F)	; Ÿ
     ))
diff --git a/lisp/utf-2000/u000A0-Latin-1-Supplement.el b/lisp/utf-2000/u000A0-Latin-1-Supplement.el
index 0cf54f5..7e14137 100755
--- a/lisp/utf-2000/u000A0-Latin-1-Supplement.el
+++ b/lisp/utf-2000/u000A0-Latin-1-Supplement.el
@@ -932,7 +932,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0300)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with grave")
+     ((name . "fullwidth latin capital letter a with grave")
       (japanese-jisx0212	  . #x2A22)	; ø»Š±Ÿ
       (japanese-jisx0213-1	  . #x2937)	; ø»¢Ÿ‚
       ))
@@ -940,12 +940,12 @@
      ((name		  . "LATIN SMALL LETTER A WITH GRAVE")
       (ucs		  . #x00E0)	; à
       ))
-    (latin-iso8859-1		. #xC0)	; øº’´ 
-    (latin-iso8859-3		. #xC0)	; øº’· 
-    (latin-iso8859-9		. #xC0)	; øº“† 
-    (latin-viscii-upper		. #xE0)	; øº’ž 
-    (latin-viscii		. #xC0)	; øº’ž 
-    (ucs			. #x00C0)	; À
+    (latin-iso8859-1	. #xC0)	; øº’´ 
+    (latin-iso8859-3	. #xC0)	; øº’· 
+    (latin-iso8859-9	. #xC0)	; øº“† 
+    (latin-viscii-upper . #xE0)	; øº’ž 
+    (latin-viscii	. #xC0)	; øº’ž 
+    (ucs		. #x00C0)	; À
     ))
 (define-char
   '((name		. "fullwidth latin capital letter a with grave")
@@ -954,7 +954,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter a with grave")))
+     ((name		  . "fullwidth latin small letter a with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH GRAVE")
       (ucs		  . #x00C0)	; À
@@ -969,7 +970,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with acute")
+     ((name . "fullwidth latin capital letter a with acute")
       (japanese-jisx0212	  . #x2A21)	; ø»Š±ž
       (japanese-jisx0213-1	  . #x2938)	; ø»¢Ÿƒ
       ))
@@ -977,14 +978,14 @@
      ((name		  . "LATIN SMALL LETTER A WITH ACUTE")
       (ucs		  . #x00E1)	; á
       ))
-    (latin-iso8859-1		. #xC1)	; øº’´¡
-    (latin-iso8859-2		. #xC1)	; øº’¶
-    (latin-iso8859-3		. #xC1)	; øº’·¡
-    (latin-iso8859-4		. #xC1)	; øº’¹
-    (latin-iso8859-9		. #xC1)	; øº“†¡
-    (latin-viscii-upper		. #xE1)	; øº’ž¡
-    (latin-viscii		. #xC1)	; øº’ž¡
-    (ucs			. #x00C1)	; Á
+    (latin-iso8859-1	. #xC1)	; øº’´¡
+    (latin-iso8859-2	. #xC1)	; øº’¶
+    (latin-iso8859-3	. #xC1)	; øº’·¡
+    (latin-iso8859-4	. #xC1)	; øº’¹
+    (latin-iso8859-9	. #xC1)	; øº“†¡
+    (latin-viscii-upper . #xE1)	; øº’ž¡
+    (latin-viscii	. #xC1)	; øº’ž¡
+    (ucs		. #x00C1)	; Á
     ))
 (define-char
   '((name		. "fullwidth latin capital letter a with acute")
@@ -993,7 +994,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter a with acute")))
+     ((name		  . "fullwidth latin small letter a with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH ACUTE")
       (ucs		  . #x00C1)	; Á
@@ -1016,15 +1018,15 @@
      ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
       (ucs		  . #x00E2)	; â
       ))
-    (latin-iso8859-1		. #xC2)	; øº’´¢
-    (latin-iso8859-2		. #xC2)	; øº’¶‚
-    (latin-iso8859-3		. #xC2)	; øº’·¢
-    (latin-iso8859-4		. #xC2)	; øº’¹‚
-    (latin-iso8859-9		. #xC2)	; øº“†¢
-    (latin-tcvn5712		. #xA2)	; øº“™¢
-    (latin-viscii-upper		. #xE2)	; øº’ž¢
-    (latin-viscii		. #xC2)	; øº’ž¢
-    (ucs			. #x00C2)	; Â
+    (latin-iso8859-1	. #xC2)	; øº’´¢
+    (latin-iso8859-2	. #xC2)	; øº’¶‚
+    (latin-iso8859-3	. #xC2)	; øº’·¢
+    (latin-iso8859-4	. #xC2)	; øº’¹‚
+    (latin-iso8859-9	. #xC2)	; øº“†¢
+    (latin-tcvn5712	. #xA2)	; øº“™¢
+    (latin-viscii-upper . #xE2)	; øº’ž¢
+    (latin-viscii	. #xC2)	; øº’ž¢
+    (ucs		. #x00C2)	; Â
     ))
 (define-char
   '((name . "fullwidth latin capital letter a with circumflex")
@@ -1033,7 +1035,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter a with circumflex")))
+     ((name . "fullwidth latin small letter a with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
       (ucs		  . #x00C2)	; Â
@@ -1048,7 +1051,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0303)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with tilde")
+     ((name . "fullwidth latin capital letter a with tilde")
       (japanese-jisx0212	  . #x2A2A)	; ø»Š±§
       (japanese-jisx0213-1	  . #x293A)	; ø»¢Ÿ…
       ))
@@ -1056,12 +1059,12 @@
      ((name		  . "LATIN SMALL LETTER A WITH TILDE")
       (ucs		  . #x00E3)	; ã
       ))
-    (latin-iso8859-1		. #xC3)	; øº’´£
-    (latin-iso8859-4		. #xC3)	; øº’¹ƒ
-    (latin-iso8859-9		. #xC3)	; øº“†£
-    (latin-viscii-upper		. #xE3)	; øº’ž£
-    (latin-viscii		. #xC3)	; øº’ž£
-    (ucs			. #x00C3)	; Ã
+    (latin-iso8859-1	. #xC3)	; øº’´£
+    (latin-iso8859-4	. #xC3)	; øº’¹ƒ
+    (latin-iso8859-9	. #xC3)	; øº“†£
+    (latin-viscii-upper . #xE3)	; øº’ž£
+    (latin-viscii	. #xC3)	; øº’ž£
+    (ucs		. #x00C3)	; Ã
     ))
 (define-char
   '((name		. "fullwidth latin capital letter a with tilde")
@@ -1070,7 +1073,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter a with tilde")))
+     ((name		  . "fullwidth latin small letter a with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH TILDE")
       (ucs		  . #x00C3)	; Ã
@@ -1085,7 +1089,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with diaeresis")
+     ((name . "fullwidth latin capital letter a with diaeresis")
       (japanese-jisx0212	  . #x2A23)	; ø»Š± 
       (japanese-jisx0213-1	  . #x293B)	; ø»¢Ÿ†
       ))
@@ -1101,13 +1105,14 @@
     (ucs		. #x00C4)	; Ä
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter a with diaeresis")
+  '((name . "fullwidth latin capital letter a with diaeresis")
     (=>ucs		. #x00C4)	; Ä
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter a with diaeresis")))
+     ((name . "fullwidth latin small letter a with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH DIAERESIS")
       (ucs		  . #x00C4)	; Ä
@@ -1142,7 +1147,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter a with ring above")))
+     ((name . "fullwidth latin small letter a with ring above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH RING ABOVE")
       (ucs		  . #x00C5)	; Å
@@ -1172,7 +1178,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter ae")))
+     ((name		  . "fullwidth latin small letter ae")
+      ))
     (korean-ksc5601		. #x2821)	; ø»ˆ¤ž
     (japanese-jisx0212		. #x2921)	; ø»Š°€
     (japanese-jisx0213-1	. #x293D)	; ø»¢Ÿˆ
@@ -1184,7 +1191,7 @@
     (mirrored		. nil)
     (->decomposition	#x0043 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter c with cedilla")
+     ((name . "fullwidth latin capital letter c with cedilla")
       (japanese-jisx0212	  . #x2A2E)	; ø»Š±«
       (japanese-jisx0213-1	  . #x293E)	; ø»¢Ÿ‰
       ))
@@ -1199,13 +1206,14 @@
     (ucs		. #x00C7)	; Ç
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter c with cedilla")
+  '((name . "fullwidth latin capital letter c with cedilla")
     (=>ucs		. #x00C7)	; Ç
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter c with cedilla")))
+     ((name . "fullwidth latin small letter c with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER C WITH CEDILLA")
       (ucs		  . #x00C7)	; Ç
@@ -1220,7 +1228,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x0300)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter e with grave")
+     ((name . "fullwidth latin capital letter e with grave")
       (japanese-jisx0212	  . #x2A32)	; ø»Š±¯
       (japanese-jisx0213-1	  . #x293F)	; ø»¢ŸŠ
       ))
@@ -1228,12 +1236,12 @@
      ((name		  . "LATIN SMALL LETTER E WITH GRAVE")
       (ucs		  . #x00E8)	; è
       ))
-    (latin-iso8859-1		. #xC8)	; øº’´¨
-    (latin-iso8859-3		. #xC8)	; øº’·¨
-    (latin-iso8859-9		. #xC8)	; øº“†¨
-    (latin-viscii-upper		. #xE8)	; øº’ž¨
-    (latin-viscii		. #xC8)	; øº’ž¨
-    (ucs			. #x00C8)	; È
+    (latin-iso8859-1	. #xC8)	; øº’´¨
+    (latin-iso8859-3	. #xC8)	; øº’·¨
+    (latin-iso8859-9	. #xC8)	; øº“†¨
+    (latin-viscii-upper . #xE8)	; øº’ž¨
+    (latin-viscii	. #xC8)	; øº’ž¨
+    (ucs		. #x00C8)	; È
     ))
 (define-char
   '((name		. "fullwidth latin capital letter e with grave")
@@ -1242,7 +1250,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter e with grave")))
+     ((name		  . "fullwidth latin small letter e with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH GRAVE")
       (ucs		  . #x00C8)	; È
@@ -1257,7 +1266,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter e with acute")
+     ((name . "fullwidth latin capital letter e with acute")
       (japanese-jisx0212	  . #x2A31)	; ø»Š±®
       (japanese-jisx0213-1	  . #x2940)	; ø»¢Ÿ‹
       ))
@@ -1265,14 +1274,14 @@
      ((name		  . "LATIN SMALL LETTER E WITH ACUTE")
       (ucs		  . #x00E9)	; é
       ))
-    (latin-iso8859-1		. #xC9)	; øº’´©
-    (latin-iso8859-2		. #xC9)	; øº’¶‰
-    (latin-iso8859-3		. #xC9)	; øº’·©
-    (latin-iso8859-4		. #xC9)	; øº’¹‰
-    (latin-iso8859-9		. #xC9)	; øº“†©
-    (latin-viscii-upper		. #xE9)	; øº’ž©
-    (latin-viscii		. #xC9)	; øº’ž©
-    (ucs			. #x00C9)	; É
+    (latin-iso8859-1	. #xC9)	; øº’´©
+    (latin-iso8859-2	. #xC9)	; øº’¶‰
+    (latin-iso8859-3	. #xC9)	; øº’·©
+    (latin-iso8859-4	. #xC9)	; øº’¹‰
+    (latin-iso8859-9	. #xC9)	; øº“†©
+    (latin-viscii-upper . #xE9)	; øº’ž©
+    (latin-viscii	. #xC9)	; øº’ž©
+    (ucs		. #x00C9)	; É
     ))
 (define-char
   '((name		. "fullwidth latin capital letter e with acute")
@@ -1281,7 +1290,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter e with acute")))
+     ((name		  . "fullwidth latin small letter e with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH ACUTE")
       (ucs		  . #x00C9)	; É
@@ -1304,13 +1314,13 @@
      ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
       (ucs		  . #x00EA)	; ê
       ))
-    (latin-iso8859-1		. #xCA)	; øº’´ª
-    (latin-iso8859-3		. #xCA)	; øº’·ª
-    (latin-iso8859-9		. #xCA)	; øº“†ª
-    (latin-tcvn5712		. #xA3)	; øº“™£
-    (latin-viscii-upper		. #xEA)	; øº’žª
-    (latin-viscii		. #xCA)	; øº’žª
-    (ucs			. #x00CA)	; Ê
+    (latin-iso8859-1	. #xCA)	; øº’´ª
+    (latin-iso8859-3	. #xCA)	; øº’·ª
+    (latin-iso8859-9	. #xCA)	; øº“†ª
+    (latin-tcvn5712	. #xA3)	; øº“™£
+    (latin-viscii-upper . #xEA)	; øº’žª
+    (latin-viscii	. #xCA)	; øº’žª
+    (ucs		. #x00CA)	; Ê
     ))
 (define-char
   '((name . "fullwidth latin capital letter e with circumflex")
@@ -1319,7 +1329,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter e with circumflex")))
+     ((name . "fullwidth latin small letter e with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
       (ucs		  . #x00CA)	; Ê
@@ -1334,7 +1345,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter e with diaeresis")
+     ((name . "fullwidth latin capital letter e with diaeresis")
       (japanese-jisx0212	  . #x2A33)	; ø»Š±°
       (japanese-jisx0213-1	  . #x2942)	; ø»¢Ÿ
       ))
@@ -1350,13 +1361,14 @@
     (ucs		. #x00CB)	; Ë
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter e with diaeresis")
+  '((name . "fullwidth latin capital letter e with diaeresis")
     (=>ucs		. #x00CB)	; Ë
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter e with diaeresis")))
+     ((name . "fullwidth latin small letter e with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH DIAERESIS")
       (ucs		  . #x00CB)	; Ë
@@ -1371,7 +1383,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0300)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with grave")
+     ((name . "fullwidth latin capital letter i with grave")
       (japanese-jisx0212	  . #x2A40)	; ø»Š±½
       (japanese-jisx0213-1	  . #x2943)	; ø»¢ŸŽ
       ))
@@ -1379,12 +1391,12 @@
      ((name		  . "LATIN SMALL LETTER I WITH GRAVE")
       (ucs		  . #x00EC)	; ì
       ))
-    (latin-iso8859-1		. #xCC)	; øº’´¬
-    (latin-iso8859-3		. #xCC)	; øº’·¬
-    (latin-iso8859-9		. #xCC)	; øº“†¬
-    (latin-viscii-upper		. #xEC)	; øº’ž¬
-    (latin-viscii		. #xCC)	; øº’ž¬
-    (ucs			. #x00CC)	; Ì
+    (latin-iso8859-1	. #xCC)	; øº’´¬
+    (latin-iso8859-3	. #xCC)	; øº’·¬
+    (latin-iso8859-9	. #xCC)	; øº“†¬
+    (latin-viscii-upper . #xEC)	; øº’ž¬
+    (latin-viscii	. #xCC)	; øº’ž¬
+    (ucs		. #x00CC)	; Ì
     ))
 (define-char
   '((name		. "fullwidth latin capital letter i with grave")
@@ -1393,7 +1405,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter i with grave")))
+     ((name		  . "fullwidth latin small letter i with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH GRAVE")
       (ucs		  . #x00CC)	; Ì
@@ -1408,7 +1421,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with acute")
+     ((name . "fullwidth latin capital letter i with acute")
       (japanese-jisx0212	  . #x2A3F)	; ø»Š±¼
       (japanese-jisx0213-1	  . #x2944)	; ø»¢Ÿ
       ))
@@ -1416,14 +1429,14 @@
      ((name		  . "LATIN SMALL LETTER I WITH ACUTE")
       (ucs		  . #x00ED)	; í
       ))
-    (latin-iso8859-1		. #xCD)	; øº’´­
-    (latin-iso8859-2		. #xCD)	; øº’¶
-    (latin-iso8859-3		. #xCD)	; øº’·­
-    (latin-iso8859-4		. #xCD)	; øº’¹
-    (latin-iso8859-9		. #xCD)	; øº“†­
-    (latin-viscii-upper		. #xED)	; øº’ž­
-    (latin-viscii		. #xCD)	; øº’ž­
-    (ucs			. #x00CD)	; Í
+    (latin-iso8859-1	. #xCD)	; øº’´­
+    (latin-iso8859-2	. #xCD)	; øº’¶
+    (latin-iso8859-3	. #xCD)	; øº’·­
+    (latin-iso8859-4	. #xCD)	; øº’¹
+    (latin-iso8859-9	. #xCD)	; øº“†­
+    (latin-viscii-upper . #xED)	; øº’ž­
+    (latin-viscii	. #xCD)	; øº’ž­
+    (ucs		. #x00CD)	; Í
     ))
 (define-char
   '((name		. "fullwidth latin capital letter i with acute")
@@ -1432,7 +1445,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter i with acute")))
+     ((name		  . "fullwidth latin small letter i with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH ACUTE")
       (ucs		  . #x00CD)	; Í
@@ -1469,7 +1483,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter i with circumflex")))
+     ((name . "fullwidth latin small letter i with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH CIRCUMFLEX")
       (ucs		  . #x00CE)	; Î
@@ -1484,7 +1499,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with diaeresis")
+     ((name . "fullwidth latin capital letter i with diaeresis")
       (japanese-jisx0212	  . #x2A41)	; ø»Š±¾
       (japanese-jisx0213-1	  . #x2946)	; ø»¢Ÿ‘
       ))
@@ -1498,13 +1513,14 @@
     (ucs		. #x00CF)	; Ï
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter i with diaeresis")
+  '((name . "fullwidth latin capital letter i with diaeresis")
     (=>ucs		. #x00CF)	; Ï
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter i with diaeresis")))
+     ((name . "fullwidth latin small letter i with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH DIAERESIS")
       (ucs		  . #x00CF)	; Ï
@@ -1538,7 +1554,8 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Icelandic")
     (->lowercase
-     ((name . "fullwidth latin small letter eth")))
+     ((name		  . "fullwidth latin small letter eth")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER ETH")
       (ucs		  . #x00D0)	; Ð
@@ -1553,7 +1570,7 @@
     (mirrored		. nil)
     (->decomposition	#x004E #x0303)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter n with tilde")
+     ((name . "fullwidth latin capital letter n with tilde")
       (japanese-jisx0212	  . #x2A50)	; ø»Š²
       (japanese-jisx0213-1	  . #x2948)	; ø»¢Ÿ“
       ))
@@ -1573,7 +1590,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter n with tilde")))
+     ((name		  . "fullwidth latin small letter n with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER N WITH TILDE")
       (ucs		  . #x00D1)	; Ñ
@@ -1588,7 +1606,7 @@
     (mirrored		. nil)
     (->decomposition	#x004F #x0300)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter o with grave")
+     ((name . "fullwidth latin capital letter o with grave")
       (japanese-jisx0212	  . #x2A52)	; ø»Š²
       (japanese-jisx0213-1	  . #x2949)	; ø»¢Ÿ”
       ))
@@ -1596,12 +1614,12 @@
      ((name		  . "LATIN SMALL LETTER O WITH GRAVE")
       (ucs		  . #x00F2)	; ò
       ))
-    (latin-iso8859-1		. #xD2)	; øº’´²
-    (latin-iso8859-3		. #xD2)	; øº’·²
-    (latin-iso8859-9		. #xD2)	; øº“†²
-    (latin-viscii-upper		. #xF2)	; øº’ž²
-    (latin-viscii		. #xD2)	; øº’ž²
-    (ucs			. #x00D2)	; Ò
+    (latin-iso8859-1	. #xD2)	; øº’´²
+    (latin-iso8859-3	. #xD2)	; øº’·²
+    (latin-iso8859-9	. #xD2)	; øº“†²
+    (latin-viscii-upper . #xF2)	; øº’ž²
+    (latin-viscii	. #xD2)	; øº’ž²
+    (ucs		. #x00D2)	; Ò
     ))
 (define-char
   '((name		. "fullwidth latin capital letter o with grave")
@@ -1610,7 +1628,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter o with grave")))
+     ((name		  . "fullwidth latin small letter o with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH GRAVE")
       (ucs		  . #x00D2)	; Ò
@@ -1625,7 +1644,7 @@
     (mirrored		. nil)
     (->decomposition	#x004F #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter o with acute")
+     ((name . "fullwidth latin capital letter o with acute")
       (japanese-jisx0212	  . #x2A51)	; ø»Š²Ž
       (japanese-jisx0213-1	  . #x294A)	; ø»¢Ÿ•
       ))
@@ -1633,13 +1652,13 @@
      ((name		  . "LATIN SMALL LETTER O WITH ACUTE")
       (ucs		  . #x00F3)	; ó
       ))
-    (latin-iso8859-1		. #xD3)	; øº’´³
-    (latin-iso8859-2		. #xD3)	; øº’¶“
-    (latin-iso8859-3		. #xD3)	; øº’·³
-    (latin-iso8859-9		. #xD3)	; øº“†³
-    (latin-viscii-upper		. #xF3)	; øº’ž³
-    (latin-viscii		. #xD3)	; øº’ž³
-    (ucs			. #x00D3)	; Ó
+    (latin-iso8859-1	. #xD3)	; øº’´³
+    (latin-iso8859-2	. #xD3)	; øº’¶“
+    (latin-iso8859-3	. #xD3)	; øº’·³
+    (latin-iso8859-9	. #xD3)	; øº“†³
+    (latin-viscii-upper . #xF3)	; øº’ž³
+    (latin-viscii	. #xD3)	; øº’ž³
+    (ucs		. #x00D3)	; Ó
     ))
 (define-char
   '((name		. "fullwidth latin capital letter o with acute")
@@ -1648,7 +1667,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter o with acute")))
+     ((name		  . "fullwidth latin small letter o with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH ACUTE")
       (ucs		  . #x00D3)	; Ó
@@ -1671,15 +1691,15 @@
      ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
       (ucs		  . #x00F4)	; ô
       ))
-    (latin-iso8859-1		. #xD4)	; øº’´´
-    (latin-iso8859-2		. #xD4)	; øº’¶”
-    (latin-iso8859-3		. #xD4)	; øº’·´
-    (latin-iso8859-4		. #xD4)	; øº’¹”
-    (latin-iso8859-9		. #xD4)	; øº“†´
-    (latin-tcvn5712		. #xA4)	; øº“™¤
-    (latin-viscii-upper		. #xF4)	; øº’ž´
-    (latin-viscii		. #xD4)	; øº’ž´
-    (ucs			. #x00D4)	; Ô
+    (latin-iso8859-1	. #xD4)	; øº’´´
+    (latin-iso8859-2	. #xD4)	; øº’¶”
+    (latin-iso8859-3	. #xD4)	; øº’·´
+    (latin-iso8859-4	. #xD4)	; øº’¹”
+    (latin-iso8859-9	. #xD4)	; øº“†´
+    (latin-tcvn5712	. #xA4)	; øº“™¤
+    (latin-viscii-upper . #xF4)	; øº’ž´
+    (latin-viscii	. #xD4)	; øº’ž´
+    (ucs		. #x00D4)	; Ô
     ))
 (define-char
   '((name . "fullwidth latin capital letter o with circumflex")
@@ -1688,7 +1708,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter o with circumflex")))
+     ((name . "fullwidth latin small letter o with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
       (ucs		  . #x00D4)	; Ô
@@ -1703,7 +1724,7 @@
     (mirrored		. nil)
     (->decomposition	#x004F #x0303)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter o with tilde")
+     ((name . "fullwidth latin capital letter o with tilde")
       (japanese-jisx0212	  . #x2A58)	; ø»Š²•
       (japanese-jisx0213-1	  . #x294C)	; ø»¢Ÿ—
       ))
@@ -1711,12 +1732,12 @@
      ((name		  . "LATIN SMALL LETTER O WITH TILDE")
       (ucs		  . #x00F5)	; õ
       ))
-    (latin-iso8859-1		. #xD5)	; øº’´µ
-    (latin-iso8859-4		. #xD5)	; øº’¹•
-    (latin-iso8859-9		. #xD5)	; øº“†µ
-    (latin-viscii-upper		. #xF5)	; øº’žµ
-    (latin-viscii		. #xA0)	; øº’žµ
-    (ucs			. #x00D5)	; Õ
+    (latin-iso8859-1	. #xD5)	; øº’´µ
+    (latin-iso8859-4	. #xD5)	; øº’¹•
+    (latin-iso8859-9	. #xD5)	; øº“†µ
+    (latin-viscii-upper . #xF5)	; øº’žµ
+    (latin-viscii	. #xA0)	; øº’žµ
+    (ucs		. #x00D5)	; Õ
     ))
 (define-char
   '((name		. "fullwidth latin capital letter o with tilde")
@@ -1725,7 +1746,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin capital letter o with tilde")))
+     ((name . "fullwidth latin capital letter o with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
       (ucs		  . #x00D5)	; Õ
@@ -1740,7 +1762,7 @@
     (mirrored		. nil)
     (->decomposition	#x004F #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter o with diaeresis")
+     ((name . "fullwidth latin capital letter o with diaeresis")
       (japanese-jisx0212	  . #x2A53)	; ø»Š²
       (japanese-jisx0213-1	  . #x294D)	; ø»¢Ÿ˜
       ))
@@ -1756,13 +1778,14 @@
     (ucs		. #x00D6)	; Ö
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter o with diaeresis")
+  '((name . "fullwidth latin capital letter o with diaeresis")
     (=>ucs		. #x00D6)	; Ö
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin capital letter o with diaeresis")))
+     ((name . "fullwidth latin capital letter o with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH DIAERESIS")
       (ucs		  . #x00D6)	; Ö
@@ -1830,7 +1853,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter o with stroke")))
+     ((name		  . "fullwidth latin small letter o with stroke")
+      ))
     (korean-ksc5601		. #x282A)	; ø»ˆ¤§
     (japanese-jisx0212		. #x292C)	; ø»Š°‹
     (japanese-jisx0213-1	. #x294E)	; ø»¢Ÿ™
@@ -1845,12 +1869,12 @@
      ((name		  . "LATIN SMALL LETTER U WITH GRAVE")
       (ucs		  . #x00F9)	; ù
       ))
-    (latin-iso8859-1		. #xD9)	; øº’´¹
-    (latin-iso8859-3		. #xD9)	; øº’·¹
-    (latin-iso8859-9		. #xD9)	; øº“†¹
-    (latin-viscii-upper		. #xF9)	; øº’ž¹
-    (latin-viscii		. #xD9)	; øº’ž¹
-    (ucs			. #x00D9)	; Ù
+    (latin-iso8859-1	. #xD9)	; øº’´¹
+    (latin-iso8859-3	. #xD9)	; øº’·¹
+    (latin-iso8859-9	. #xD9)	; øº“†¹
+    (latin-viscii-upper . #xF9)	; øº’ž¹
+    (latin-viscii	. #xD9)	; øº’ž¹
+    (ucs		. #x00D9)	; Ù
     ))
 (define-char
   '((name		. "fullwidth latin capital letter u with grave")
@@ -1860,7 +1884,8 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0300)
     (->lowercase
-     ((name . "fullwidth latin small letter u with grave")))
+     ((name		  . "fullwidth latin small letter u with grave")
+      ))
     (japanese-jisx0212		. #x2A63)	; ø»Š² 
     (japanese-jisx0213-1	. #x294F)	; ø»¢Ÿš
     ))
@@ -1871,7 +1896,7 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with acute")
+     ((name . "fullwidth latin capital letter u with acute")
       (japanese-jisx0212	  . #x2A62)	; ø»Š²Ÿ
       (japanese-jisx0213-1	  . #x2950)	; ø»¢Ÿ›
       ))
@@ -1879,14 +1904,14 @@
      ((name		  . "LATIN SMALL LETTER U WITH ACUTE")
       (ucs		  . #x00FA)	; ú
       ))
-    (latin-iso8859-1		. #xDA)	; øº’´º
-    (latin-iso8859-2		. #xDA)	; øº’¶š
-    (latin-iso8859-3		. #xDA)	; øº’·º
-    (latin-iso8859-4		. #xDA)	; øº’¹š
-    (latin-iso8859-9		. #xDA)	; øº“†º
-    (latin-viscii-upper		. #xFA)	; øº’žº
-    (latin-viscii		. #xDA)	; øº’žº
-    (ucs			. #x00DA)	; Ú
+    (latin-iso8859-1	. #xDA)	; øº’´º
+    (latin-iso8859-2	. #xDA)	; øº’¶š
+    (latin-iso8859-3	. #xDA)	; øº’·º
+    (latin-iso8859-4	. #xDA)	; øº’¹š
+    (latin-iso8859-9	. #xDA)	; øº“†º
+    (latin-viscii-upper . #xFA)	; øº’žº
+    (latin-viscii	. #xDA)	; øº’žº
+    (ucs		. #x00DA)	; Ú
     ))
 (define-char
   '((name		. "fullwidth latin capital letter u with acute")
@@ -1895,7 +1920,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter u with acute")))
+     ((name		  . "fullwidth latin small letter u with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH ACUTE")
       (ucs		  . #x00DA)	; Ú
@@ -1931,7 +1957,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter u with circumflex")))
+     ((name . "fullwidth latin small letter u with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH CIRCUMFLEX")
       (ucs		  . #x00DB)	; Û
@@ -1946,7 +1973,7 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with diaeresis")
+     ((name . "fullwidth latin capital letter u with diaeresis")
       (japanese-jisx0212	  . #x2A64)	; ø»Š²¡
       (japanese-jisx0213-1	  . #x2952)	; ø»¢Ÿ
       ))
@@ -1962,13 +1989,14 @@
     (ucs		. #x00DC)	; Ü
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter u with diaeresis")
+  '((name . "fullwidth latin capital letter u with diaeresis")
     (=>ucs		. #x00DC)	; Ü
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis")))
+     ((name . "fullwidth latin small letter u with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
       (ucs		  . #x00DC)	; Ü
@@ -1983,7 +2011,7 @@
     (mirrored		. nil)
     (->decomposition	#x0059 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter y with acute")
+     ((name . "fullwidth latin capital letter y with acute")
       (japanese-jisx0212	  . #x2A72)	; ø»Š²¯
       (japanese-jisx0213-1	  . #x2953)	; ø»¢Ÿž
       ))
@@ -1991,11 +2019,11 @@
      ((name		  . "LATIN SMALL LETTER Y WITH ACUTE")
       (ucs		  . #x00FD)	; ý
       ))
-    (latin-iso8859-1		. #xDD)	; øº’´½
-    (latin-iso8859-2		. #xDD)	; øº’¶
-    (latin-viscii-upper		. #xFD)	; øº’ž½
-    (latin-viscii		. #xDD)	; øº’ž½
-    (ucs			. #x00DD)	; Ý
+    (latin-iso8859-1	. #xDD)	; øº’´½
+    (latin-iso8859-2	. #xDD)	; øº’¶
+    (latin-viscii-upper . #xFD)	; øº’ž½
+    (latin-viscii	. #xDD)	; øº’ž½
+    (ucs		. #x00DD)	; Ý
     ))
 (define-char
   '((name		. "fullwidth latin capital letter y with acute")
@@ -2004,7 +2032,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name . "fullwidth latin small letter y with acute")))
+     ((name		  . "fullwidth latin small letter y with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER Y WITH ACUTE")
       (ucs		  . #x00DD)	; Ý
@@ -2039,7 +2068,8 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Icelandic")
     (->lowercase
-     ((name . "fullwidth latin small letter thorn")))
+     ((name		  . "fullwidth latin small letter thorn")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER THORN")
       (ucs		  . #x00DE)	; Þ
@@ -2098,13 +2128,13 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH GRAVE")
       (ucs		  . #x00C0)	; À
       ))
-    (latin-iso8859-1		. #xE0)	; øº’µ€
-    (latin-iso8859-3		. #xE0)	; øº’¸€
-    (latin-iso8859-9		. #xE0)	; øº“‡€
-    (latin-tcvn5712		. #xB5)	; øº“™µ
-    (latin-viscii-lower		. #xE0)	; øº’€
-    (latin-viscii		. #xE0)	; øº’€
-    (ucs			. #x00E0)	; à
+    (latin-iso8859-1	. #xE0)	; øº’µ€
+    (latin-iso8859-3	. #xE0)	; øº’¸€
+    (latin-iso8859-9	. #xE0)	; øº“‡€
+    (latin-tcvn5712	. #xB5)	; øº“™µ
+    (latin-viscii-lower . #xE0)	; øº’€
+    (latin-viscii	. #xE0)	; øº’€
+    (ucs		. #x00E0)	; à
     ))
 (define-char
   '((name		. "fullwidth latin small letter a with grave")
@@ -2113,7 +2143,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with grave")))
+     ((name . "fullwidth latin capital letter a with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH GRAVE")
       (ucs		  . #x00E0)	; à
@@ -2138,15 +2169,15 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH ACUTE")
       (ucs		  . #x00C1)	; Á
       ))
-    (latin-iso8859-1		. #xE1)	; øº’µ
-    (latin-iso8859-2		. #xE1)	; øº’¶¡
-    (latin-iso8859-3		. #xE1)	; øº’¸
-    (latin-iso8859-4		. #xE1)	; øº’¹¡
-    (latin-iso8859-9		. #xE1)	; øº“‡
-    (latin-tcvn5712		. #xB8)	; øº“™¸
-    (latin-viscii-lower		. #xE1)	; øº’
-    (latin-viscii		. #xE1)	; øº’
-    (ucs			. #x00E1)	; á
+    (latin-iso8859-1	. #xE1)	; øº’µ
+    (latin-iso8859-2	. #xE1)	; øº’¶¡
+    (latin-iso8859-3	. #xE1)	; øº’¸
+    (latin-iso8859-4	. #xE1)	; øº’¹¡
+    (latin-iso8859-9	. #xE1)	; øº“‡
+    (latin-tcvn5712	. #xB8)	; øº“™¸
+    (latin-viscii-lower . #xE1)	; øº’
+    (latin-viscii	. #xE1)	; øº’
+    (ucs		. #x00E1)	; á
     ))
 (define-char
   '((name		. "fullwidth latin small letter a with acute")
@@ -2155,7 +2186,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with acute")))
+     ((name . "fullwidth latin capital letter a with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH ACUTE")
       (ucs		  . #x00E1)	; á
@@ -2171,7 +2203,7 @@
     (mirrored		. nil)
     (->decomposition	#x0061 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter a with circumflex")
+     ((name . "fullwidth latin small letter a with circumflex")
       (japanese-jisx0212	  . #x2B24)	; ø»Š²¿
       (japanese-jisx0213-1	  . #x2958)	; ø»¢Ÿ£
       ))
@@ -2179,24 +2211,25 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
       (ucs		  . #x00C2)	; Â
       ))
-    (latin-iso8859-1		. #xE2)	; øº’µ‚
-    (latin-iso8859-2		. #xE2)	; øº’¶¢
-    (latin-iso8859-3		. #xE2)	; øº’¸‚
-    (latin-iso8859-4		. #xE2)	; øº’¹¢
-    (latin-iso8859-9		. #xE2)	; øº“‡‚
-    (latin-tcvn5712		. #xA9)	; øº“™©
-    (latin-viscii-lower		. #xE2)	; øº’‚
-    (latin-viscii		. #xE2)	; øº’‚
-    (ucs			. #x00E2)	; â
+    (latin-iso8859-1	. #xE2)	; øº’µ‚
+    (latin-iso8859-2	. #xE2)	; øº’¶¢
+    (latin-iso8859-3	. #xE2)	; øº’¸‚
+    (latin-iso8859-4	. #xE2)	; øº’¹¢
+    (latin-iso8859-9	. #xE2)	; øº“‡‚
+    (latin-tcvn5712	. #xA9)	; øº“™©
+    (latin-viscii-lower . #xE2)	; øº’‚
+    (latin-viscii	. #xE2)	; øº’‚
+    (ucs		. #x00E2)	; â
     ))
 (define-char
-  '((name		. "fullwidth latin small letter a with circumflex")
+  '((name . "fullwidth latin small letter a with circumflex")
     (=>ucs		. #x00E2)	; â
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with circumflex")))
+     ((name . "fullwidth latin capital letter a with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
       (ucs		  . #x00E2)	; â
@@ -2219,13 +2252,13 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH TILDE")
       (ucs		  . #x00C3)	; Ã
       ))
-    (latin-iso8859-1		. #xE3)	; øº’µƒ
-    (latin-iso8859-4		. #xE3)	; øº’¹£
-    (latin-iso8859-9		. #xE3)	; øº“‡ƒ
-    (latin-tcvn5712		. #xB7)	; øº“™·
-    (latin-viscii-lower		. #xE3)	; øº’ƒ
-    (latin-viscii		. #xE3)	; øº’ƒ
-    (ucs			. #x00E3)	; ã
+    (latin-iso8859-1	. #xE3)	; øº’µƒ
+    (latin-iso8859-4	. #xE3)	; øº’¹£
+    (latin-iso8859-9	. #xE3)	; øº“‡ƒ
+    (latin-tcvn5712	. #xB7)	; øº“™·
+    (latin-viscii-lower . #xE3)	; øº’ƒ
+    (latin-viscii	. #xE3)	; øº’ƒ
+    (ucs		. #x00E3)	; ã
     ))
 (define-char
   '((name		. "fullwidth latin small letter a with tilde")
@@ -2234,7 +2267,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with tilde")))
+     ((name . "fullwidth latin capital letter a with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH TILDE")
       (ucs		  . #x00E3)	; ã
@@ -2249,7 +2283,7 @@
     (mirrored		. nil)
     (->decomposition	#x0061 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter a with diaeresis")
+     ((name . "fullwidth latin small letter a with diaeresis")
       (japanese-jisx0212	  . #x2B23)	; ø»Š²¾
       (japanese-jisx0213-1	  . #x295A)	; ø»¢Ÿ¥
       ))
@@ -2265,13 +2299,14 @@
     (ucs		. #x00E4)	; ä
     ))
 (define-char
-  '((name		. "fullwidth latin small letter a with diaeresis")
+  '((name . "fullwidth latin small letter a with diaeresis")
     (=>ucs		. #x00E4)	; ä
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with diaeresis")))
+     ((name . "fullwidth latin capital letter a with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH DIAERESIS")
       (ucs		  . #x00E4)	; ä
@@ -2286,7 +2321,7 @@
     (mirrored		. nil)
     (->decomposition	#x0061 #x030A)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter a with ring above")
+     ((name . "fullwidth latin small letter a with ring above")
       (japanese-jisx0212	  . #x2B29)	; ø»Š³„
       (japanese-jisx0213-1	  . #x295B)	; ø»¢Ÿ¦
       ))
@@ -2300,13 +2335,14 @@
     (ucs		. #x00E5)	; å
     ))
 (define-char
-  '((name		. "fullwidth latin small letter a with ring above")
+  '((name . "fullwidth latin small letter a with ring above")
     (=>ucs		. #x00E5)	; å
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with ring above")))
+     ((name . "fullwidth latin capital letter a with ring above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH RING ABOVE")
       (ucs		  . #x00E5)	; å
@@ -2344,7 +2380,8 @@
     (mirrored		. nil)
     (iso-10646-comment	. "ash *")
     (->uppercase
-     ((name . "fullwidth latin capital letter ae")))
+     ((name		  . "fullwidth latin capital letter ae")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER AE")
       (ucs		  . #x00E6)	; æ
@@ -2360,7 +2397,7 @@
     (mirrored		. nil)
     (->decomposition	#x0063 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter c with cedilla")
+     ((name . "fullwidth latin small letter c with cedilla")
       (japanese-jisx0212	  . #x2B2E)	; ø»Š³‰
       (japanese-jisx0213-1	  . #x295D)	; ø»¢Ÿ¨
       ))
@@ -2382,7 +2419,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter c with cedilla")))
+     ((name . "fullwidth latin capital letter c with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER C WITH CEDILLA")
       (ucs		  . #x00E7)	; ç
@@ -2406,13 +2444,13 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH GRAVE")
       (ucs		  . #x00C8)	; È
       ))
-    (latin-iso8859-1		. #xE8)	; øº’µˆ
-    (latin-iso8859-3		. #xE8)	; øº’¸ˆ
-    (latin-iso8859-9		. #xE8)	; øº“‡ˆ
-    (latin-tcvn5712		. #xCC)	; øº“šŒ
-    (latin-viscii-lower		. #xE8)	; øº’ˆ
-    (latin-viscii		. #xE8)	; øº’ˆ
-    (ucs			. #x00E8)	; è
+    (latin-iso8859-1	. #xE8)	; øº’µˆ
+    (latin-iso8859-3	. #xE8)	; øº’¸ˆ
+    (latin-iso8859-9	. #xE8)	; øº“‡ˆ
+    (latin-tcvn5712	. #xCC)	; øº“šŒ
+    (latin-viscii-lower . #xE8)	; øº’ˆ
+    (latin-viscii	. #xE8)	; øº’ˆ
+    (ucs		. #x00E8)	; è
     ))
 (define-char
   '((name		. "fullwidth latin small letter e with grave")
@@ -2421,7 +2459,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with grave")))
+     ((name . "fullwidth latin capital letter e with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH GRAVE")
       (ucs		  . #x00E8)	; è
@@ -2446,15 +2485,15 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH ACUTE")
       (ucs		  . #x00C9)	; É
       ))
-    (latin-iso8859-1		. #xE9)	; øº’µ‰
-    (latin-iso8859-2		. #xE9)	; øº’¶©
-    (latin-iso8859-3		. #xE9)	; øº’¸‰
-    (latin-iso8859-4		. #xE9)	; øº’¹©
-    (latin-iso8859-9		. #xE9)	; øº“‡‰
-    (latin-tcvn5712		. #xD0)	; øº“š
-    (latin-viscii-lower		. #xE9)	; øº’‰
-    (latin-viscii		. #xE9)	; øº’‰
-    (ucs			. #x00E9)	; é
+    (latin-iso8859-1	. #xE9)	; øº’µ‰
+    (latin-iso8859-2	. #xE9)	; øº’¶©
+    (latin-iso8859-3	. #xE9)	; øº’¸‰
+    (latin-iso8859-4	. #xE9)	; øº’¹©
+    (latin-iso8859-9	. #xE9)	; øº“‡‰
+    (latin-tcvn5712	. #xD0)	; øº“š
+    (latin-viscii-lower . #xE9)	; øº’‰
+    (latin-viscii	. #xE9)	; øº’‰
+    (ucs		. #x00E9)	; é
     ))
 (define-char
   '((name		. "fullwidth latin small letter e with acute")
@@ -2463,7 +2502,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with acute")))
+     ((name . "fullwidth latin capital letter e with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH ACUTE")
       (ucs		  . #x00E9)	; é
@@ -2479,7 +2519,7 @@
     (mirrored		. nil)
     (->decomposition	#x0065 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter e with circumflex")
+     ((name . "fullwidth latin small letter e with circumflex")
       (chinese-gb2312		  . #x283A)	; ø»„¯
       (japanese-jisx0212	  . #x2B34)	; ø»Š³
       (japanese-jisx0213-1	  . #x2960)	; ø»¢Ÿ«
@@ -2488,22 +2528,23 @@
      ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
       (ucs		  . #x00CA)	; Ê
       ))
-    (latin-iso8859-1		. #xEA)	; øº’µŠ
-    (latin-iso8859-3		. #xEA)	; øº’¸Š
-    (latin-iso8859-9		. #xEA)	; øº“‡Š
-    (latin-tcvn5712		. #xAA)	; øº“™ª
-    (latin-viscii-lower		. #xEA)	; øº’Š
-    (latin-viscii		. #xEA)	; øº’Š
-    (ucs			. #x00EA)	; ê
+    (latin-iso8859-1	. #xEA)	; øº’µŠ
+    (latin-iso8859-3	. #xEA)	; øº’¸Š
+    (latin-iso8859-9	. #xEA)	; øº“‡Š
+    (latin-tcvn5712	. #xAA)	; øº“™ª
+    (latin-viscii-lower . #xEA)	; øº’Š
+    (latin-viscii	. #xEA)	; øº’Š
+    (ucs		. #x00EA)	; ê
     ))
 (define-char
-  '((name		. "fullwidth latin small letter e with circumflex")
+  '((name . "fullwidth latin small letter e with circumflex")
     (=>ucs		. #x00EA)	; ê
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with circumflex")))
+     ((name . "fullwidth latin capital letter e with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
       (ucs		  . #x00EA)	; ê
@@ -2519,7 +2560,7 @@
     (mirrored		. nil)
     (->decomposition	#x0065 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter e with diaeresis")
+     ((name . "fullwidth latin small letter e with diaeresis")
       (japanese-jisx0212	  . #x2B33)	; ø»Š³Ž
       (japanese-jisx0213-1	  . #x2961)	; ø»¢Ÿ¬
       ))
@@ -2535,13 +2576,14 @@
     (ucs		. #x00EB)	; ë
     ))
 (define-char
-  '((name		. "fullwidth latin small letter e with diaeresis")
+  '((name . "fullwidth latin small letter e with diaeresis")
     (=>ucs		. #x00EB)	; ë
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with diaeresis")))
+     ((name . "fullwidth latin capital letter e with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH DIAERESIS")
       (ucs		  . #x00EB)	; ë
@@ -2565,13 +2607,13 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH GRAVE")
       (ucs		  . #x00CC)	; Ì
       ))
-    (latin-iso8859-1		. #xEC)	; øº’µŒ
-    (latin-iso8859-3		. #xEC)	; øº’¸Œ
-    (latin-iso8859-9		. #xEC)	; øº“‡Œ
-    (latin-tcvn5712		. #xD7)	; øº“š—
-    (latin-viscii-lower		. #xEC)	; øº’Œ
-    (latin-viscii		. #xEC)	; øº’Œ
-    (ucs			. #x00EC)	; ì
+    (latin-iso8859-1	. #xEC)	; øº’µŒ
+    (latin-iso8859-3	. #xEC)	; øº’¸Œ
+    (latin-iso8859-9	. #xEC)	; øº“‡Œ
+    (latin-tcvn5712	. #xD7)	; øº“š—
+    (latin-viscii-lower . #xEC)	; øº’Œ
+    (latin-viscii	. #xEC)	; øº’Œ
+    (ucs		. #x00EC)	; ì
     ))
 (define-char
   '((name		. "fullwidth latin small letter i with grave")
@@ -2580,7 +2622,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with grave")))
+     ((name . "fullwidth latin capital letter i with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH GRAVE")
       (ucs		  . #x00EC)	; ì
@@ -2605,15 +2648,15 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH ACUTE")
       (ucs		  . #x00CD)	; Í
       ))
-    (latin-iso8859-1		. #xED)	; øº’µ
-    (latin-iso8859-2		. #xED)	; øº’¶­
-    (latin-iso8859-3		. #xED)	; øº’¸
-    (latin-iso8859-4		. #xED)	; øº’¹­
-    (latin-iso8859-9		. #xED)	; øº“‡
-    (latin-tcvn5712		. #xDD)	; øº“š
-    (latin-viscii-lower		. #xED)	; øº’
-    (latin-viscii		. #xED)	; øº’
-    (ucs			. #x00ED)	; í
+    (latin-iso8859-1	. #xED)	; øº’µ
+    (latin-iso8859-2	. #xED)	; øº’¶­
+    (latin-iso8859-3	. #xED)	; øº’¸
+    (latin-iso8859-4	. #xED)	; øº’¹­
+    (latin-iso8859-9	. #xED)	; øº“‡
+    (latin-tcvn5712	. #xDD)	; øº“š
+    (latin-viscii-lower . #xED)	; øº’
+    (latin-viscii	. #xED)	; øº’
+    (ucs		. #x00ED)	; í
     ))
 (define-char
   '((name		. "fullwidth latin small letter i with acute")
@@ -2622,7 +2665,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with acute")))
+     ((name . "fullwidth latin capital letter i with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH ACUTE")
       (ucs		  . #x00ED)	; í
@@ -2638,7 +2682,7 @@
     (mirrored		. nil)
     (->decomposition	#x0069 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter i with circumflex")
+     ((name . "fullwidth latin small letter i with circumflex")
       (japanese-jisx0212	  . #x2B42)	; ø»Š³
       (japanese-jisx0213-1	  . #x2964)	; ø»¢Ÿ¯
       ))
@@ -2654,13 +2698,14 @@
     (ucs		. #x00EE)	; î
     ))
 (define-char
-  '((name		. "fullwidth latin small letter i with circumflex")
+  '((name . "fullwidth latin small letter i with circumflex")
     (=>ucs		. #x00EE)	; î
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with circumflex")))
+     ((name . "fullwidth latin capital letter i with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH CIRCUMFLEX")
       (ucs		  . #x00EE)	; î
@@ -2684,14 +2729,15 @@
     (ucs		. #x00EF)	; ï
     ))
 (define-char
-  '((name		. "fullwidth latin small letter i with diaeresis")
+  '((name . "fullwidth latin small letter i with diaeresis")
     (=>ucs		. #x00EF)	; ï
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x0069 #x0308)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with diaeresis")))
+     ((name . "fullwidth latin capital letter i with diaeresis")
+      ))
     (japanese-jisx0212		. #x2B41)	; ø»Š³œ
     (japanese-jisx0213-1	. #x2965)	; ø»¢Ÿ°
     ))
@@ -2717,7 +2763,8 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Icelandic")
     (->uppercase
-     ((name . "fullwidth latin capital letter eth")))
+     ((name		  . "fullwidth latin capital letter eth")
+      ))
     (korean-ksc5601		. #x2923)	; ø»ˆ¥¾
     (japanese-jisx0212		. #x2943)	; ø»Š°¢
     (japanese-jisx0213-1	. #x2966)	; ø»¢Ÿ±
@@ -2749,7 +2796,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter n with tilde")))
+     ((name . "fullwidth latin capital letter n with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH TILDE")
       (ucs		  . #x00F1)	; ñ
@@ -2773,13 +2821,13 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH GRAVE")
       (ucs		  . #x00D2)	; Ò
       ))
-    (latin-iso8859-1		. #xF2)	; øº’µ’
-    (latin-iso8859-3		. #xF2)	; øº’¸’
-    (latin-iso8859-9		. #xF2)	; øº“‡’
-    (latin-tcvn5712		. #xDF)	; øº“šŸ
-    (latin-viscii-lower		. #xF2)	; øº’’
-    (latin-viscii		. #xF2)	; øº’’
-    (ucs			. #x00F2)	; ò
+    (latin-iso8859-1	. #xF2)	; øº’µ’
+    (latin-iso8859-3	. #xF2)	; øº’¸’
+    (latin-iso8859-9	. #xF2)	; øº“‡’
+    (latin-tcvn5712	. #xDF)	; øº“šŸ
+    (latin-viscii-lower . #xF2)	; øº’’
+    (latin-viscii	. #xF2)	; øº’’
+    (ucs		. #x00F2)	; ò
     ))
 (define-char
   '((name		. "fullwidth latin small letter o with grave")
@@ -2788,7 +2836,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin small letter o with grave")))
+     ((name		  . "fullwidth latin small letter o with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH GRAVE")
       (ucs		  . #x00F2)	; ò
@@ -2813,14 +2862,14 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH ACUTE")
       (ucs		  . #x00D3)	; Ó
       ))
-    (latin-iso8859-1		. #xF3)	; øº’µ“
-    (latin-iso8859-2		. #xF3)	; øº’¶³
-    (latin-iso8859-3		. #xF3)	; øº’¸“
-    (latin-iso8859-9		. #xF3)	; øº“‡“
-    (latin-tcvn5712		. #xE3)	; øº“š£
-    (latin-viscii-lower		. #xF3)	; øº’“
-    (latin-viscii		. #xF3)	; øº’“
-    (ucs			. #x00F3)	; ó
+    (latin-iso8859-1	. #xF3)	; øº’µ“
+    (latin-iso8859-2	. #xF3)	; øº’¶³
+    (latin-iso8859-3	. #xF3)	; øº’¸“
+    (latin-iso8859-9	. #xF3)	; øº“‡“
+    (latin-tcvn5712	. #xE3)	; øº“š£
+    (latin-viscii-lower . #xF3)	; øº’“
+    (latin-viscii	. #xF3)	; øº’“
+    (ucs		. #x00F3)	; ó
     ))
 (define-char
   '((name		. "fullwidth latin small letter o with acute")
@@ -2829,7 +2878,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with acute")))
+     ((name . "fullwidth latin capital letter o with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH ACUTE")
       (ucs		  . #x00F3)	; ó
@@ -2845,7 +2895,7 @@
     (mirrored		. nil)
     (->decomposition	#x006F #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter o with circumflex")
+     ((name . "fullwidth latin small letter o with circumflex")
       (japanese-jisx0212	  . #x2B54)	; ø»Š³¯
       (japanese-jisx0213-1	  . #x296A)	; ø»¢Ÿµ
       ))
@@ -2853,24 +2903,25 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
       (ucs		  . #x00D4)	; Ô
       ))
-    (latin-iso8859-1		. #xF4)	; øº’µ”
-    (latin-iso8859-2		. #xF4)	; øº’¶´
-    (latin-iso8859-3		. #xF4)	; øº’¸”
-    (latin-iso8859-4		. #xF4)	; øº’¹´
-    (latin-iso8859-9		. #xF4)	; øº“‡”
-    (latin-tcvn5712		. #xAB)	; øº“™«
-    (latin-viscii-lower		. #xF4)	; øº’”
-    (latin-viscii		. #xF4)	; øº’”
-    (ucs			. #x00F4)	; ô
+    (latin-iso8859-1	. #xF4)	; øº’µ”
+    (latin-iso8859-2	. #xF4)	; øº’¶´
+    (latin-iso8859-3	. #xF4)	; øº’¸”
+    (latin-iso8859-4	. #xF4)	; øº’¹´
+    (latin-iso8859-9	. #xF4)	; øº“‡”
+    (latin-tcvn5712	. #xAB)	; øº“™«
+    (latin-viscii-lower . #xF4)	; øº’”
+    (latin-viscii	. #xF4)	; øº’”
+    (ucs		. #x00F4)	; ô
     ))
 (define-char
-  '((name		. "fullwidth latin small letter o with circumflex")
+  '((name . "fullwidth latin small letter o with circumflex")
     (=>ucs		. #x00F4)	; ô
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with circumflex")))
+     ((name . "fullwidth latin capital letter o with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
       (ucs		  . #x00F4)	; ô
@@ -2893,13 +2944,13 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
       (ucs		  . #x00D5)	; Õ
       ))
-    (latin-iso8859-1		. #xF5)	; øº’µ•
-    (latin-iso8859-4		. #xF5)	; øº’¹µ
-    (latin-iso8859-9		. #xF5)	; øº“‡•
-    (latin-tcvn5712		. #xE2)	; øº“š¢
-    (latin-viscii-lower		. #xF5)	; øº’•
-    (latin-viscii		. #xF5)	; øº’•
-    (ucs			. #x00F5)	; õ
+    (latin-iso8859-1	. #xF5)	; øº’µ•
+    (latin-iso8859-4	. #xF5)	; øº’¹µ
+    (latin-iso8859-9	. #xF5)	; øº“‡•
+    (latin-tcvn5712	. #xE2)	; øº“š¢
+    (latin-viscii-lower . #xF5)	; øº’•
+    (latin-viscii	. #xF5)	; øº’•
+    (ucs		. #x00F5)	; õ
     ))
 (define-char
   '((name		. "fullwidth latin small letter o with tilde")
@@ -2908,7 +2959,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with tilde")))
+     ((name . "fullwidth latin capital letter o with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH TILDE")
       (ucs		  . #x00F5)	; õ
@@ -2923,7 +2975,7 @@
     (mirrored		. nil)
     (->decomposition	#x006F #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter o with diaeresis")
+     ((name . "fullwidth latin small letter o with diaeresis")
       (japanese-jisx0212	  . #x2B53)	; ø»Š³®
       (japanese-jisx0213-1	  . #x296C)	; ø»¢Ÿ·
       ))
@@ -2939,13 +2991,14 @@
     (ucs		. #x00F6)	; ö
     ))
 (define-char
-  '((name		. "fullwidth latin small letter o with diaeresis")
+  '((name . "fullwidth latin small letter o with diaeresis")
     (=>ucs		. #x00F6)	; ö
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with diaeresis")))
+     ((name . "fullwidth latin capital letter o with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH DIAERESIS")
       (ucs		  . #x00F6)	; ö
@@ -3020,7 +3073,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with stroke")))
+     ((name . "fullwidth latin capital letter o with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH STROKE")
       (ucs		  . #x00F8)	; ø
@@ -3045,13 +3099,13 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH GRAVE")
       (ucs		  . #x00D9)	; Ù
       ))
-    (latin-iso8859-1		. #xF9)	; øº’µ™
-    (latin-iso8859-3		. #xF9)	; øº’¸™
-    (latin-iso8859-9		. #xF9)	; øº“‡™
-    (latin-tcvn5712		. #xEF)	; øº“š¯
-    (latin-viscii-lower		. #xF9)	; øº’™
-    (latin-viscii		. #xF9)	; øº’™
-    (ucs			. #x00F9)	; ù
+    (latin-iso8859-1	. #xF9)	; øº’µ™
+    (latin-iso8859-3	. #xF9)	; øº’¸™
+    (latin-iso8859-9	. #xF9)	; øº“‡™
+    (latin-tcvn5712	. #xEF)	; øº“š¯
+    (latin-viscii-lower . #xF9)	; øº’™
+    (latin-viscii	. #xF9)	; øº’™
+    (ucs		. #x00F9)	; ù
     ))
 (define-char
   '((name		. "fullwidth latin small letter u with grave")
@@ -3060,7 +3114,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with grave")))
+     ((name . "fullwidth latin capital letter u with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH GRAVE")
       (ucs		  . #x00F9)	; ù
@@ -3085,15 +3140,15 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH ACUTE")
       (ucs		  . #x00DA)	; Ú
       ))
-    (latin-iso8859-1		. #xFA)	; øº’µš
-    (latin-iso8859-2		. #xFA)	; øº’¶º
-    (latin-iso8859-3		. #xFA)	; øº’¸š
-    (latin-iso8859-4		. #xFA)	; øº’¹º
-    (latin-iso8859-9		. #xFA)	; øº“‡š
-    (latin-tcvn5712		. #xF3)	; øº“š³
-    (latin-viscii-lower		. #xFA)	; øº’š
-    (latin-viscii		. #xFA)	; øº’š
-    (ucs			. #x00FA)	; ú
+    (latin-iso8859-1	. #xFA)	; øº’µš
+    (latin-iso8859-2	. #xFA)	; øº’¶º
+    (latin-iso8859-3	. #xFA)	; øº’¸š
+    (latin-iso8859-4	. #xFA)	; øº’¹º
+    (latin-iso8859-9	. #xFA)	; øº“‡š
+    (latin-tcvn5712	. #xF3)	; øº“š³
+    (latin-viscii-lower . #xFA)	; øº’š
+    (latin-viscii	. #xFA)	; øº’š
+    (ucs		. #x00FA)	; ú
     ))
 (define-char
   '((name		. "fullwidth latin small letter u with acute")
@@ -3102,7 +3157,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with acute")))
+     ((name . "fullwidth latin capital letter u with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH ACUTE")
       (ucs		  . #x00FA)	; ú
@@ -3118,7 +3174,7 @@
     (mirrored		. nil)
     (->decomposition	#x0075 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter u with circumflex")
+     ((name . "fullwidth latin small letter u with circumflex")
       (japanese-jisx0212	  . #x2B65)	; ø»Š´€
       (japanese-jisx0213-1	  . #x2970)	; ø»¢Ÿ»
       ))
@@ -3133,13 +3189,14 @@
     (ucs		. #x00FB)	; û
     ))
 (define-char
-  '((name		. "fullwidth latin small letter u with circumflex")
+  '((name . "fullwidth latin small letter u with circumflex")
     (=>ucs		. #x00FB)	; û
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with circumflex")))
+     ((name . "fullwidth latin capital letter u with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH CIRCUMFLEX")
       (ucs		  . #x00FB)	; û
@@ -3154,7 +3211,7 @@
     (mirrored		. nil)
     (->decomposition	#x0075 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter u with diaeresis")
+     ((name . "fullwidth latin small letter u with diaeresis")
       (chinese-gb2312		  . #x2839)	; ø»„®
       (japanese-jisx0212	  . #x2B64)	; ø»Š³¿
       (japanese-jisx0213-1	  . #x2971)	; ø»¢Ÿ¼
@@ -3171,13 +3228,14 @@
     (ucs		. #x00FC)	; ü
     ))
 (define-char
-  '((name		. "fullwidth latin small letter u with diaeresis")
+  '((name . "fullwidth latin small letter u with diaeresis")
     (=>ucs		. #x00FC)	; ü
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis")))
+     ((name . "fullwidth latin capital letter u with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
       (ucs		  . #x00FC)	; ü
@@ -3201,12 +3259,12 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH ACUTE")
       (ucs		  . #x00DD)	; Ý
       ))
-    (latin-iso8859-1		. #xFD)	; øº’µ
-    (latin-iso8859-2		. #xFD)	; øº’¶½
-    (latin-tcvn5712		. #xFD)	; øº“š½
-    (latin-viscii-lower		. #xFD)	; øº’
-    (latin-viscii		. #xFD)	; øº’
-    (ucs			. #x00FD)	; ý
+    (latin-iso8859-1	. #xFD)	; øº’µ
+    (latin-iso8859-2	. #xFD)	; øº’¶½
+    (latin-tcvn5712	. #xFD)	; øº“š½
+    (latin-viscii-lower . #xFD)	; øº’
+    (latin-viscii	. #xFD)	; øº’
+    (ucs		. #x00FD)	; ý
     ))
 (define-char
   '((name		. "fullwidth latin small letter y with acute")
@@ -3215,7 +3273,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin small letter y with acute")))
+     ((name		  . "fullwidth latin small letter y with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Y WITH ACUTE")
       (ucs		  . #x00FD)	; ý
@@ -3250,7 +3309,8 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Icelandic")
     (->uppercase
-     ((name . "fullwidth latin capital letter thorn")))
+     ((name		  . "fullwidth latin capital letter thorn")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER THORN")
       (ucs		  . #x00FE)	; þ
@@ -3266,7 +3326,7 @@
     (mirrored		. nil)
     (->decomposition	#x0079 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter y with diaeresis")
+     ((name . "fullwidth latin small letter y with diaeresis")
       (japanese-jisx0212	  . #x2B73)	; ø»Š´Ž
       (japanese-jisx0213-1	  . #x2974)	; ø»¢Ÿ¿
       ))
@@ -3279,13 +3339,14 @@
     (ucs		. #x00FF)	; ÿ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter y with diaeresis")
+  '((name . "fullwidth latin small letter y with diaeresis")
     (=>ucs		. #x00FF)	; ÿ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter y with diaeresis")))
+     ((name . "fullwidth latin capital letter y with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Y WITH DIAERESIS")
       (ucs		  . #x00FF)	; ÿ
diff --git a/lisp/utf-2000/u00100-Latin-Extended-A.el b/lisp/utf-2000/u00100-Latin-Extended-A.el
index ac33dba..c329aa3 100644
--- a/lisp/utf-2000/u00100-Latin-Extended-A.el
+++ b/lisp/utf-2000/u00100-Latin-Extended-A.el
@@ -5,7 +5,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0304)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with macron")
+     ((name . "fullwidth latin capital letter a with macron")
       (japanese-jisx0212	  . #x2A27)	; ø»Š±¤
       (japanese-jisx0213-1	  . #x2975)	; ø»¢ €
       ))
@@ -24,7 +24,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0100)
     (->lowercase
-     ((name . "fullwidth latin small letter a with macron")))
+     ((name		  . "fullwidth latin small letter a with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH MACRON")
       (ucs		  . #x0100)	; Ā
@@ -59,7 +60,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0101)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with macron")))
+     ((name . "fullwidth latin capital letter a with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH MACRON")
       (ucs		  . #x0101)	; ā
@@ -75,7 +77,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0306)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with breve")
+     ((name . "fullwidth latin capital letter a with breve")
       (japanese-jisx0212	  . #x2A25)	; ø»Š±¢
       (japanese-jisx0213-1	  . #x2A3A)	; ø»¢ £
       ))
@@ -83,11 +85,11 @@
      ((name		  . "LATIN SMALL LETTER A WITH BREVE")
       (ucs		  . #x0103)	; ă
       ))
-    (latin-iso8859-2		. #xC3)	; øº’¶ƒ
-    (latin-tcvn5712		. #xA1)	; øº“™¡
-    (latin-viscii-upper		. #xE5)	; øº’ž¥
-    (latin-viscii		. #xC5)	; øº’ž¥
-    (ucs			. #x0102)	; Ă
+    (latin-iso8859-2	. #xC3)	; øº’¶ƒ
+    (latin-tcvn5712	. #xA1)	; øº“™¡
+    (latin-viscii-upper . #xE5)	; øº’ž¥
+    (latin-viscii	. #xC5)	; øº’ž¥
+    (ucs		. #x0102)	; Ă
     ))
 (define-char
   '((name		. "fullwidth latin capital letter a with breve")
@@ -97,7 +99,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0102)
     (->lowercase
-     ((name . "fullwidth latin small letter a with breve")))
+     ((name		  . "fullwidth latin small letter a with breve")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
       (ucs		  . #x0102)	; Ă
@@ -120,11 +123,11 @@
      ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
       (ucs		  . #x0102)	; Ă
       ))
-    (latin-iso8859-2		. #xE3)	; øº’¶£
-    (latin-tcvn5712		. #xA8)	; øº“™¨
-    (latin-viscii-lower		. #xE5)	; øº’…
-    (latin-viscii		. #xE5)	; øº’…
-    (ucs			. #x0103)	; ă
+    (latin-iso8859-2	. #xE3)	; øº’¶£
+    (latin-tcvn5712	. #xA8)	; øº“™¨
+    (latin-viscii-lower . #xE5)	; øº’…
+    (latin-viscii	. #xE5)	; øº’…
+    (ucs		. #x0103)	; ă
     ))
 (define-char
   '((name		. "fullwidth latin small letter a with breve")
@@ -134,7 +137,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0103)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with breve")))
+     ((name . "fullwidth latin capital letter a with breve")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH BREVE")
       (ucs		  . #x0103)	; ă
@@ -149,7 +153,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x0328)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with ogonek")
+     ((name . "fullwidth latin capital letter a with ogonek")
       (japanese-jisx0212	  . #x2A28)	; ø»Š±¥
       (japanese-jisx0213-1	  . #x2A21)	; ø»¢ Š
       ))
@@ -169,7 +173,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0104)
     (->lowercase
-     ((name . "fullwidth latin small letter a with ogonek")))
+     ((name		  . "fullwidth latin small letter a with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH OGONEK")
       (ucs		  . #x0104)	; Ą
@@ -204,7 +209,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0105)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with ogonek")))
+     ((name . "fullwidth latin capital letter a with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH OGONEK")
       (ucs		  . #x0105)	; ą
@@ -219,7 +225,7 @@
     (mirrored		. nil)
     (->decomposition	#x0043 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter c with acute")
+     ((name . "fullwidth latin capital letter c with acute")
       (japanese-jisx0212	  . #x2A2B)	; ø»Š±¨
       (japanese-jisx0213-1	  . #x2A3C)	; ø»¢ ¥
       ))
@@ -238,7 +244,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0106)
     (->lowercase
-     ((name . "fullwidth latin small letter c with acute")))
+     ((name		  . "fullwidth latin small letter c with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER C WITH ACUTE")
       (ucs		  . #x0106)	; Ć
@@ -272,7 +279,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0107)
     (->uppercase
-     ((name . "fullwidth latin capital letter c with acute")))
+     ((name . "fullwidth latin capital letter c with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER C WITH ACUTE")
       (ucs		  . #x0107)	; ć
@@ -306,7 +314,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0108)
     (->lowercase
-     ((name . "fullwidth latin small letter c with circumflex")))
+     ((name . "fullwidth latin small letter c with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER C WITH CIRCUMFLEX")
       (ucs		  . #x0108)	; Ĉ
@@ -321,7 +330,7 @@
     (mirrored		. nil)
     (->decomposition	#x0063 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter c with circumflex")
+     ((name . "fullwidth latin small letter c with circumflex")
       (japanese-jisx0212	  . #x2B2C)	; ø»Š³‡
       (japanese-jisx0213-1	  . #x2A5F)	; ø»¢¡ˆ
       ))
@@ -333,14 +342,15 @@
     (ucs		. #x0109)	; ĉ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter c with circumflex")
+  '((name . "fullwidth latin small letter c with circumflex")
     (=>ucs		. #x0109)	; ĉ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0109)
     (->uppercase
-     ((name . "fullwidth latin capital letter c with circumflex")))
+     ((name . "fullwidth latin capital letter c with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER C WITH CIRCUMFLEX")
       (ucs		  . #x0109)	; ĉ
@@ -355,7 +365,7 @@
     (mirrored		. nil)
     (->decomposition	#x0043 #x0307)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter c with dot above")
+     ((name . "fullwidth latin capital letter c with dot above")
       (japanese-jisx0212  . #x2A2F)	; ø»Š±¬
       ))
     (->lowercase
@@ -366,14 +376,15 @@
     (ucs		. #x010A)	; Ċ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter c with dot above")
+  '((name . "fullwidth latin capital letter c with dot above")
     (=>ucs		. #x010A)	; Ċ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x010A)
     (->lowercase
-     ((name . "fullwidth latin small letter c with dot above")))
+     ((name . "fullwidth latin small letter c with dot above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER C WITH DOT ABOVE")
       (ucs		  . #x010A)	; Ċ
@@ -387,7 +398,7 @@
     (mirrored		. nil)
     (->decomposition	#x0063 #x0307)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter c with dot above")
+     ((name . "fullwidth latin small letter c with dot above")
       (japanese-jisx0212  . #x2B2F)	; ø»Š³Š
       ))
     (->uppercase
@@ -398,14 +409,15 @@
     (ucs		. #x010B)	; ċ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter c with dot above")
+  '((name . "fullwidth latin small letter c with dot above")
     (=>ucs		. #x010B)	; ċ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x010B)
     (->uppercase
-     ((name . "fullwidth latin capital letter c with dot above")))
+     ((name . "fullwidth latin capital letter c with dot above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER C WITH DOT ABOVE")
       (ucs		  . #x010B)	; ċ
@@ -419,7 +431,7 @@
     (mirrored		. nil)
     (->decomposition	#x0043 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter c with caron")
+     ((name . "fullwidth latin capital letter c with caron")
       (japanese-jisx0212	  . #x2A2D)	; ø»Š±ª
       (japanese-jisx0213-1	  . #x2A3D)	; ø»¢ ¦
       ))
@@ -439,7 +451,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x010C)
     (->lowercase
-     ((name . "fullwidth latin capital letter c with caron")))
+     ((name . "fullwidth latin capital letter c with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER C WITH CARON")
       (ucs		  . #x010C)	; Č
@@ -474,7 +487,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x010D)
     (->uppercase
-     ((name . "fullwidth latin small letter c with caron")))
+     ((name		  . "fullwidth latin small letter c with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER C WITH CARON")
       (ucs		  . #x010D)	; č
@@ -489,7 +503,7 @@
     (mirrored		. nil)
     (->decomposition	#x0044 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter d with caron")
+     ((name . "fullwidth latin capital letter d with caron")
       (japanese-jisx0212	  . #x2A30)	; ø»Š±­
       (japanese-jisx0213-1	  . #x2A40)	; ø»¢ ©
       ))
@@ -508,7 +522,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x010E)
     (->lowercase
-     ((name . "fullwidth latin small letter d with caron")))
+     ((name		  . "fullwidth latin small letter d with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER D WITH CARON")
       (ucs		  . #x010E)	; Ď
@@ -542,7 +557,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x010F)
     (->uppercase
-     ((name . "fullwidth latin capital letter d with caron")))
+     ((name . "fullwidth latin capital letter d with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER D WITH CARON")
       (ucs		  . #x010F)	; ď
@@ -556,19 +572,19 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER D WITH STROKE")
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER D WITH STROKE")
       (japanese-jisx0212  . #x2922)	; ø»Š°
       ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH STROKE")
       (ucs		  . #x0111)	; đ
       ))
-    (latin-iso8859-2		. #xD0)	; øº’¶
-    (latin-iso8859-4		. #xD0)	; øº’¹
-    (latin-tcvn5712		. #xA7)	; øº“™§
-    (latin-viscii-upper		. #xF0)	; øº’ž°
-    (latin-viscii		. #xD0)	; øº’ž°
-    (ucs			. #x0110)	; Đ
+    (latin-iso8859-2	. #xD0)	; øº’¶
+    (latin-iso8859-4	. #xD0)	; øº’¹
+    (latin-tcvn5712	. #xA7)	; øº“™§
+    (latin-viscii-upper . #xF0)	; øº’ž°
+    (latin-viscii	. #xD0)	; øº’ž°
+    (ucs		. #x0110)	; Đ
     ))
 (define-char
   '((name		. "FULLWIDTH LATIN CAPITAL LETTER D WITH STROKE")
@@ -578,7 +594,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0110)
     (->lowercase
-     ((name . "FULLWIDTH LATIN SMALL LETTER D WITH STROKE")))
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER D WITH STROKE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER D WITH STROKE")
       (ucs		  . #x0110)	; Đ
@@ -594,12 +611,12 @@
      ((name		  . "LATIN CAPITAL LETTER D WITH STROKE")
       (ucs		  . #x0110)	; Đ
       ))
-    (latin-iso8859-2		. #xF0)	; øº’¶°
-    (latin-iso8859-4		. #xF0)	; øº’¹°
-    (latin-tcvn5712		. #xAE)	; øº“™®
-    (latin-viscii-lower		. #xF0)	; øº’
-    (latin-viscii		. #xF0)	; øº’
-    (ucs			. #x0111)	; đ
+    (latin-iso8859-2	. #xF0)	; øº’¶°
+    (latin-iso8859-4	. #xF0)	; øº’¹°
+    (latin-tcvn5712	. #xAE)	; øº“™®
+    (latin-viscii-lower . #xF0)	; øº’
+    (latin-viscii	. #xF0)	; øº’
+    (ucs		. #x0111)	; đ
     ))
 (define-char
   '((name		. "fullwidth latin small letter d with stroke")
@@ -608,7 +625,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter d with stroke")))
+     ((name . "fullwidth latin capital letter d with stroke")
+      ))
     (korean-ksc5601		. #x2922)	; ø»ˆ¥½
     (japanese-jisx0212		. #x2942)	; ø»Š°¡
     (japanese-jisx0213-1	. #x2A50)	; ø»¢ ¹
@@ -620,7 +638,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x0304)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter e with macron")
+     ((name . "fullwidth latin capital letter e with macron")
       (japanese-jisx0212	  . #x2A37)	; ø»Š±´
       (japanese-jisx0213-1	  . #x2978)	; ø»¢ ƒ
       ))
@@ -639,7 +657,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0112)
     (->lowercase
-     ((name . "fullwidth latin small letter e with macron")))
+     ((name		  . "fullwidth latin small letter e with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH MACRON")
       (ucs		  . #x0112)	; Ē
@@ -674,7 +693,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0113)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with macron")))
+     ((name . "fullwidth latin capital letter e with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH MACRON")
       (ucs		  . #x0113)	; ē
@@ -714,7 +734,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x0307)
     (->fullwidth
-     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER E WITH DOT ABOVE")
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER E WITH DOT ABOVE")
       (japanese-jisx0212  . #x2A36)	; ø»Š±³
       ))
     (->lowercase
@@ -725,14 +745,15 @@
     (ucs		. #x0116)	; Ė
     ))
 (define-char
-  '((name		. "FULLWIDTH LATIN CAPITAL LETTER E WITH DOT ABOVE")
+  '((name . "FULLWIDTH LATIN CAPITAL LETTER E WITH DOT ABOVE")
     (=>ucs		. #x0116)	; Ė
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0116)
     (->lowercase
-     ((name . "FULLWIDTH LATIN SMALL LETTER E WITH DOT ABOVE")))
+     ((name . "FULLWIDTH LATIN SMALL LETTER E WITH DOT ABOVE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH DOT ABOVE")
       (ucs		  . #x0116)	; Ė
@@ -746,7 +767,7 @@
     (mirrored		. nil)
     (->decomposition	#x0065 #x0307)
     (->fullwidth
-     ((name		  . "FULLWIDTH LATIN SMALL LETTER E WITH DOT ABOVE")
+     ((name . "FULLWIDTH LATIN SMALL LETTER E WITH DOT ABOVE")
       (japanese-jisx0212  . #x2B36)	; ø»Š³‘
       ))
     (->uppercase
@@ -757,14 +778,15 @@
     (ucs		. #x0117)	; ė
     ))
 (define-char
-  '((name		. "FULLWIDTH LATIN SMALL LETTER E WITH DOT ABOVE")
+  '((name . "FULLWIDTH LATIN SMALL LETTER E WITH DOT ABOVE")
     (=>ucs		. #x0117)	; ė
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0117)
     (->uppercase
-     ((name . "FULLWIDTH LATIN CAPITAL LETTER E WITH DOT ABOVE")))
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER E WITH DOT ABOVE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH DOT ABOVE")
       (ucs		  . #x0117)	; ė
@@ -778,7 +800,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x0328)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter e with ogonek")
+     ((name . "fullwidth latin capital letter e with ogonek")
       (japanese-jisx0212	  . #x2A38)	; ø»Š±µ
       (japanese-jisx0213-1	  . #x2A3E)	; ø»¢ §
       ))
@@ -798,7 +820,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0118)
     (->lowercase
-     ((name . "fullwidth latin small letter e with ogonek")))
+     ((name		  . "fullwidth latin small letter e with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH OGONEK")
       (ucs		  . #x0118)	; Ę
@@ -833,7 +856,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0119)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with ogonek")))
+     ((name . "fullwidth latin capital letter e with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH OGONEK")
       (ucs		  . #x0119)	; ę
@@ -848,7 +872,7 @@
     (mirrored		. nil)
     (->decomposition	#x0045 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter e with caron")
+     ((name . "fullwidth latin capital letter e with caron")
       (japanese-jisx0212	  . #x2A35)	; ø»Š±²
       (japanese-jisx0213-1	  . #x2A3F)	; ø»¢ ¨
       ))
@@ -867,7 +891,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x011A)
     (->lowercase
-     ((name . "fullwidth latin small letter e with caron")))
+     ((name		  . "fullwidth latin small letter e with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER E WITH CARON")
       (ucs		  . #x011A)	; Ě
@@ -902,7 +927,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x011B)
     (->uppercase
-     ((name . "fullwidth latin capital letter e with caron")))
+     ((name . "fullwidth latin capital letter e with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER E WITH CARON")
       (ucs		  . #x011B)	; ě
@@ -937,7 +963,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x011C)
     (->lowercase
-     ((name . "fullwidth latin small letter g with circumflex")))
+     ((name . "fullwidth latin small letter g with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH CIRCUMFLEX")
       (ucs		  . #x011C)	; Ĝ
@@ -952,7 +979,7 @@
     (mirrored		. nil)
     (->decomposition	#x0067 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter g with circumflex")
+     ((name . "fullwidth latin small letter g with circumflex")
       (japanese-jisx0212	  . #x2B3A)	; ø»Š³•
       (japanese-jisx0213-1	  . #x2A60)	; ø»¢¡‰
       ))
@@ -964,14 +991,15 @@
     (ucs		. #x011D)	; ĝ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter g with circumflex")
+  '((name . "fullwidth latin small letter g with circumflex")
     (=>ucs		. #x011D)	; ĝ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x011D)
     (->uppercase
-     ((name . "fullwidth latin small letter g with circumflex")))
+     ((name . "fullwidth latin small letter g with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER G WITH CIRCUMFLEX")
       (ucs		  . #x011D)	; ĝ
@@ -986,7 +1014,7 @@
     (mirrored		. nil)
     (->decomposition	#x0047 #x0306)
     (->fullwidth
-     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G WITH BREVE")
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH BREVE")
       (japanese-jisx0212  . #x2A3B)	; ø»Š±¸
       ))
     (->lowercase
@@ -1005,7 +1033,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x011E)
     (->lowercase
-     ((name . "FULLWIDTH LATIN SMALL LETTER G WITH BREVE")))
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER G WITH BREVE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH BREVE")
       (ucs		  . #x011E)	; Ğ
@@ -1038,7 +1067,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x011F)
     (->uppercase
-     ((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH BREVE")))
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH BREVE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER G WITH BREVE")
       (ucs		  . #x011F)	; ğ
@@ -1052,7 +1082,7 @@
     (mirrored		. nil)
     (->decomposition	#x0047 #x0307)
     (->fullwidth
-     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G WITH DOT ABOVE")
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH DOT ABOVE")
       (japanese-jisx0212  . #x2A3D)	; ø»Š±º
       ))
     (->lowercase
@@ -1063,14 +1093,15 @@
     (ucs		. #x0120)	; Ä 
     ))
 (define-char
-  '((name		. "FULLWIDTH LATIN CAPITAL LETTER G WITH DOT ABOVE")
+  '((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH DOT ABOVE")
     (=>ucs		. #x0120)	; Ä 
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0120)
     (->lowercase
-     ((name . "FULLWIDTH LATIN SMALL LETTER G WITH DOT ABOVE")))
+     ((name . "FULLWIDTH LATIN SMALL LETTER G WITH DOT ABOVE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH DOT ABOVE")
       (ucs		  . #x0120)	; Ä 
@@ -1084,7 +1115,7 @@
     (mirrored		. nil)
     (->decomposition	#x0067 #x0307)
     (->fullwidth
-     ((name		  . "FULLWIDTH LATIN SMALL LETTER G WITH DOT ABOVE")
+     ((name . "FULLWIDTH LATIN SMALL LETTER G WITH DOT ABOVE")
       (japanese-jisx0212  . #x2B3D)	; ø»Š³˜
       ))
     (->uppercase
@@ -1095,14 +1126,15 @@
     (ucs		. #x0121)	; Ä¡
     ))
 (define-char
-  '((name		. "FULLWIDTH LATIN SMALL LETTER G WITH DOT ABOVE")
+  '((name . "FULLWIDTH LATIN SMALL LETTER G WITH DOT ABOVE")
     (=>ucs		. #x0121)	; Ä¡
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0121)
     (->uppercase
-     ((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH DOT ABOVE")))
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER G WITH DOT ABOVE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER G WITH DOT ABOVE")
       (ucs		  . #x0121)	; Ä¡
@@ -1116,7 +1148,7 @@
     (mirrored		. nil)
     (->decomposition	#x0047 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter g with cedilla")
+     ((name . "fullwidth latin capital letter g with cedilla")
       (japanese-jisx0212  . #x2A3C)	; ø»Š±¹
       ))
     (->lowercase
@@ -1127,14 +1159,15 @@
     (ucs		. #x0122)	; Ģ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter g with cedilla")
+  '((name . "fullwidth latin capital letter g with cedilla")
     (=>ucs		. #x0122)	; Ģ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0122)
     (->lowercase
-     ((name . "fullwidth latin small letter g with cedilla")))
+     ((name . "fullwidth latin small letter g with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH CEDILLA")
       (ucs		  . #x0122)	; Ģ
@@ -1180,7 +1213,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0124)
     (->lowercase
-     ((name . "fullwidth latin small letter h with circumflex")))
+     ((name . "fullwidth latin small letter h with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER H WITH CIRCUMFLEX")
       (ucs		  . #x0124)	; Ĥ
@@ -1195,7 +1229,7 @@
     (mirrored		. nil)
     (->decomposition	#x0068 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter h with circumflex")
+     ((name . "fullwidth latin small letter h with circumflex")
       (japanese-jisx0212	  . #x2B3E)	; ø»Š³™
       (japanese-jisx0213-1	  . #x2A61)	; ø»¢¡Š
       ))
@@ -1207,14 +1241,15 @@
     (ucs		. #x0125)	; ĥ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter h with circumflex")
+  '((name . "fullwidth latin small letter h with circumflex")
     (=>ucs		. #x0125)	; ĥ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0125)
     (->uppercase
-     ((name . "fullwidth latin capital letter h with circumflex")))
+     ((name . "fullwidth latin capital letter h with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER H WITH CIRCUMFLEX")
       (ucs		  . #x0125)	; ĥ
@@ -1228,7 +1263,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter h with stroke")
+     ((name . "fullwidth latin capital letter h with stroke")
       (korean-ksc5601	  . #x2824)	; ø»ˆ¤¡
       (japanese-jisx0212  . #x2924)	; ø»Š°ƒ
       ))
@@ -1247,7 +1282,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0126)
     (->lowercase
-     ((name . "fullwidth latin small letter h with stroke")))
+     ((name		  . "fullwidth latin small letter h with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER H WITH STROKE")
       (ucs		  . #x0126)	; Ħ
@@ -1281,7 +1317,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0127)
     (->uppercase
-     ((name . "fullwidth latin capital letter h with stroke")))
+     ((name . "fullwidth latin capital letter h with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER H WITH STROKE")
       (ucs		  . #x0127)	; ħ
@@ -1297,17 +1334,17 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0303)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with tilde")
+     ((name . "fullwidth latin capital letter i with tilde")
       (japanese-jisx0212  . #x2A47)	; ø»Š²„
       ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH TILDE")
       (ucs		  . #x0129)	; Ä©
       ))
-    (latin-iso8859-4		. #xA5)	; øº’¸¥
-    (latin-viscii-upper		. #xEE)	; øº’ž®
-    (latin-viscii		. #xCE)	; øº’ž®
-    (ucs			. #x0128)	; Ĩ
+    (latin-iso8859-4	. #xA5)	; øº’¸¥
+    (latin-viscii-upper . #xEE)	; øº’ž®
+    (latin-viscii	. #xCE)	; øº’ž®
+    (ucs		. #x0128)	; Ĩ
     ))
 (define-char
   '((name		. "fullwidth latin capital letter i with tilde")
@@ -1317,7 +1354,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0128)
     (->lowercase
-     ((name . "fullwidth latin small letter i with tilde")))
+     ((name		  . "fullwidth latin small letter i with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH TILDE")
       (ucs		  . #x0128)	; Ĩ
@@ -1338,11 +1376,11 @@
      ((name		  . "LATIN CAPITAL LETTER I WITH TILDE")
       (ucs		  . #x0128)	; Ĩ
       ))
-    (latin-iso8859-4		. #xB5)	; øº’¸µ
-    (latin-tcvn5712		. #xDC)	; øº“šœ
-    (latin-viscii-lower		. #xEE)	; øº’Ž
-    (latin-viscii		. #xEE)	; øº’Ž
-    (ucs			. #x0129)	; Ä©
+    (latin-iso8859-4	. #xB5)	; øº’¸µ
+    (latin-tcvn5712	. #xDC)	; øº“šœ
+    (latin-viscii-lower . #xEE)	; øº’Ž
+    (latin-viscii	. #xEE)	; øº’Ž
+    (ucs		. #x0129)	; Ä©
     ))
 (define-char
   '((name		. "fullwidth latin small letter i with tilde")
@@ -1352,7 +1390,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0129)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with tilde")))
+     ((name . "fullwidth latin capital letter i with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH TILDE")
       (ucs		  . #x0129)	; Ä©
@@ -1366,7 +1405,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0304)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with macron")
+     ((name . "fullwidth latin capital letter i with macron")
       (japanese-jisx0212	  . #x2A45)	; ø»Š²‚
       (japanese-jisx0213-1	  . #x2976)	; ø»¢ 
       ))
@@ -1385,7 +1424,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x012A)
     (->lowercase
-     ((name . "fullwidth latin small letter i with macron")))
+     ((name		  . "fullwidth latin small letter i with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH MACRON")
       (ucs		  . #x012A)	; Ī
@@ -1420,7 +1460,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x012B)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with macron")))
+     ((name . "fullwidth latin capital letter i with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH MACRON")
       (ucs		  . #x012B)	; Ä«
@@ -1460,7 +1501,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0328)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with ogonek")
+     ((name . "fullwidth latin capital letter i with ogonek")
       (japanese-jisx0212  . #x2A46)	; ø»Š²ƒ
       ))
     (->lowercase
@@ -1478,7 +1519,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x012E)
     (->lowercase
-     ((name . "fullwidth latin small letter i with ogonek")))
+     ((name		  . "fullwidth latin small letter i with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH OGONEK")
       (ucs		  . #x012E)	; Ä®
@@ -1510,7 +1552,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x012F)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with ogonek")))
+     ((name . "fullwidth latin capital letter i with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH OGONEK")
       (ucs		  . #x012F)	; į
@@ -1524,7 +1567,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x0307)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with dot above")
+     ((name . "fullwidth latin capital letter i with dot above")
       (japanese-jisx0212  . #x2A44)	; ø»Š²
       ))
     (->lowercase
@@ -1536,14 +1579,15 @@
     (ucs		. #x0130)	; Ä°
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter i with dot above")
+  '((name . "fullwidth latin capital letter i with dot above")
     (=>ucs		. #x0130)	; Ä°
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0130)
     (->lowercase
-     ((name . "fullwidth latin small letter i with dot above")))
+     ((name . "fullwidth latin small letter i with dot above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH DOT ABOVE")
       (ucs		  . #x0130)	; Ä°
@@ -1570,7 +1614,8 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name . "fullwidth latin capital letter dotless i")))
+     ((name		  . "fullwidth latin capital letter dotless i")
+      ))
     (korean-ksc5601	. #x2925)	; ø»ˆ¦€
     (japanese-jisx0212	. #x2945)	; ø»Š°¤
     ))
@@ -1649,7 +1694,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0134)
     (->lowercase
-     ((name . "fullwidth latin small letter j with circumflex")))
+     ((name . "fullwidth latin small letter j with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER J WITH CIRCUMFLEX")
       (ucs		  . #x0134)	; Ä´
@@ -1664,7 +1710,7 @@
     (mirrored		. nil)
     (->decomposition	#x006A #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter j with circumflex")
+     ((name . "fullwidth latin small letter j with circumflex")
       (japanese-jisx0212	  . #x2B48)	; ø»Š³£
       (japanese-jisx0213-1	  . #x2A62)	; ø»¢¡‹
       ))
@@ -1676,14 +1722,15 @@
     (ucs		. #x0135)	; ĵ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter j with circumflex")
+  '((name . "fullwidth latin small letter j with circumflex")
     (=>ucs		. #x0135)	; ĵ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0135)
     (->uppercase
-     ((name . "fullwidth latin capital letter j with circumflex")))
+     ((name . "fullwidth latin capital letter j with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER J WITH CIRCUMFLEX")
       (ucs		  . #x0135)	; ĵ
@@ -1698,7 +1745,7 @@
     (mirrored		. nil)
     (->decomposition	#x004B #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter k with cedilla")
+     ((name . "fullwidth latin capital letter k with cedilla")
       (japanese-jisx0212  . #x2A49)	; ø»Š²†
       ))
     (->lowercase
@@ -1709,14 +1756,15 @@
     (ucs		. #x0136)	; Ķ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter k with cedilla")
+  '((name . "fullwidth latin capital letter k with cedilla")
     (=>ucs		. #x0136)	; Ķ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0136)
     (->lowercase
-     ((name . "fullwidth latin small letter k with cedilla")))
+     ((name . "fullwidth latin small letter k with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER K WITH CEDILLA")
       (ucs		  . #x0136)	; Ķ
@@ -1730,7 +1778,7 @@
     (mirrored		. nil)
     (->decomposition	#x006B #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter k with cedilla")
+     ((name . "fullwidth latin small letter k with cedilla")
       (japanese-jisx0212  . #x2B49)	; ø»Š³¤
       ))
     (->uppercase
@@ -1748,7 +1796,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0137)
     (->uppercase
-     ((name . "fullwidth latin capital letter k with cedilla")))
+     ((name . "fullwidth latin capital letter k with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER K WITH CEDILLA")
       (ucs		  . #x0137)	; Ä·
@@ -1791,7 +1840,7 @@
     (mirrored		. nil)
     (->decomposition	#x004C #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter l with acute")
+     ((name . "fullwidth latin capital letter l with acute")
       (japanese-jisx0212	  . #x2A4A)	; ø»Š²‡
       (japanese-jisx0213-1	  . #x2A3B)	; ø»¢ ¤
       ))
@@ -1810,7 +1859,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0139)
     (->lowercase
-     ((name . "fullwidth latin small letter l with acute")))
+     ((name		  . "fullwidth latin small letter l with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER L WITH ACUTE")
       (ucs		  . #x0139)	; Ĺ
@@ -1844,7 +1894,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x013A)
     (->uppercase
-     ((name . "fullwidth latin capital letter l with acute")))
+     ((name . "fullwidth latin capital letter l with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH ACUTE")
       (ucs		  . #x013A)	; ĺ
@@ -1859,7 +1910,7 @@
     (mirrored		. nil)
     (->decomposition	#x004C #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter l with cedilla")
+     ((name . "fullwidth latin capital letter l with cedilla")
       (japanese-jisx0212  . #x2A4C)	; ø»Š²‰
       ))
     (->lowercase
@@ -1870,14 +1921,15 @@
     (ucs		. #x013B)	; Ä»
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter l with cedilla")
+  '((name . "fullwidth latin capital letter l with cedilla")
     (=>ucs		. #x013B)	; Ä»
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x013B)
     (->lowercase
-     ((name . "fullwidth latin capital letter l with cedilla")))
+     ((name . "fullwidth latin capital letter l with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER L WITH CEDILLA")
       (ucs		  . #x013B)	; Ä»
@@ -1891,7 +1943,7 @@
     (mirrored		. nil)
     (->decomposition	#x006C #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter l with cedilla")
+     ((name . "fullwidth latin small letter l with cedilla")
       (japanese-jisx0212  . #x2B4C)	; ø»Š³§
       ))
     (->uppercase
@@ -1909,7 +1961,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x013C)
     (->uppercase
-     ((name . "fullwidth latin capital letter l with cedilla")))
+     ((name . "fullwidth latin capital letter l with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH CEDILLA")
       (ucs		  . #x013C)	; ļ
@@ -1923,7 +1976,7 @@
     (mirrored		. nil)
     (->decomposition	#x004C #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter l with caron")
+     ((name . "fullwidth latin capital letter l with caron")
       (japanese-jisx0212	  . #x2A4B)	; ø»Š²ˆ
       (japanese-jisx0213-1	  . #x2A24)	; ø»¢ 
       ))
@@ -1942,7 +1995,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x013D)
     (->lowercase
-     ((name . "fullwidth latin small letter l with caron")))
+     ((name		  . "fullwidth latin small letter l with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER L WITH CARON")
       (ucs		  . #x013D)	; Ľ
@@ -1976,7 +2030,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x013E)
     (->uppercase
-     ((name . "fullwidth latin capital letter l with caron")))
+     ((name . "fullwidth latin capital letter l with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH CARON")
       (ucs		  . #x013E)	; ľ
@@ -2009,7 +2064,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x013F)
     (->lowercase
-     ((name . "fullwidth latin small letter l with middle dot")))
+     ((name . "fullwidth latin small letter l with middle dot")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER L WITH MIDDLE DOT")
       (ucs		  . #x013F)	; Ä¿
@@ -2024,7 +2080,7 @@
     (mirrored		. nil)
     (->decomposition	compat #x006C #x00B7)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter l with middle dot")
+     ((name . "fullwidth latin small letter l with middle dot")
       (korean-ksc5601	  . #x2928)	; ø»ˆ¦ƒ
       (japanese-jisx0212  . #x2949)	; ø»Š°¨
       ))
@@ -2035,14 +2091,15 @@
     (ucs		. #x0140)	; ŀ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter l with middle dot")
+  '((name . "fullwidth latin small letter l with middle dot")
     (=>ucs		. #x0140)	; ŀ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0140)
     (->uppercase
-     ((name . "fullwidth latin capital letter l with middle dot")))
+     ((name . "fullwidth latin capital letter l with middle dot")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH MIDDLE DOT")
       (ucs		  . #x0140)	; ŀ
@@ -2056,7 +2113,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter l with stroke")
+     ((name . "fullwidth latin capital letter l with stroke")
       (korean-ksc5601		  . #x2829)	; ø»ˆ¤¦
       (japanese-jisx0212	  . #x2928)	; ø»Š°‡
       (japanese-jisx0213-1	  . #x2A23)	; ø»¢ Œ
@@ -2076,7 +2133,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0141)
     (->lowercase
-     ((name . "fullwidth latin small letter l with stroke")))
+     ((name		  . "fullwidth latin small letter l with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER L WITH STROKE")
       (ucs		  . #x0141)	; Ł
@@ -2111,7 +2169,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0142)
     (->uppercase
-     ((name . "fullwidth latin capital letter l with stroke")))
+     ((name . "fullwidth latin capital letter l with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER L WITH STROKE")
       (ucs		  . #x0142)	; ł
@@ -2127,7 +2186,7 @@
     (mirrored		. nil)
     (->decomposition	#x004E #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter n with acute")
+     ((name . "fullwidth latin capital letter n with acute")
       (japanese-jisx0212	  . #x2A4D)	; ø»Š²Š
       (japanese-jisx0213-1	  . #x2A41)	; ø»¢ ª
       ))
@@ -2146,7 +2205,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0143)
     (->lowercase
-     ((name . "fullwidth latin small letter n with acute")))
+     ((name		  . "fullwidth latin small letter n with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER N WITH ACUTE")
       (ucs		  . #x0143)	; Ń
@@ -2180,7 +2240,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0144)
     (->uppercase
-     ((name . "fullwidth latin capital letter n with acute")))
+     ((name . "fullwidth latin capital letter n with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH ACUTE")
       (ucs		  . #x0144)	; ń
@@ -2195,7 +2256,7 @@
     (mirrored		. nil)
     (->decomposition	#x004E #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter n with cedilla")
+     ((name . "fullwidth latin capital letter n with cedilla")
       (japanese-jisx0212  . #x2A4F)	; ø»Š²Œ
       ))
     (->lowercase
@@ -2206,14 +2267,15 @@
     (ucs		. #x0145)	; Ņ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter n with cedilla")
+  '((name . "fullwidth latin capital letter n with cedilla")
     (=>ucs		. #x0145)	; Ņ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0145)
     (->lowercase
-     ((name . "fullwidth latin small letter n with cedilla")))
+     ((name . "fullwidth latin small letter n with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER N WITH CEDILLA")
       (ucs		  . #x0145)	; Ņ
@@ -2227,7 +2289,7 @@
     (mirrored		. nil)
     (->decomposition	#x006E #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter n with cedilla")
+     ((name . "fullwidth latin small letter n with cedilla")
       (japanese-jisx0212  . #x2B4F)	; ø»Š³ª
       ))
     (->uppercase
@@ -2245,7 +2307,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0146)
     (->uppercase
-     ((name . "fullwidth latin capital letter n with cedilla")))
+     ((name . "fullwidth latin capital letter n with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH CEDILLA")
       (ucs		  . #x0146)	; ņ
@@ -2259,7 +2322,7 @@
     (mirrored		. nil)
     (->decomposition	#x004E #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter n with caron")
+     ((name . "fullwidth latin capital letter n with caron")
       (japanese-jisx0212	  . #x2A4E)	; ø»Š²‹
       (japanese-jisx0213-1	  . #x2A42)	; ø»¢ «
       ))
@@ -2278,7 +2341,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0147)
     (->lowercase
-     ((name . "fullwidth latin small letter n with caron")))
+     ((name		  . "fullwidth latin small letter n with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER N WITH CARON")
       (ucs		  . #x0147)	; Ň
@@ -2312,7 +2376,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0148)
     (->uppercase
-     ((name . "fullwidth latin capital letter n with caron")))
+     ((name . "fullwidth latin capital letter n with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH CARON")
       (ucs		  . #x0148)	; ň
@@ -2341,7 +2406,7 @@
     (mirrored		. nil)
     (->decomposition	wide #x0149)
     (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER N PRECEDED BY APOSTROPHE")
+     ((name . "LATIN SMALL LETTER N PRECEDED BY APOSTROPHE")
       (ucs		  . #x0149)	; ʼn
       ))
     (korean-ksc5601	. #x2930)	; ø»ˆ¦‹
@@ -2374,7 +2439,8 @@
     (iso-10646-comment	. "Sami")
     (->decomposition	wide #x014A)
     (->lowercase
-     ((name . "FULLWIDTH LATIN SMALL LETTER ENG")))
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER ENG")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER ENG")
       (ucs		  . #x014A)	; Ŋ
@@ -2411,7 +2477,8 @@
     (iso-10646-comment	. "Sami")
     (->decomposition	wide #x014B)
     (->uppercase
-     ((name . "fullwidth latin capital letter eng")))
+     ((name		  . "fullwidth latin capital letter eng")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER ENG")
       (ucs		  . #x014B)	; ŋ
@@ -2427,7 +2494,7 @@
     (mirrored		. nil)
     (->decomposition	#x004F #x0304)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter o with macron")
+     ((name . "fullwidth latin capital letter o with macron")
       (japanese-jisx0212	  . #x2A57)	; ø»Š²”
       (japanese-jisx0213-1	  . #x2979)	; ø»¢ „
       ))
@@ -2446,7 +2513,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x014C)
     (->lowercase
-     ((name . "fullwidth latin small letter o with macron")))
+     ((name		  . "fullwidth latin small letter o with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH MACRON")
       (ucs		  . #x014C)	; Ō
@@ -2481,7 +2549,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x014D)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with macron")))
+     ((name . "fullwidth latin capital letter o with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH MACRON")
       (ucs		  . #x014D)	; ō
@@ -2540,7 +2609,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0150)
     (->lowercase
-     ((name . "fullwidth latin small letter o with double acute")))
+     ((name . "fullwidth latin small letter o with double acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH DOUBLE ACUTE")
       (ucs		  . #x0150)	; Ő
@@ -2574,7 +2644,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0151)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with double acute")))
+     ((name . "fullwidth latin capital letter o with double acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH DOUBLE ACUTE")
       (ucs		  . #x0151)	; ő
@@ -2622,7 +2693,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0153)
     (->uppercase
-     ((name . "fullwidth latin capital ligature oe")))
+     ((name		  . "fullwidth latin capital ligature oe")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LIGATURE OE")
       (ucs		  . #x0153)	; œ
@@ -2638,7 +2710,7 @@
     (mirrored		. nil)
     (->decomposition	#x0052 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter r with acute")
+     ((name . "fullwidth latin capital letter r with acute")
       (japanese-jisx0212	  . #x2A59)	; ø»Š²–
       (japanese-jisx0213-1	  . #x2A39)	; ø»¢ ¢
       ))
@@ -2657,7 +2729,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0154)
     (->lowercase
-     ((name . "fullwidth latin small letter r with acute")))
+     ((name		  . "fullwidth latin small letter r with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER R WITH ACUTE")
       (ucs		  . #x0154)	; Ŕ
@@ -2691,7 +2764,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0155)
     (->uppercase
-     ((name . "fullwidth latin capital letter r with acute")))
+     ((name . "fullwidth latin capital letter r with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER R WITH ACUTE")
       (ucs		  . #x0155)	; ŕ
@@ -2706,7 +2780,7 @@
     (mirrored		. nil)
     (->decomposition	#x0052 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter r with cedilla")
+     ((name . "fullwidth latin capital letter r with cedilla")
       (japanese-jisx0212  . #x2A5B)	; ø»Š²˜
       ))
     (->lowercase
@@ -2717,14 +2791,15 @@
     (ucs		. #x0156)	; Ŗ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter r with cedilla")
+  '((name . "fullwidth latin capital letter r with cedilla")
     (=>ucs		. #x0156)	; Ŗ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0156)
     (->lowercase
-     ((name . "fullwidth latin small letter r with cedilla")))
+     ((name . "fullwidth latin small letter r with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER R WITH CEDILLA")
       (ucs		  . #x0156)	; Ŗ
@@ -2738,7 +2813,7 @@
     (mirrored		. nil)
     (->decomposition	#x0072 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter r with cedilla")
+     ((name . "fullwidth latin small letter r with cedilla")
       (japanese-jisx0212  . #x2B5B)	; ø»Š³¶
       ))
     (->uppercase
@@ -2756,7 +2831,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0157)
     (->uppercase
-     ((name . "FULLWIDTH LATIN CAPITAL LETTER R WITH CEDILLA")))
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER R WITH CEDILLA")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER R WITH CEDILLA")
       (ucs		  . #x0157)	; ŗ
@@ -2770,7 +2846,7 @@
     (mirrored		. nil)
     (->decomposition	#x0052 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter r with caron")
+     ((name . "fullwidth latin capital letter r with caron")
       (japanese-jisx0212	  . #x2A5A)	; ø»Š²—
       (japanese-jisx0213-1	  . #x2A44)	; ø»¢ ­
       ))
@@ -2789,7 +2865,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0158)
     (->lowercase
-     ((name . "fullwidth latin small letter r with caron")))
+     ((name		  . "fullwidth latin small letter r with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER R WITH CARON")
       (ucs		  . #x0158)	; Ř
@@ -2823,7 +2900,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0159)
     (->uppercase
-     ((name . "fullwidth latin capital letter r with caron")))
+     ((name . "fullwidth latin capital letter r with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER R WITH CARON")
       (ucs		  . #x0159)	; ř
@@ -2838,7 +2916,7 @@
     (mirrored		. nil)
     (->decomposition	#x0053 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter s with acute")
+     ((name . "fullwidth latin capital letter s with acute")
       (japanese-jisx0212	  . #x2A5C)	; ø»Š²™
       (japanese-jisx0213-1	  . #x2A25)	; ø»¢ Ž
       ))
@@ -2857,7 +2935,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x015A)
     (->lowercase
-     ((name . "fullwidth latin small letter s with acute")))
+     ((name		  . "fullwidth latin small letter s with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER S WITH ACUTE")
       (ucs		  . #x015A)	; Ś
@@ -2891,7 +2970,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x015B)
     (->uppercase
-     ((name . "FULLWIDTH LATIN CAPITAL LETTER S WITH ACUTE")))
+     ((name . "FULLWIDTH LATIN CAPITAL LETTER S WITH ACUTE")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER S WITH ACUTE")
       (ucs		  . #x015B)	; ś
@@ -2924,7 +3004,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x015C)
     (->lowercase
-     ((name . "fullwidth latin small letter s with circumflex")))
+     ((name . "fullwidth latin small letter s with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER S WITH CIRCUMFLEX")
       (ucs		  . #x015C)	; Ŝ
@@ -2939,7 +3020,7 @@
     (mirrored		. nil)
     (->decomposition	#x0073 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter s with circumflex")
+     ((name . "fullwidth latin small letter s with circumflex")
       (japanese-jisx0212	  . #x2B5D)	; ø»Š³¸
       (japanese-jisx0213-1	  . #x2A63)	; ø»¢¡Œ
       ))
@@ -2951,14 +3032,15 @@
     (ucs		. #x015D)	; ŝ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter s with circumflex")
+  '((name . "fullwidth latin small letter s with circumflex")
     (=>ucs		. #x015D)	; ŝ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x015D)
     (->uppercase
-     ((name . "fullwidth latin capital letter s with circumflex")))
+     ((name . "fullwidth latin capital letter s with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER S WITH CIRCUMFLEX")
       (ucs		  . #x015D)	; ŝ
@@ -2973,7 +3055,7 @@
     (mirrored		. nil)
     (->decomposition	#x0053 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter s with cedilla")
+     ((name . "fullwidth latin capital letter s with cedilla")
       (japanese-jisx0212	  . #x2A5F)	; ø»Š²œ
       (japanese-jisx0213-1	  . #x2A27)	; ø»¢ 
       ))
@@ -2987,14 +3069,15 @@
     (ucs		. #x015E)	; Ş
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter s with cedilla")
+  '((name . "fullwidth latin capital letter s with cedilla")
     (=>ucs		. #x015E)	; Ş
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x015E)
     (->lowercase
-     ((name . "fullwidth latin small letter s with cedilla")))
+     ((name . "fullwidth latin small letter s with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER S WITH CEDILLA")
       (ucs		  . #x015E)	; Ş
@@ -3009,7 +3092,7 @@
     (mirrored		. nil)
     (->decomposition	#x0073 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter s with cedilla")
+     ((name . "fullwidth latin small letter s with cedilla")
       (japanese-jisx0212	  . #x2B5F)	; ø»Š³º
       (japanese-jisx0213-1	  . #x2A33)	; ø»¢ œ
       ))
@@ -3030,7 +3113,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x015F)
     (->uppercase
-     ((name . "fullwidth latin capital letter s with cedilla")))
+     ((name . "fullwidth latin capital letter s with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER S WITH CEDILLA")
       (ucs		  . #x015F)	; ş
@@ -3045,7 +3129,7 @@
     (mirrored		. nil)
     (->decomposition	#x0053 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter s with caron")
+     ((name . "fullwidth latin capital letter s with caron")
       (japanese-jisx0212	  . #x2A5E)	; ø»Š²›
       (japanese-jisx0213-1	  . #x2A26)	; ø»¢ 
       ))
@@ -3065,7 +3149,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0160)
     (->lowercase
-     ((name . "fullwidth latin small letter s with caron")))
+     ((name		  . "fullwidth latin small letter s with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER S WITH CARON")
       (ucs		  . #x0160)	; Å 
@@ -3100,7 +3185,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0161)
     (->uppercase
-     ((name . "fullwidth latin capital letter s with caron")))
+     ((name . "fullwidth latin capital letter s with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER S WITH CARON")
       (ucs		  . #x0161)	; Å¡
@@ -3115,7 +3201,7 @@
     (mirrored		. nil)
     (->decomposition	#x0054 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter t with cedilla")
+     ((name . "fullwidth latin capital letter t with cedilla")
       (japanese-jisx0212	  . #x2A61)	; ø»Š²ž
       (japanese-jisx0213-1	  . #x2A47)	; ø»¢ °
       ))
@@ -3127,14 +3213,15 @@
     (ucs		. #x0162)	; Ţ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter t with cedilla")
+  '((name . "fullwidth latin capital letter t with cedilla")
     (=>ucs		. #x0162)	; Ţ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0162)
     (->lowercase
-     ((name . "fullwidth latin small letter t with cedilla")))
+     ((name . "fullwidth latin small letter t with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER T WITH CEDILLA")
       (ucs		  . #x0162)	; Ţ
@@ -3149,7 +3236,7 @@
     (mirrored		. nil)
     (->decomposition	#x0074 #x0327)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter t with cedilla")
+     ((name . "fullwidth latin small letter t with cedilla")
       (japanese-jisx0212	  . #x2B61)	; ø»Š³¼
       (japanese-jisx0213-1	  . #x2A57)	; ø»¢¡€
       ))
@@ -3168,7 +3255,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0163)
     (->uppercase
-     ((name . "fullwidth latin capital letter t with cedilla")))
+     ((name . "fullwidth latin capital letter t with cedilla")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER T WITH CEDILLA")
       (ucs		  . #x0163)	; ţ
@@ -3183,7 +3271,7 @@
     (mirrored		. nil)
     (->decomposition	#x0054 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter t with caron")
+     ((name . "fullwidth latin capital letter t with caron")
       (japanese-jisx0212	  . #x2A60)	; ø»Š²
       (japanese-jisx0213-1	  . #x2A28)	; ø»¢ ‘
       ))
@@ -3202,7 +3290,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0164)
     (->lowercase
-     ((name . "fullwidth latin capital letter t with caron")))
+     ((name . "fullwidth latin capital letter t with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER T WITH CARON")
       (ucs		  . #x0164)	; Ť
@@ -3236,7 +3325,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0165)
     (->uppercase
-     ((name . "fullwidth latin capital letter t with caron")))
+     ((name . "fullwidth latin capital letter t with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER T WITH CARON")
       (ucs		  . #x0165)	; ť
@@ -3250,7 +3340,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter t with stroke")
+     ((name . "fullwidth latin capital letter t with stroke")
       (korean-ksc5601	  . #x282E)	; ø»ˆ¤«
       (japanese-jisx0212  . #x292F)	; ø»Š°Ž
       ))
@@ -3269,7 +3359,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0166)
     (->lowercase
-     ((name . "fullwidth latin small letter t with stroke")))
+     ((name		  . "fullwidth latin small letter t with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER T WITH STROKE")
       (ucs		  . #x0166)	; Ŧ
@@ -3302,7 +3393,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0167)
     (->uppercase
-     ((name . "fullwidth latin capital letter t with stroke")))
+     ((name . "fullwidth latin capital letter t with stroke")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER T WITH STROKE")
       (ucs		  . #x0167)	; ŧ
@@ -3317,17 +3409,17 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0303)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with tilde")
+     ((name . "fullwidth latin capital letter u with tilde")
       (japanese-jisx0212  . #x2A6C)	; ø»Š²©
       ))
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH TILDE")
       (ucs		  . #x0169)	; Å©
       ))
-    (latin-iso8859-4		. #xDD)	; øº’¹
-    (latin-viscii-upper		. #xFB)	; øº’ž»
-    (latin-viscii		. #x9D)	; øº’ž»
-    (ucs			. #x0168)	; Ũ
+    (latin-iso8859-4	. #xDD)	; øº’¹
+    (latin-viscii-upper . #xFB)	; øº’ž»
+    (latin-viscii	. #x9D)	; øº’ž»
+    (ucs		. #x0168)	; Ũ
     ))
 (define-char
   '((name		. "fullwidth latin capital letter u with tilde")
@@ -3337,7 +3429,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0168)
     (->lowercase
-     ((name . "fullwidth latin capital letter u with tilde")))
+     ((name . "fullwidth latin capital letter u with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH TILDE")
       (ucs		  . #x0168)	; Ũ
@@ -3358,11 +3451,11 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH TILDE")
       (ucs		  . #x0168)	; Ũ
       ))
-    (latin-iso8859-4		. #xFD)	; øº’¹½
-    (latin-tcvn5712		. #xF2)	; øº“š²
-    (latin-viscii-lower		. #xFB)	; øº’›
-    (latin-viscii		. #xFB)	; øº’›
-    (ucs			. #x0169)	; Å©
+    (latin-iso8859-4	. #xFD)	; øº’¹½
+    (latin-tcvn5712	. #xF2)	; øº“š²
+    (latin-viscii-lower . #xFB)	; øº’›
+    (latin-viscii	. #xFB)	; øº’›
+    (ucs		. #x0169)	; Å©
     ))
 (define-char
   '((name		. "fullwidth latin small letter u with tilde")
@@ -3372,7 +3465,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0169)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with tilde")))
+     ((name . "fullwidth latin capital letter u with tilde")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH TILDE")
       (ucs		  . #x0169)	; Å©
@@ -3386,7 +3480,7 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0304)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with macron")
+     ((name . "fullwidth latin capital letter u with macron")
       (japanese-jisx0212  . #x2A69)	; ø»Š²¦
       ))
     (->lowercase
@@ -3404,7 +3498,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x016A)
     (->lowercase
-     ((name . "fullwidth latin small letter u with macron")))
+     ((name		  . "fullwidth latin small letter u with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH MACRON")
       (ucs		  . #x016A)	; Ū
@@ -3439,7 +3534,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x016B)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with macron")))
+     ((name . "fullwidth latin capital letter u with macron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH MACRON")
       (ucs		  . #x016B)	; Å«
@@ -3455,7 +3551,7 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0306)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with breve")
+     ((name . "fullwidth latin capital letter u with breve")
       (japanese-jisx0212	  . #x2A66)	; ø»Š²£
       (japanese-jisx0213-1	  . #x2A5E)	; ø»¢¡‡
       ))
@@ -3474,7 +3570,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x016C)
     (->lowercase
-     ((name . "fullwidth latin small letter u with breve")))
+     ((name		  . "fullwidth latin small letter u with breve")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH BREVE")
       (ucs		  . #x016C)	; Ŭ
@@ -3508,7 +3605,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x016D)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with breve")))
+     ((name . "fullwidth latin capital letter u with breve")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH BREVE")
       (ucs		  . #x016D)	; Å­
@@ -3542,7 +3640,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x016E)
     (->lowercase
-     ((name . "fullwidth latin small letter u with ring above")))
+     ((name . "fullwidth latin small letter u with ring above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH RING ABOVE")
       (ucs		  . #x016E)	; Å®
@@ -3557,7 +3656,7 @@
     (mirrored		. nil)
     (->decomposition	#x0075 #x030A)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter u with ring above")
+     ((name . "fullwidth latin small letter u with ring above")
       (japanese-jisx0212	  . #x2B6B)	; ø»Š´†
       (japanese-jisx0213-1	  . #x2A55)	; ø»¢ ¾
       ))
@@ -3569,14 +3668,15 @@
     (ucs		. #x016F)	; ů
     ))
 (define-char
-  '((name		. "fullwidth latin small letter u with ring above")
+  '((name . "fullwidth latin small letter u with ring above")
     (=>ucs		. #x016F)	; ů
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x016F)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with ring above")))
+     ((name . "fullwidth latin capital letter u with ring above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH RING ABOVE")
       (ucs		  . #x016F)	; ů
@@ -3610,7 +3710,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0170)
     (->lowercase
-     ((name . "fullwidth latin small letter u with double acute")))
+     ((name . "fullwidth latin small letter u with double acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH DOUBLE ACUTE")
       (ucs		  . #x0170)	; Å°
@@ -3644,7 +3745,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0171)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with double acute")))
+     ((name . "fullwidth latin capital letter u with double acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH DOUBLE ACUTE")
       (ucs		  . #x0171)	; ű
@@ -3659,7 +3761,7 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x0328)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with ogonek")
+     ((name . "fullwidth latin capital letter u with ogonek")
       (japanese-jisx0212  . #x2A6A)	; ø»Š²§
       ))
     (->lowercase
@@ -3677,7 +3779,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0172)
     (->lowercase
-     ((name . "fullwidth latin small letter u with ogonek")))
+     ((name		  . "fullwidth latin small letter u with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH OGONEK")
       (ucs		  . #x0172)	; Ų
@@ -3709,7 +3812,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0173)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with ogonek")))
+     ((name . "fullwidth latin capital letter u with ogonek")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH OGONEK")
       (ucs		  . #x0173)	; ų
@@ -3740,7 +3844,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0174)
     (->lowercase
-     ((name . "fullwidth latin small letter w with circumflex")))
+     ((name . "fullwidth latin small letter w with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER W WITH CIRCUMFLEX")
       (ucs		  . #x0174)	; Å´
@@ -3754,7 +3859,7 @@
     (mirrored		. nil)
     (->decomposition	#x0077 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter w with circumflex")
+     ((name . "fullwidth latin small letter w with circumflex")
       (japanese-jisx0212  . #x2B71)	; ø»Š´Œ
       ))
     (->uppercase
@@ -3764,14 +3869,15 @@
     (ucs		. #x0175)	; ŵ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter w with circumflex")
+  '((name . "fullwidth latin small letter w with circumflex")
     (=>ucs		. #x0175)	; ŵ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0175)
     (->uppercase
-     ((name . "fullwidth latin capital letter w with circumflex")))
+     ((name . "fullwidth latin capital letter w with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER W WITH CIRCUMFLEX")
       (ucs		  . #x0175)	; ŵ
@@ -3802,7 +3908,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0176)
     (->lowercase
-     ((name . "fullwidth latin small letter y with circumflex")))
+     ((name . "fullwidth latin small letter y with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER Y WITH CIRCUMFLEX")
       (ucs		  . #x0176)	; Ŷ
@@ -3816,7 +3923,7 @@
     (mirrored		. nil)
     (->decomposition	#x0079 #x0302)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter y with circumflex")
+     ((name . "fullwidth latin small letter y with circumflex")
       (japanese-jisx0212  . #x2B74)	; ø»Š´
       ))
     (->uppercase
@@ -3826,14 +3933,15 @@
     (ucs		. #x0177)	; Å·
     ))
 (define-char
-  '((name		. "fullwidth latin small letter y with circumflex")
+  '((name . "fullwidth latin small letter y with circumflex")
     (=>ucs		. #x0177)	; Å·
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0177)
     (->uppercase
-     ((name . "fullwidth latin capital letter y with circumflex")))
+     ((name . "fullwidth latin capital letter y with circumflex")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Y WITH CIRCUMFLEX")
       (ucs		  . #x0177)	; Å·
@@ -3847,7 +3955,7 @@
     (mirrored		. nil)
     (->decomposition	#x0059 #x0308)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter y with diaeresis")
+     ((name . "fullwidth latin capital letter y with diaeresis")
       (japanese-jisx0212  . #x2A73)	; ø»Š²°
       ))
     (->lowercase
@@ -3857,14 +3965,15 @@
     (ucs		. #x0178)	; Ÿ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter y with diaeresis")
+  '((name . "fullwidth latin capital letter y with diaeresis")
     (=>ucs		. #x0178)	; Ÿ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0178)
     (->lowercase
-     ((name . "fullwidth latin small letter y with diaeresis")))
+     ((name . "fullwidth latin small letter y with diaeresis")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER Y WITH DIAERESIS")
       (ucs		  . #x0178)	; Ÿ
@@ -3878,7 +3987,7 @@
     (mirrored		. nil)
     (->decomposition	#x005A #x0301)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter z with acute")
+     ((name . "fullwidth latin capital letter z with acute")
       (japanese-jisx0212	  . #x2A75)	; ø»Š²²
       (japanese-jisx0213-1	  . #x2A29)	; ø»¢ ’
       ))
@@ -3897,7 +4006,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0179)
     (->lowercase
-     ((name . "fullwidth latin small letter z with acute")))
+     ((name		  . "fullwidth latin small letter z with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER Z WITH ACUTE")
       (ucs		  . #x0179)	; Ź
@@ -3931,7 +4041,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x017A)
     (->uppercase
-     ((name . "fullwidth latin capital letter z with acute")))
+     ((name . "fullwidth latin capital letter z with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Z WITH ACUTE")
       (ucs		  . #x017A)	; ź
@@ -3946,7 +4057,7 @@
     (mirrored		. nil)
     (->decomposition	#x005A #x0307)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter z with dot above")
+     ((name . "fullwidth latin capital letter z with dot above")
       (japanese-jisx0212	  . #x2A77)	; ø»Š²´
       (japanese-jisx0213-1	  . #x2A2B)	; ø»¢ ”
       ))
@@ -3959,14 +4070,15 @@
     (ucs		. #x017B)	; Å»
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter z with dot above")
+  '((name . "fullwidth latin capital letter z with dot above")
     (=>ucs		. #x017B)	; Å»
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x017B)
     (->lowercase
-     ((name . "fullwidth latin small letter z with dot above")))
+     ((name . "fullwidth latin small letter z with dot above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER Z WITH DOT ABOVE")
       (ucs		  . #x017B)	; Å»
@@ -3981,7 +4093,7 @@
     (mirrored		. nil)
     (->decomposition	#x007A #x0307)
     (->fullwidth
-     ((name		  . "fullwidth latin small letter z with dot above")
+     ((name . "fullwidth latin small letter z with dot above")
       (japanese-jisx0212	  . #x2B77)	; ø»Š´’
       (japanese-jisx0213-1	  . #x2A38)	; ø»¢ ¡
       ))
@@ -3994,14 +4106,15 @@
     (ucs		. #x017C)	; ż
     ))
 (define-char
-  '((name		. "fullwidth latin small letter z with dot above")
+  '((name . "fullwidth latin small letter z with dot above")
     (=>ucs		. #x017C)	; ż
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x017C)
     (->uppercase
-     ((name . "fullwidth latin capital letter z with dot above")))
+     ((name . "fullwidth latin capital letter z with dot above")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Z WITH DOT ABOVE")
       (ucs		  . #x017C)	; ż
@@ -4016,7 +4129,7 @@
     (mirrored		. nil)
     (->decomposition	#x005A #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter z with caron")
+     ((name . "fullwidth latin capital letter z with caron")
       (japanese-jisx0212	  . #x2A76)	; ø»Š²³
       (japanese-jisx0213-1	  . #x2A2A)	; ø»¢ “
       ))
@@ -4036,7 +4149,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x017D)
     (->lowercase
-     ((name . "fullwidth latin small letter z with caron")))
+     ((name		  . "fullwidth latin small letter z with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER Z WITH CARON")
       (ucs		  . #x017D)	; Ž
@@ -4071,7 +4185,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x017E)
     (->uppercase
-     ((name . "fullwidth latin capital letter z with caron")))
+     ((name . "fullwidth latin capital letter z with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER Z WITH CARON")
       (ucs		  . #x017E)	; ž
diff --git a/lisp/utf-2000/u00180-Latin-Extended-B.el b/lisp/utf-2000/u00180-Latin-Extended-B.el
index 670a156..4e7e86b 100644
--- a/lisp/utf-2000/u00180-Latin-Extended-B.el
+++ b/lisp/utf-2000/u00180-Latin-Extended-B.el
@@ -222,7 +222,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0193)
     (->lowercase
-     ((name . "fullwidth latin small letter g with hook")))
+     ((name		  . "fullwidth latin small letter g with hook")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
       (ucs		  . #x0193)	; Ɠ
@@ -360,10 +361,10 @@
      ((name		  . "LATIN SMALL LETTER O WITH HORN")
       (ucs		  . #x01A1)	; Æ¡
       ))
-    (latin-tcvn5712		. #xA5)	; øº“™¥
-    (latin-viscii-upper		. #xBD)	; øº’½
-    (latin-viscii		. #xB4)	; øº’½
-    (ucs			. #x01A0)	; Æ 
+    (latin-tcvn5712	. #xA5)	; øº“™¥
+    (latin-viscii-upper . #xBD)	; øº’½
+    (latin-viscii	. #xB4)	; øº’½
+    (ucs		. #x01A0)	; Æ 
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH HORN")
@@ -375,10 +376,10 @@
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
       (ucs		  . #x01A0)	; Æ 
       ))
-    (latin-tcvn5712		. #xAC)	; øº“™¬
-    (latin-viscii-lower		. #xBD)	; øº’œ
-    (latin-viscii		. #xBD)	; øº’œ
-    (ucs			. #x01A1)	; Æ¡
+    (latin-tcvn5712	. #xAC)	; øº“™¬
+    (latin-viscii-lower . #xBD)	; øº’œ
+    (latin-viscii	. #xBD)	; øº’œ
+    (ucs		. #x01A1)	; Æ¡
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER OI")
@@ -527,10 +528,10 @@
      ((name		  . "LATIN SMALL LETTER U WITH HORN")
       (ucs		  . #x01B0)	; Æ°
       ))
-    (latin-tcvn5712		. #xA6)	; øº“™¦
-    (latin-viscii-upper		. #xDF)	; øº’žŸ
-    (latin-viscii		. #xBF)	; øº’žŸ
-    (ucs			. #x01AF)	; Ư
+    (latin-tcvn5712	. #xA6)	; øº“™¦
+    (latin-viscii-upper . #xDF)	; øº’žŸ
+    (latin-viscii	. #xBF)	; øº’žŸ
+    (ucs		. #x01AF)	; Ư
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH HORN")
@@ -542,10 +543,10 @@
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
       (ucs		  . #x01AF)	; Ư
       ))
-    (latin-tcvn5712		. #xAD)	; øº“™­
-    (latin-viscii-lower		. #xDF)	; øº’œ¿
-    (latin-viscii		. #xDF)	; øº’œ¿
-    (ucs			. #x01B0)	; Æ°
+    (latin-tcvn5712	. #xAD)	; øº“™­
+    (latin-viscii-lower . #xDF)	; øº’œ¿
+    (latin-viscii	. #xDF)	; øº’œ¿
+    (ucs		. #x01B0)	; Æ°
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER UPSILON")
@@ -683,7 +684,7 @@
     (ucs		. #x01BD)	; ƽ
     ))
 (define-char
-  '((name		. "LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE")
+  '((name . "LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -880,7 +881,7 @@
     (mirrored		. nil)
     (->decomposition	#x0041 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter a with caron")
+     ((name . "fullwidth latin capital letter a with caron")
       (japanese-jisx0212	  . #x2A26)	; ø»Š±£
       (japanese-jisx0213-1	  . #x286F)	; ø»¢žœ
       ))
@@ -898,7 +899,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01CD)
     (->lowercase
-     ((name . "fullwidth latin small letter a with caron")))
+     ((name		  . "fullwidth latin small letter a with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
       (ucs		  . #x01CD)	; Ǎ
@@ -932,7 +934,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01CE)
     (->uppercase
-     ((name . "fullwidth latin capital letter a with caron")))
+     ((name . "fullwidth latin capital letter a with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER A WITH CARON")
       (ucs		  . #x01CE)	; ǎ
@@ -948,7 +951,7 @@
     (mirrored		. nil)
     (->decomposition	#x0049 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter i with caron")
+     ((name . "fullwidth latin capital letter i with caron")
       (japanese-jisx0212  . #x2A43)	; ø»Š²€
       ))
     (->lowercase
@@ -965,7 +968,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01CF)
     (->lowercase
-     ((name . "fullwidth latin small letter i with caron")))
+     ((name		  . "fullwidth latin small letter i with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
       (ucs		  . #x01CF)	; Ǐ
@@ -998,7 +1002,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D0)
     (->uppercase
-     ((name . "fullwidth latin capital letter i with caron")))
+     ((name . "fullwidth latin capital letter i with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER I WITH CARON")
       (ucs		  . #x01D0)	; ǐ
@@ -1014,7 +1019,7 @@
     (mirrored		. nil)
     (->decomposition	#x004F #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter o with caron")
+     ((name . "fullwidth latin capital letter o with caron")
       (japanese-jisx0212	  . #x2A55)	; ø»Š²’
       (japanese-jisx0213-1	  . #x2876)	; ø»¢ž£
       ))
@@ -1032,7 +1037,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D1)
     (->lowercase
-     ((name . "fullwidth latin small letter o with caron")))
+     ((name		  . "fullwidth latin small letter o with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
       (ucs		  . #x01D1)	; Ǒ
@@ -1066,7 +1072,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D2)
     (->uppercase
-     ((name . "fullwidth latin capital letter o with caron")))
+     ((name . "fullwidth latin capital letter o with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER O WITH CARON")
       (ucs		  . #x01D2)	; ǒ
@@ -1082,7 +1089,7 @@
     (mirrored		. nil)
     (->decomposition	#x0055 #x030C)
     (->fullwidth
-     ((name		  . "fullwidth latin capital letter u with caron")
+     ((name . "fullwidth latin capital letter u with caron")
       (japanese-jisx0212  . #x2A67)	; ø»Š²¤
       ))
     (->lowercase
@@ -1099,7 +1106,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D3)
     (->lowercase
-     ((name . "fullwidth latin small letter u with caron")))
+     ((name		  . "fullwidth latin small letter u with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
       (ucs		  . #x01D3)	; Ǔ
@@ -1132,7 +1140,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D4)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with caron")))
+     ((name . "fullwidth latin capital letter u with caron")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER U WITH CARON")
       (ucs		  . #x01D4)	; ǔ
@@ -1152,7 +1161,7 @@
       (japanese-jisx0212  . #x2A70)	; ø»Š²­
       ))
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
       (ucs		  . #x01D6)	; ǖ
       ))
     (ucs		. #x01D5)	; Ǖ
@@ -1165,7 +1174,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D5)
     (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and macron")))
+     ((name . "fullwidth latin small letter u with diaeresis and macron")
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (ucs		  . #x01D5)	; Ǖ
@@ -1173,7 +1183,7 @@
     (japanese-jisx0212	. #x2A70)	; ø»Š²­
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
+  '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1198,9 +1208,10 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D6)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and macron")))
+     ((name . "fullwidth latin capital letter u with diaeresis and macron")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
       (ucs		  . #x01D6)	; ǖ
       ))
     (chinese-gb2312		. #x2835)	; ø»„ª
@@ -1208,7 +1219,7 @@
     (japanese-jisx0213-1	. #x2879)	; ø»¢ž¦
     ))
 (define-char
-  '((name		. "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
+  '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1218,7 +1229,7 @@
       (japanese-jisx0212  . #x2A6D)	; ø»Š²ª
       ))
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
       (ucs		  . #x01D8)	; ǘ
       ))
     (ucs		. #x01D7)	; Ǘ
@@ -1231,15 +1242,16 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D7)
     (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and acute")))
+     ((name . "fullwidth latin small letter u with diaeresis and acute")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (ucs		  . #x01D7)	; Ǘ
       ))
     (japanese-jisx0212	. #x2A6D)	; ø»Š²ª
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
+  '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1251,7 +1263,7 @@
       (japanese-jisx0213-1	  . #x287A)	; ø»¢ž§
       ))
     (->uppercase
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (ucs		  . #x01D7)	; Ǘ
       ))
     (ucs		. #x01D8)	; ǘ
@@ -1264,9 +1276,10 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D8)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and acute")))
+     ((name . "fullwidth latin capital letter u with diaeresis and acute")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
       (ucs		  . #x01D8)	; ǘ
       ))
     (chinese-gb2312		. #x2836)	; ø»„«
@@ -1274,7 +1287,7 @@
     (japanese-jisx0213-1	. #x287A)	; ø»¢ž§
     ))
 (define-char
-  '((name		. "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
+  '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1284,7 +1297,7 @@
       (japanese-jisx0212  . #x2A6F)	; ø»Š²¬
       ))
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
       (ucs		  . #x01DA)	; ǚ
       ))
     (ucs		. #x01D9)	; Ǚ
@@ -1297,15 +1310,16 @@
     (mirrored		. nil)
     (->decomposition	wide #x01D9)
     (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and caron")))
+     ((name . "fullwidth latin small letter u with diaeresis and caron")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (ucs		  . #x01D9)	; Ǚ
       ))
     (japanese-jisx0212	. #x2A6F)	; ø»Š²¬
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
+  '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1317,7 +1331,7 @@
       (japanese-jisx0213-1	  . #x287B)	; ø»¢ž¨
       ))
     (->uppercase
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (ucs		  . #x01D9)	; Ǚ
       ))
     (ucs		. #x01DA)	; ǚ
@@ -1330,9 +1344,10 @@
     (mirrored		. nil)
     (->decomposition	wide #x01DA)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and caron")))
+     ((name . "fullwidth latin capital letter u with diaeresis and caron")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
       (ucs		  . #x01DA)	; ǚ
       ))
     (chinese-gb2312		. #x2837)	; ø»„¬
@@ -1340,7 +1355,7 @@
     (japanese-jisx0213-1	. #x287B)	; ø»¢ž¨
     ))
 (define-char
-  '((name		. "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
+  '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1350,7 +1365,7 @@
       (japanese-jisx0212  . #x2A6E)	; ø»Š²«
       ))
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
       (ucs		  . #x01DC)	; ǜ
       ))
     (ucs		. #x01DB)	; Ǜ
@@ -1363,15 +1378,16 @@
     (mirrored		. nil)
     (->decomposition	wide #x01DB)
     (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and grave")))
+     ((name . "fullwidth latin small letter u with diaeresis and grave")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (ucs		  . #x01DB)	; Ǜ
       ))
     (japanese-jisx0212	. #x2A6E)	; ø»Š²«
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
+  '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1383,7 +1399,7 @@
       (japanese-jisx0213-1	  . #x287C)	; ø»¢ž©
       ))
     (->uppercase
-     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (ucs		  . #x01DB)	; Ǜ
       ))
     (ucs		. #x01DC)	; ǜ
@@ -1396,9 +1412,10 @@
     (mirrored		. nil)
     (->decomposition	wide #x01DC)
     (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and grave")))
+     ((name . "fullwidth latin capital letter u with diaeresis and grave")
+      ))
     (<-fullwidth
-     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
       (ucs		  . #x01DC)	; ǜ
       ))
     (chinese-gb2312		. #x2838)	; ø»„­
@@ -1423,13 +1440,13 @@
     (mirrored		. nil)
     (->decomposition	#x00C4 #x0304)
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER A WITH DIAERESIS AND MACRON")
+     ((name . "LATIN SMALL LETTER A WITH DIAERESIS AND MACRON")
       (ucs		  . #x01DF)	; ǟ
       ))
     (ucs		. #x01DE)	; Ǟ
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER A WITH DIAERESIS AND MACRON")
+  '((name . "LATIN SMALL LETTER A WITH DIAERESIS AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1447,13 +1464,13 @@
     (mirrored		. nil)
     (->decomposition	#x0226 #x0304)
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON")
+     ((name . "LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON")
       (ucs		  . #x01E1)	; Ç¡
       ))
     (ucs		. #x01E0)	; Ç 
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON")
+  '((name . "LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1585,13 +1602,13 @@
     (ucs		. #x01EB)	; Ç«
     ))
 (define-char
-  '((name		. "LATIN CAPITAL LETTER O WITH OGONEK AND MACRON")
+  '((name . "LATIN CAPITAL LETTER O WITH OGONEK AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x01EA #x0304)
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER O WITH OGONEK AND MACRON")
+     ((name . "LATIN SMALL LETTER O WITH OGONEK AND MACRON")
       (ucs		  . #x01ED)	; Ç­
       ))
     (ucs		. #x01EC)	; Ǭ
@@ -1603,7 +1620,7 @@
     (mirrored		. nil)
     (->decomposition	#x01EB #x0304)
     (->uppercase
-     ((name		  . "LATIN CAPITAL LETTER O WITH OGONEK AND MACRON")
+     ((name . "LATIN CAPITAL LETTER O WITH OGONEK AND MACRON")
       (ucs		  . #x01EC)	; Ǭ
       ))
     (ucs		. #x01ED)	; Ç­
@@ -1724,7 +1741,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01F5)
     (->uppercase
-     ((name . "fullwidth latin capital letter g with acute")))
+     ((name . "fullwidth latin capital letter g with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
       (ucs		  . #x01F5)	; ǵ
@@ -1789,7 +1807,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01F9)
     (->uppercase
-     ((name . "fullwidth latin capital letter n with grave")))
+     ((name . "fullwidth latin capital letter n with grave")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
       (ucs		  . #x01F9)	; ǹ
@@ -1803,13 +1822,13 @@
     (mirrored		. nil)
     (->decomposition	#x00C5 #x0301)
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE")
+     ((name . "LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE")
       (ucs		  . #x01FB)	; Ç»
       ))
     (ucs		. #x01FA)	; Ǻ
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE")
+  '((name . "LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -1858,7 +1877,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x01FD)
     (->uppercase
-     ((name . "fullwidth latin capital letter ae with acute")))
+     ((name . "fullwidth latin capital letter ae with acute")
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
       (ucs		  . #x01FD)	; ǽ
@@ -1884,7 +1904,7 @@
     (mirrored		. nil)
     (->decomposition	#x00F8 #x0301)
     (->uppercase
-     ((name		  . "LATIN CAPITAL LETTER O WITH STROKE AND ACUTE")
+     ((name . "LATIN CAPITAL LETTER O WITH STROKE AND ACUTE")
       (ucs		  . #x01FE)	; Ǿ
       ))
     (ucs		. #x01FF)	; Ç¿
@@ -2370,13 +2390,13 @@
     (mirrored		. nil)
     (->decomposition	#x00D6 #x0304)
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER O WITH DIAERESIS AND MACRON")
+     ((name . "LATIN SMALL LETTER O WITH DIAERESIS AND MACRON")
       (ucs		  . #x022B)	; È«
       ))
     (ucs		. #x022A)	; Ȫ
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER O WITH DIAERESIS AND MACRON")
+  '((name . "LATIN SMALL LETTER O WITH DIAERESIS AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -2406,7 +2426,7 @@
     (mirrored		. nil)
     (->decomposition	#x00F5 #x0304)
     (->uppercase
-     ((name		  . "LATIN CAPITAL LETTER O WITH TILDE AND MACRON")
+     ((name . "LATIN CAPITAL LETTER O WITH TILDE AND MACRON")
       (ucs		  . #x022C)	; Ȭ
       ))
     (ucs		. #x022D)	; È­
@@ -2442,13 +2462,13 @@
     (mirrored		. nil)
     (->decomposition	#x022E #x0304)
     (->lowercase
-     ((name		  . "LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON")
+     ((name . "LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON")
       (ucs		  . #x0231)	; ȱ
       ))
     (ucs		. #x0230)	; È°
     ))
 (define-char
-  '((name		. "LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON")
+  '((name . "LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
diff --git a/lisp/utf-2000/u00250-IPA-Extensions.el b/lisp/utf-2000/u00250-IPA-Extensions.el
index 1c06e19..a2387cf 100644
--- a/lisp/utf-2000/u00250-IPA-Extensions.el
+++ b/lisp/utf-2000/u00250-IPA-Extensions.el
@@ -731,7 +731,7 @@
     (ucs			. #x02A1)	; Ê¡
     ))
 (define-char
-  '((name		. "LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE")
+  '((name . "LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
diff --git a/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el b/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
index 87a7b0c..d6c75b8 100644
--- a/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
+++ b/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
@@ -321,7 +321,7 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth modifier letter low vertical line")
+     ((name . "fullwidth modifier letter low vertical line")
       (japanese-jisx0213-1	  . #x2B54)	; ø»¢¢›
       ))
     (ipa		. #xF1)	; øº’›±
@@ -393,13 +393,13 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth modifier letter half triangular colon")
+     ((name . "fullwidth modifier letter half triangular colon")
       (japanese-jisx0213-1	  . #x2B56)	; ø»¢¢
       ))
     (ucs		. #x02D1)	; ˑ
     ))
 (define-char
-  '((name		. "fullwidth modifier letter half triangular colon")
+  '((name . "fullwidth modifier letter half triangular colon")
     (=>ucs		. #x02D1)	; ˑ
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
@@ -693,13 +693,13 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth modifier letter extra-high tone bar")
+     ((name . "fullwidth modifier letter extra-high tone bar")
       (japanese-jisx0213-1	  . #x2B60)	; ø»¢¢§
       ))
     (ucs		. #x02E5)	; ˥
     ))
 (define-char
-  '((name		. "fullwidth modifier letter extra-high tone bar")
+  '((name . "fullwidth modifier letter extra-high tone bar")
     (=>ucs		. #x02E5)	; ˥
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
@@ -789,7 +789,7 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "fullwidth modifier letter extra-low tone bar")
+     ((name . "fullwidth modifier letter extra-low tone bar")
       (japanese-jisx0213-1	  . #x2B64)	; ø»¢¢«
       ))
     (ucs		. #x02E9)	; Ë©
diff --git a/lisp/utf-2000/u00370-Greek.el b/lisp/utf-2000/u00370-Greek.el
index 51709ed..e08c50d 100644
--- a/lisp/utf-2000/u00370-Greek.el
+++ b/lisp/utf-2000/u00370-Greek.el
@@ -91,7 +91,7 @@
     (mirrored		. nil)
     (->decomposition	#x0391 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek capital letter alpha with tonos")
+     ((name . "fullwidth greek capital letter alpha with tonos")
       (japanese-jisx0212  . #x2661)	; ø»Š¬¦
       ))
     (->lowercase
@@ -102,14 +102,15 @@
     (ucs		. #x0386)	; Ά
     ))
 (define-char
-  '((name		. "fullwidth greek capital letter alpha with tonos")
+  '((name . "fullwidth greek capital letter alpha with tonos")
     (=>ucs		. #x0386)	; Ά
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0386)
     (->lowercase
-     ((name . "fullwidth greek small letter alpha with tonos")))
+     ((name . "fullwidth greek small letter alpha with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
       (ucs		  . #x0386)	; Ά
@@ -149,7 +150,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0388)
     (->lowercase
-     ((name . "fullwidth greek small letter epsilon with tonos")))
+     ((name . "fullwidth greek small letter epsilon with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
       (ucs		  . #x0388)	; Έ
@@ -163,7 +165,7 @@
     (mirrored		. nil)
     (->decomposition	#x0397 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek capital letter eta with tonos")
+     ((name . "fullwidth greek capital letter eta with tonos")
       (japanese-jisx0212  . #x2663)	; ø»Š¬¨
       ))
     (->lowercase
@@ -174,14 +176,15 @@
     (ucs		. #x0389)	; Ή
     ))
 (define-char
-  '((name		. "fullwidth greek capital letter eta with tonos")
+  '((name . "fullwidth greek capital letter eta with tonos")
     (=>ucs		. #x0389)	; Ή
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0389)
     (->lowercase
-     ((name . "fullwidth greek small letter eta with tonos")))
+     ((name . "fullwidth greek small letter eta with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
       (ucs		  . #x0389)	; Ή
@@ -195,7 +198,7 @@
     (mirrored		. nil)
     (->decomposition	#x0399 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek capital letter iota with tonos")
+     ((name . "fullwidth greek capital letter iota with tonos")
       (japanese-jisx0212  . #x2664)	; ø»Š¬©
       ))
     (->lowercase
@@ -206,14 +209,15 @@
     (ucs		. #x038A)	; Ί
     ))
 (define-char
-  '((name		. "fullwidth greek capital letter iota with tonos")
+  '((name . "fullwidth greek capital letter iota with tonos")
     (=>ucs		. #x038A)	; Ί
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x038A)
     (->lowercase
-     ((name . "fullwidth greek small letter iota with tonos")))
+     ((name . "fullwidth greek small letter iota with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
       (ucs		  . #x038A)	; Ί
@@ -245,7 +249,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x038C)
     (->lowercase
-     ((name . "fullwidth greek small letter omicron with tonos")))
+     ((name . "fullwidth greek small letter omicron with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
       (ucs		  . #x038C)	; Ό
@@ -277,7 +282,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x038E)
     (->lowercase
-     ((name . "fullwidth greek small letter upsilon with tonos")))
+     ((name . "fullwidth greek small letter upsilon with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
       (ucs		  . #x038E)	; Ύ
@@ -291,7 +297,7 @@
     (mirrored		. nil)
     (->decomposition	#x03A9 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek capital letter omega with tonos")
+     ((name . "fullwidth greek capital letter omega with tonos")
       (japanese-jisx0212  . #x266C)	; ø»Š¬±
       ))
     (->lowercase
@@ -302,14 +308,15 @@
     (ucs		. #x038F)	; Ώ
     ))
 (define-char
-  '((name		. "fullwidth greek capital letter omega with tonos")
+  '((name . "fullwidth greek capital letter omega with tonos")
     (=>ucs		. #x038F)	; Ώ
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x038F)
     (->lowercase
-     ((name . "fullwidth greek small letter omega with tonos")))
+     ((name . "fullwidth greek small letter omega with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
       (ucs		  . #x038F)	; Ώ
@@ -370,7 +377,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0391)
     (->lowercase
-     ((name . "fullwidth greek small letter alpha")))
+     ((name		  . "fullwidth greek small letter alpha")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER ALPHA")
       (ucs		  . #x0391)	; Α
@@ -411,7 +419,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0392)
     (->lowercase
-     ((name . "fullwidth greek small letter beta")))
+     ((name		  . "fullwidth greek small letter beta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER BETA")
       (ucs		  . #x0392)	; Β
@@ -452,7 +461,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0393)
     (->lowercase
-     ((name . "fullwidth greek small letter gamma")))
+     ((name		  . "fullwidth greek small letter gamma")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER GAMMA")
       (ucs		  . #x0393)	; Γ
@@ -493,7 +503,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0394)
     (->lowercase
-     ((name . "fullwidth greek small letter delta")))
+     ((name		  . "fullwidth greek small letter delta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER DELTA")
       (ucs		  . #x0394)	; Δ
@@ -534,7 +545,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0395)
     (->lowercase
-     ((name . "fullwidth greek small letter epsilon")))
+     ((name		  . "fullwidth greek small letter epsilon")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER EPSILON")
       (ucs		  . #x0395)	; Ε
@@ -575,7 +587,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0396)
     (->lowercase
-     ((name . "fullwidth greek small letter zeta")))
+     ((name		  . "fullwidth greek small letter zeta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER ZETA")
       (ucs		  . #x0396)	; Ζ
@@ -616,7 +629,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0397)
     (->lowercase
-     ((name . "fullwidth greek small letter eta")))
+     ((name		  . "fullwidth greek small letter eta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER ETA")
       (ucs		  . #x0397)	; Η
@@ -657,7 +671,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0398)
     (->lowercase
-     ((name . "fullwidth greek small letter theta")))
+     ((name		  . "fullwidth greek small letter theta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER THETA")
       (ucs		  . #x0398)	; Θ
@@ -698,7 +713,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0399)
     (->lowercase
-     ((name . "fullwidth greek small letter iota")))
+     ((name		  . "fullwidth greek small letter iota")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER IOTA")
       (ucs		  . #x0399)	; Ι
@@ -739,7 +755,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x039A)
     (->lowercase
-     ((name . "fullwidth greek small letter kappa")))
+     ((name		  . "fullwidth greek small letter kappa")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER KAPPA")
       (ucs		  . #x039A)	; Κ
@@ -780,7 +797,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x039B)
     (->lowercase
-     ((name . "fullwidth greek small letter lamda")))
+     ((name		  . "fullwidth greek small letter lamda")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER LAMDA")
       (ucs		  . #x039B)	; Λ
@@ -821,7 +839,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x039C)
     (->lowercase
-     ((name . "fullwidth greek small letter mu")))
+     ((name		  . "fullwidth greek small letter mu")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER MU")
       (ucs		  . #x039C)	; Μ
@@ -862,7 +881,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x039D)
     (->lowercase
-     ((name . "fullwidth greek small letter nu")))
+     ((name		  . "fullwidth greek small letter nu")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER NU")
       (ucs		  . #x039D)	; Ν
@@ -903,7 +923,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x039E)
     (->lowercase
-     ((name . "fullwidth greek small letter xi")))
+     ((name		  . "fullwidth greek small letter xi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER XI")
       (ucs		  . #x039E)	; Ξ
@@ -944,7 +965,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x039F)
     (->lowercase
-     ((name . "fullwidth greek small letter omicron")))
+     ((name		  . "fullwidth greek small letter omicron")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER OMICRON")
       (ucs		  . #x039F)	; Ο
@@ -985,7 +1007,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A0)
     (->lowercase
-     ((name . "fullwidth greek small letter pi")))
+     ((name		  . "fullwidth greek small letter pi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER PI")
       (ucs		  . #x03A0)	; Π
@@ -1026,7 +1049,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A1)
     (->lowercase
-     ((name . "fullwidth greek small letter rho")))
+     ((name		  . "fullwidth greek small letter rho")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER RHO")
       (ucs		  . #x03A1)	; Ρ
@@ -1067,7 +1091,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A3)
     (->lowercase
-     ((name . "fullwidth greek small letter sigma")))
+     ((name		  . "fullwidth greek small letter sigma")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER SIGMA")
       (ucs		  . #x03A3)	; Σ
@@ -1108,7 +1133,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A4)
     (->lowercase
-     ((name . "fullwidth greek small letter tau")))
+     ((name		  . "fullwidth greek small letter tau")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER TAU")
       (ucs		  . #x03A4)	; Τ
@@ -1149,7 +1175,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A5)
     (->lowercase
-     ((name . "fullwidth greek small letter upsilon")))
+     ((name		  . "fullwidth greek small letter upsilon")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER UPSILON")
       (ucs		  . #x03A5)	; Υ
@@ -1190,7 +1217,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A6)
     (->lowercase
-     ((name . "fullwidth greek small letter phi")))
+     ((name		  . "fullwidth greek small letter phi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER PHI")
       (ucs		  . #x03A6)	; Φ
@@ -1231,7 +1259,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A7)
     (->lowercase
-     ((name . "fullwidth greek small letter chi")))
+     ((name		  . "fullwidth greek small letter chi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER CHI")
       (ucs		  . #x03A7)	; Χ
@@ -1272,7 +1301,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A8)
     (->lowercase
-     ((name . "fullwidth greek small letter psi")))
+     ((name		  . "fullwidth greek small letter psi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER PSI")
       (ucs		  . #x03A8)	; Ψ
@@ -1313,7 +1343,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03A9)
     (->lowercase
-     ((name . "fullwidth greek small letter omega")))
+     ((name		  . "fullwidth greek small letter omega")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER OMEGA")
       (ucs		  . #x03A9)	; Ω
@@ -1351,7 +1382,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03AA)
     (->lowercase
-     ((name . "fullwidth greek small letter iota with dialytika")))
+     ((name . "fullwidth greek small letter iota with dialytika")
+      ))
     (<-fullwidth
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH DIALYTIKA")
       (ucs		  . #x03AA)	; Ϊ
@@ -1383,9 +1415,10 @@
     (mirrored		. nil)
     (->decomposition	wide #x03AB)
     (->lowercase
-     ((name . "fullwidth greek small letter upsilon with dialytika")))
+     ((name . "fullwidth greek small letter upsilon with dialytika")
+      ))
     (<-fullwidth
-     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA")
+     ((name . "GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA")
       (ucs		  . #x03AB)	; Ϋ
       ))
     (japanese-jisx0212	. #x266A)	; ø»Š¬¯
@@ -1397,7 +1430,7 @@
     (mirrored		. nil)
     (->decomposition	#x03B1 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter alpha with tonos")
+     ((name . "fullwidth greek small letter alpha with tonos")
       (japanese-jisx0212  . #x2671)	; ø»Š¬¶
       ))
     (->uppercase
@@ -1408,14 +1441,15 @@
     (ucs		. #x03AC)	; ά
     ))
 (define-char
-  '((name		. "fullwidth greek small letter alpha with tonos")
+  '((name . "fullwidth greek small letter alpha with tonos")
     (=>ucs		. #x03AC)	; ά
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x03AC)
     (->uppercase
-     ((name . "fullwidth greek capital letter alpha with tonos")))
+     ((name . "fullwidth greek capital letter alpha with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
       (ucs		  . #x03AC)	; ά
@@ -1429,7 +1463,7 @@
     (mirrored		. nil)
     (->decomposition	#x03B5 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter epsilon with tonos")
+     ((name . "fullwidth greek small letter epsilon with tonos")
       (japanese-jisx0212  . #x2672)	; ø»Š¬·
       ))
     (->uppercase
@@ -1440,14 +1474,15 @@
     (ucs		. #x03AD)	; έ
     ))
 (define-char
-  '((name		. "fullwidth greek small letter epsilon with tonos")
+  '((name . "fullwidth greek small letter epsilon with tonos")
     (=>ucs		. #x03AD)	; έ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x03AD)
     (->uppercase
-     ((name . "fullwidth greek capital letter epsilon with tonos")))
+     ((name . "fullwidth greek capital letter epsilon with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
       (ucs		  . #x03AD)	; έ
@@ -1461,7 +1496,7 @@
     (mirrored		. nil)
     (->decomposition	#x03B7 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter eta with tonos")
+     ((name . "fullwidth greek small letter eta with tonos")
       (japanese-jisx0212  . #x2673)	; ø»Š¬¸
       ))
     (->uppercase
@@ -1479,7 +1514,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03AE)
     (->uppercase
-     ((name . "fullwidth greek capital letter eta with tonos")))
+     ((name . "fullwidth greek capital letter eta with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
       (ucs		  . #x03AE)	; ή
@@ -1493,7 +1529,7 @@
     (mirrored		. nil)
     (->decomposition	#x03B9 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter iota with tonos")
+     ((name . "fullwidth greek small letter iota with tonos")
       (japanese-jisx0212  . #x2674)	; ø»Š¬¹
       ))
     (->uppercase
@@ -1511,7 +1547,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03AF)
     (->uppercase
-     ((name . "fullwidth greek capital letter iota with tonos")))
+     ((name . "fullwidth greek capital letter iota with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
       (ucs		  . #x03AF)	; ί
@@ -1572,7 +1609,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B1)
     (->uppercase
-     ((name . "fullwidth greek capital letter alpha")))
+     ((name		  . "fullwidth greek capital letter alpha")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ALPHA")
       (ucs		  . #x03B1)	; α
@@ -1613,7 +1651,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B2)
     (->uppercase
-     ((name . "fullwidth greek capital letter beta")))
+     ((name		  . "fullwidth greek capital letter beta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER BETA")
       (ucs		  . #x03B2)	; β
@@ -1654,7 +1693,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B3)
     (->uppercase
-     ((name . "fullwidth greek capital letter gamma")))
+     ((name		  . "fullwidth greek capital letter gamma")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER GAMMA")
       (ucs		  . #x03B3)	; γ
@@ -1695,7 +1735,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B4)
     (->uppercase
-     ((name . "fullwidth greek capital letter delta")))
+     ((name		  . "fullwidth greek capital letter delta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER DELTA")
       (ucs		  . #x03B4)	; δ
@@ -1736,7 +1777,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B5)
     (->uppercase
-     ((name . "fullwidth greek capital letter epsilon")))
+     ((name		  . "fullwidth greek capital letter epsilon")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER EPSILON")
       (ucs		  . #x03B5)	; ε
@@ -1777,7 +1819,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B6)
     (->uppercase
-     ((name . "fullwidth greek capital letter zeta")))
+     ((name		  . "fullwidth greek capital letter zeta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ZETA")
       (ucs		  . #x03B6)	; ζ
@@ -1818,7 +1861,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B7)
     (->uppercase
-     ((name . "fullwidth greek capital letter eta")))
+     ((name		  . "fullwidth greek capital letter eta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER ETA")
       (ucs		  . #x03B7)	; η
@@ -1860,7 +1904,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B8)
     (->uppercase
-     ((name . "fullwidth greek capital letter theta")))
+     ((name		  . "fullwidth greek capital letter theta")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER THETA")
       (ucs		  . #x03B8)	; θ
@@ -1901,7 +1946,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03B9)
     (->uppercase
-     ((name . "fullwidth greek capital letter iota")))
+     ((name		  . "fullwidth greek capital letter iota")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER IOTA")
       (ucs		  . #x03B9)	; ι
@@ -1985,7 +2031,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03BB)
     (->uppercase
-     ((name . "fullwidth greek capital letter lamda")))
+     ((name		  . "fullwidth greek capital letter lamda")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER LAMDA")
       (ucs		  . #x03BB)	; λ
@@ -2026,7 +2073,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03BC)
     (->uppercase
-     ((name . "fullwidth greek capital letter mu")))
+     ((name		  . "fullwidth greek capital letter mu")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER MU")
       (ucs		  . #x03BC)	; μ
@@ -2067,7 +2115,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03BD)
     (->uppercase
-     ((name . "fullwidth greek capital letter nu")))
+     ((name		  . "fullwidth greek capital letter nu")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER NU")
       (ucs		  . #x03BD)	; ν
@@ -2108,7 +2157,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03BE)
     (->uppercase
-     ((name . "fullwidth greek capital letter xi")))
+     ((name		  . "fullwidth greek capital letter xi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER XI")
       (ucs		  . #x03BE)	; ξ
@@ -2149,7 +2199,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03BF)
     (->uppercase
-     ((name . "fullwidth greek capital letter omicron")))
+     ((name		  . "fullwidth greek capital letter omicron")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER OMICRON")
       (ucs		  . #x03BF)	; ο
@@ -2190,7 +2241,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C0)
     (->uppercase
-     ((name . "fullwidth greek capital letter pi")))
+     ((name		  . "fullwidth greek capital letter pi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER PI")
       (ucs		  . #x03C0)	; π
@@ -2231,7 +2283,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C1)
     (->uppercase
-     ((name . "fullwidth greek capital letter rho")))
+     ((name		  . "fullwidth greek capital letter rho")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER RHO")
       (ucs		  . #x03C1)	; ρ
@@ -2269,7 +2322,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C2)
     (->uppercase
-     ((name . "fullwidth greek capital letter final sigma")))
+     ((name		  . "fullwidth greek capital letter final sigma")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER FINAL SIGMA")
       (ucs		  . #x03C2)	; ς
@@ -2305,7 +2359,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C3)
     (->uppercase
-     ((name . "fullwidth greek capital letter sigma")))
+     ((name		  . "fullwidth greek capital letter sigma")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER SIGMA")
       (ucs		  . #x03C3)	; σ
@@ -2346,7 +2401,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C4)
     (->uppercase
-     ((name . "fullwidth greek capital letter tau")))
+     ((name		  . "fullwidth greek capital letter tau")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER TAU")
       (ucs		  . #x03C4)	; τ
@@ -2387,7 +2443,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C5)
     (->uppercase
-     ((name . "fullwidth greek capital letter upsilon")))
+     ((name		  . "fullwidth greek capital letter upsilon")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER UPSILON")
       (ucs		  . #x03C5)	; υ
@@ -2428,7 +2485,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C6)
     (->uppercase
-     ((name . "fullwidth greek capital letter phi")))
+     ((name		  . "fullwidth greek capital letter phi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER PHI")
       (ucs		  . #x03C6)	; φ
@@ -2469,7 +2527,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C7)
     (->uppercase
-     ((name . "fullwidth greek capital letter chi")))
+     ((name		  . "fullwidth greek capital letter chi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER CHI")
       (ucs		  . #x03C7)	; χ
@@ -2510,7 +2569,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C8)
     (->uppercase
-     ((name . "fullwidth greek capital letter psi")))
+     ((name		  . "fullwidth greek capital letter psi")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER PSI")
       (ucs		  . #x03C8)	; ψ
@@ -2551,7 +2611,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03C9)
     (->uppercase
-     ((name . "fullwidth greek capital letter omega")))
+     ((name		  . "fullwidth greek capital letter omega")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER OMEGA")
       (ucs		  . #x03C9)	; ω
@@ -2589,7 +2650,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03CA)
     (->uppercase
-     ((name . "fullwidth greek capital letter iota with dialytika")))
+     ((name . "fullwidth greek capital letter iota with dialytika")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER IOTA WITH DIALYTIKA")
       (ucs		  . #x03CA)	; ϊ
@@ -2607,7 +2669,7 @@
       (japanese-jisx0212  . #x267A)	; ø»Š¬¿
       ))
     (->uppercase
-     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA")
+     ((name . "GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA")
       (ucs		  . #x03AB)	; Ϋ
       ))
     (greek-iso8859-7	. #xFB)	; øº’¼»
@@ -2621,7 +2683,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x03CB)
     (->uppercase
-     ((name . "fullwidth greek capital letter upsilon with dialytika")))
+     ((name . "fullwidth greek capital letter upsilon with dialytika")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA")
       (ucs		  . #x03CB)	; ϋ
@@ -2635,7 +2698,7 @@
     (mirrored		. nil)
     (->decomposition	#x03BF #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter omicron with tonos")
+     ((name . "fullwidth greek small letter omicron with tonos")
       (japanese-jisx0212  . #x2677)	; ø»Š¬¼
       ))
     (->uppercase
@@ -2646,14 +2709,15 @@
     (ucs		. #x03CC)	; ό
     ))
 (define-char
-  '((name		. "fullwidth greek small letter omicron with tonos")
+  '((name . "fullwidth greek small letter omicron with tonos")
     (=>ucs		. #x03CC)	; ό
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x03CC)
     (->uppercase
-     ((name . "fullwidth greek capital letter omicron with tonos")))
+     ((name . "fullwidth greek capital letter omicron with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
       (ucs		  . #x03CC)	; ό
@@ -2667,7 +2731,7 @@
     (mirrored		. nil)
     (->decomposition	#x03C5 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter upsilon with tonos")
+     ((name . "fullwidth greek small letter upsilon with tonos")
       (japanese-jisx0212  . #x2679)	; ø»Š¬¾
       ))
     (->uppercase
@@ -2678,14 +2742,15 @@
     (ucs		. #x03CD)	; ύ
     ))
 (define-char
-  '((name		. "fullwidth greek small letter upsilon with tonos")
+  '((name . "fullwidth greek small letter upsilon with tonos")
     (=>ucs		. #x03CD)	; ύ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x03CD)
     (->uppercase
-     ((name . "fullwidth greek capital letter upsilon with tonos")))
+     ((name . "fullwidth greek capital letter upsilon with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
       (ucs		  . #x03CD)	; ύ
@@ -2699,7 +2764,7 @@
     (mirrored		. nil)
     (->decomposition	#x03C9 #x0301)
     (->fullwidth
-     ((name		  . "fullwidth greek small letter omega with tonos")
+     ((name . "fullwidth greek small letter omega with tonos")
       (japanese-jisx0212  . #x267C)	; ø»Š­
       ))
     (->uppercase
@@ -2710,14 +2775,15 @@
     (ucs		. #x03CE)	; ώ
     ))
 (define-char
-  '((name		. "fullwidth greek small letter omega with tonos")
+  '((name . "fullwidth greek small letter omega with tonos")
     (=>ucs		. #x03CE)	; ώ
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x03CE)
     (->uppercase
-     ((name . "fullwidth greek capital letter omega with tonos")))
+     ((name . "fullwidth greek capital letter omega with tonos")
+      ))
     (<-fullwidth
      ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
       (ucs		  . #x03CE)	; ώ
diff --git a/lisp/utf-2000/u00400-Cyrillic.el b/lisp/utf-2000/u00400-Cyrillic.el
index a1966fc..c82d009 100644
--- a/lisp/utf-2000/u00400-Cyrillic.el
+++ b/lisp/utf-2000/u00400-Cyrillic.el
@@ -38,7 +38,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0401)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER IO")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER IO")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER IO")
       (ucs		  . #x0401)	; Ё
@@ -76,7 +77,8 @@
     (iso-10646-comment	. "Serbocroatian")
     (->decomposition	wide #x0402)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER DJE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER DJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DJE")
       (ucs		  . #x0402)	; Ђ
@@ -108,7 +110,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0403)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER GJE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER GJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER GJE")
       (ucs		  . #x0403)	; Ѓ
@@ -121,7 +124,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER UKRAINIAN IE")
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER UKRAINIAN IE")
       (japanese-jisx0212  . #x2744)	; ø»Š­§
       ))
     (->lowercase
@@ -132,14 +135,15 @@
     (ucs		. #x0404)	; Є
     ))
 (define-char
-  '((name		. "FULLWIDTH CYRILLIC CAPITAL LETTER UKRAINIAN IE")
+  '((name . "FULLWIDTH CYRILLIC CAPITAL LETTER UKRAINIAN IE")
     (=>ucs		. #x0404)	; Є
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	wide #x0404)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER UKRAINIAN IE")))
+     ((name . "FULLWIDTH CYRILLIC SMALL LETTER UKRAINIAN IE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER UKRAINIAN IE")
       (ucs		  . #x0404)	; Є
@@ -170,7 +174,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0405)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER DZE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER DZE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DZE")
       (ucs		  . #x0405)	; Ѕ
@@ -187,7 +192,7 @@
       (japanese-jisx0212  . #x2746)	; ø»Š­©
       ))
     (->lowercase
-     ((name		  . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
+     ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
       (ucs		  . #x0456)	; і
       ))
     (cyrillic-iso8859-5 . #xA6)	; øº“„¦
@@ -201,7 +206,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0406)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")))
+     ((name . "FULLWIDTH CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
+      ))
     (<-fullwidth
      ((name . "CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
       (ucs		  . #x0406)	; І
@@ -235,7 +241,8 @@
     (iso-10646-comment	. "Ukrainian")
     (->decomposition	wide #x0407)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER YI")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER YI")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YI")
       (ucs		  . #x0407)	; Ї
@@ -266,7 +273,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0408)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER JE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER JE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER JE")
       (ucs		  . #x0408)	; Ј
@@ -297,7 +305,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0409)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER LJE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER LJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER LJE")
       (ucs		  . #x0409)	; Љ
@@ -328,7 +337,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x040A)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER NJE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER NJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER NJE")
       (ucs		  . #x040A)	; Њ
@@ -356,7 +366,8 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Serbocroatian")
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER TSHE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER TSHE")
+      ))
     (japanese-jisx0212	. #x274B)	; ø»Š­®
     ))
 (define-char
@@ -384,7 +395,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x040C)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER KJE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER KJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER KJE")
       (ucs		  . #x040C)	; Ќ
@@ -430,7 +442,8 @@
     (iso-10646-comment	. "Byelorussian")
     (->decomposition	wide #x040E)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER SHORT U")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER SHORT U")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT U")
       (ucs		  . #x040E)	; Ў
@@ -461,7 +474,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x040F)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER DZHE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER DZHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DZHE")
       (ucs		  . #x040F)	; Џ
@@ -495,7 +509,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0410)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER A")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER A")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER A")
       (ucs		  . #x0410)	; А
@@ -534,7 +549,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0411)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER BE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER BE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER BE")
       (ucs		  . #x0411)	; Б
@@ -573,7 +589,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0412)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER VE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER VE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER VE")
       (ucs		  . #x0412)	; В
@@ -612,7 +629,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0413)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER GHE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER GHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER GHE")
       (ucs		  . #x0413)	; Г
@@ -651,7 +669,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0414)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER DE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER DE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DE")
       (ucs		  . #x0414)	; Д
@@ -690,7 +709,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0415)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER IE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER IE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER IE")
       (ucs		  . #x0415)	; Е
@@ -729,7 +749,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0416)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER ZHE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER ZHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
       (ucs		  . #x0416)	; Ж
@@ -768,7 +789,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0417)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER ZE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER ZE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ZE")
       (ucs		  . #x0417)	; З
@@ -807,7 +829,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0418)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER I")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER I")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER I")
       (ucs		  . #x0418)	; И
@@ -847,7 +870,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0419)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER SHORT I")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER SHORT I")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
       (ucs		  . #x0419)	; Й
@@ -886,7 +910,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x041A)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER KA")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER KA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER KA")
       (ucs		  . #x041A)	; К
@@ -925,7 +950,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x041B)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER EL")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER EL")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EL")
       (ucs		  . #x041B)	; Л
@@ -964,7 +990,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x041C)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER EM")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER EM")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EM")
       (ucs		  . #x041C)	; М
@@ -1003,7 +1030,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x041D)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER EN")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER EN")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EN")
       (ucs		  . #x041D)	; Н
@@ -1042,7 +1070,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x041E)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER O")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER O")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER O")
       (ucs		  . #x041E)	; О
@@ -1081,7 +1110,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x041F)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER PE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER PE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER PE")
       (ucs		  . #x041F)	; П
@@ -1120,7 +1150,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0420)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER ER")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER ER")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ER")
       (ucs		  . #x0420)	; Р
@@ -1159,7 +1190,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0421)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER ES")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER ES")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ES")
       (ucs		  . #x0421)	; С
@@ -1198,7 +1230,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0422)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER TE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER TE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER TE")
       (ucs		  . #x0422)	; Т
@@ -1237,7 +1270,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0423)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER U")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER U")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER U")
       (ucs		  . #x0423)	; У
@@ -1276,7 +1310,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0424)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER EF")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER EF")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EF")
       (ucs		  . #x0424)	; Ф
@@ -1315,7 +1350,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0425)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER HA")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER HA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER HA")
       (ucs		  . #x0425)	; Х
@@ -1354,7 +1390,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0426)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER TSE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER TSE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER TSE")
       (ucs		  . #x0426)	; Ц
@@ -1393,7 +1430,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0427)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER CHE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER CHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER CHE")
       (ucs		  . #x0427)	; Ч
@@ -1432,7 +1470,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0428)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER SHA")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER SHA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHA")
       (ucs		  . #x0428)	; Ш
@@ -1471,7 +1510,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0429)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER SHCHA")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER SHCHA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
       (ucs		  . #x0429)	; Щ
@@ -1489,7 +1529,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER HARD SIGN")
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER HARD SIGN")
       (japanese-jisx0208-1978	  . #x273C)	; ø»‚…
       (chinese-gb2312		  . #x273C)	; ø»„“
       (japanese-jisx0208	  . #x273C)	; ø»†™—
@@ -1510,7 +1550,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x042A)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER HARD SIGN")))
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER HARD SIGN")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
       (ucs		  . #x042A)	; Ъ
@@ -1549,7 +1590,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x042B)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER YERU")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER YERU")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YERU")
       (ucs		  . #x042B)	; Ы
@@ -1567,7 +1609,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER SOFT SIGN")
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SOFT SIGN")
       (japanese-jisx0208-1978	  . #x273E)	; ø»‚…‘
       (chinese-gb2312		  . #x273E)	; ø»„•
       (japanese-jisx0208	  . #x273E)	; ø»†™™
@@ -1588,7 +1630,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x042C)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER SOFT SIGN")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER SOFT SIGN")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
       (ucs		  . #x042C)	; Ь
@@ -1627,7 +1670,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x042D)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER E")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER E")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER E")
       (ucs		  . #x042D)	; Э
@@ -1666,7 +1710,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x042E)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER YU")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER YU")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YU")
       (ucs		  . #x042E)	; Ю
@@ -1705,7 +1750,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x042F)
     (->lowercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER YA")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER YA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YA")
       (ucs		  . #x042F)	; Я
@@ -1744,7 +1790,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0430)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER A")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER A")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER A")
       (ucs		  . #x0430)	; а
@@ -1783,7 +1830,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0431)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER BE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER BE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER BE")
       (ucs		  . #x0431)	; б
@@ -1822,7 +1870,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0432)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER VE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER VE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER VE")
       (ucs		  . #x0432)	; в
@@ -1861,7 +1910,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0433)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER GHE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER GHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER GHE")
       (ucs		  . #x0433)	; г
@@ -1900,7 +1950,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0434)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER DE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER DE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DE")
       (ucs		  . #x0434)	; д
@@ -1939,7 +1990,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0435)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER IE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER IE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER IE")
       (ucs		  . #x0435)	; е
@@ -1978,7 +2030,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0436)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER ZHE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER ZHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ZHE")
       (ucs		  . #x0436)	; ж
@@ -2017,7 +2070,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0437)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER ZE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER ZE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ZE")
       (ucs		  . #x0437)	; з
@@ -2056,7 +2110,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0438)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER I")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER I")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER I")
       (ucs		  . #x0438)	; и
@@ -2096,7 +2151,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0439)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SHORT I")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER SHORT I")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHORT I")
       (ucs		  . #x0439)	; й
@@ -2135,7 +2191,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x043A)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER KA")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER KA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER KA")
       (ucs		  . #x043A)	; к
@@ -2174,7 +2231,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x043B)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER EL")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER EL")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EL")
       (ucs		  . #x043B)	; л
@@ -2213,7 +2271,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x043C)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER EM")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER EM")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EM")
       (ucs		  . #x043C)	; м
@@ -2252,7 +2311,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x043D)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER EN")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER EN")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EN")
       (ucs		  . #x043D)	; н
@@ -2291,7 +2351,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x043E)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER O")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER O")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER O")
       (ucs		  . #x043E)	; о
@@ -2330,7 +2391,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x043F)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER PE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER PE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER PE")
       (ucs		  . #x043F)	; п
@@ -2369,7 +2431,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0440)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER ER")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER ER")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ER")
       (ucs		  . #x0440)	; р
@@ -2408,7 +2471,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0441)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER ES")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER ES")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ES")
       (ucs		  . #x0441)	; с
@@ -2447,7 +2511,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0442)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER TE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER TE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TE")
       (ucs		  . #x0442)	; т
@@ -2486,7 +2551,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0443)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER U")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER U")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER U")
       (ucs		  . #x0443)	; у
@@ -2525,7 +2591,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0444)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER EF")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER EF")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EF")
       (ucs		  . #x0444)	; ф
@@ -2564,7 +2631,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0445)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER HA")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER HA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER HA")
       (ucs		  . #x0445)	; х
@@ -2603,7 +2671,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0446)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER TSE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER TSE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TSE")
       (ucs		  . #x0446)	; ц
@@ -2642,7 +2711,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0447)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER CHE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER CHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER CHE")
       (ucs		  . #x0447)	; ч
@@ -2681,7 +2751,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0448)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SHA")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER SHA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHA")
       (ucs		  . #x0448)	; ш
@@ -2720,7 +2791,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0449)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SHCHA")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER SHCHA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHCHA")
       (ucs		  . #x0449)	; щ
@@ -2759,7 +2831,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x044A)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER HARD SIGN")))
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER HARD SIGN")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER HARD SIGN")
       (ucs		  . #x044A)	; ъ
@@ -2798,7 +2871,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x044B)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER YERU")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER YERU")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YERU")
       (ucs		  . #x044B)	; ы
@@ -2837,7 +2911,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x044C)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SOFT SIGN")))
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SOFT SIGN")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
       (ucs		  . #x044C)	; ь
@@ -2876,7 +2951,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x044D)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER E")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER E")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER E")
       (ucs		  . #x044D)	; э
@@ -2915,7 +2991,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x044E)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER YU")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER YU")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YU")
       (ucs		  . #x044E)	; ю
@@ -2954,7 +3031,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x044F)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER YA")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER YA")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YA")
       (ucs		  . #x044F)	; я
@@ -3006,7 +3084,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0451)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER IO")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER IO")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER IO")
       (ucs		  . #x0451)	; ё
@@ -3044,7 +3123,8 @@
     (iso-10646-comment	. "Serbocroatian")
     (->decomposition	wide #x0452)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER DJE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER DJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DJE")
       (ucs		  . #x0452)	; ђ
@@ -3076,7 +3156,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0453)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER GJE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER GJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER GJE")
       (ucs		  . #x0453)	; ѓ
@@ -3089,7 +3170,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->fullwidth
-     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER UKRAINIAN IE")
+     ((name . "FULLWIDTH CYRILLIC SMALL LETTER UKRAINIAN IE")
       (japanese-jisx0212  . #x2774)	; ø»Š®—
       ))
     (->uppercase
@@ -3107,7 +3188,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0454)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER UKRAINIAN IE")))
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER UKRAINIAN IE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER UKRAINIAN IE")
       (ucs		  . #x0454)	; є
@@ -3138,7 +3220,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0455)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER DZE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER DZE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DZE")
       (ucs		  . #x0455)	; ѕ
@@ -3146,7 +3229,7 @@
     (japanese-jisx0212	. #x2775)	; ø»Š®˜
     ))
 (define-char
-  '((name		. "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
+  '((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -3169,9 +3252,10 @@
     (mirrored		. nil)
     (->decomposition	wide #x0456)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")))
+     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
+      ))
     (<-fullwidth
-     ((name		  . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
+     ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
       (ucs		  . #x0456)	; і
       ))
     (japanese-jisx0212	. #x2776)	; ø»Š®™
@@ -3203,7 +3287,8 @@
     (iso-10646-comment	. "Ukrainian")
     (->decomposition	wide #x0457)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER YI")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER YI")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YI")
       (ucs		  . #x0457)	; ї
@@ -3234,7 +3319,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0458)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER JE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER JE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER JE")
       (ucs		  . #x0458)	; ј
@@ -3265,7 +3351,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x0459)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER LJE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER LJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER LJE")
       (ucs		  . #x0459)	; љ
@@ -3296,7 +3383,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x045A)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER NJE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER NJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER NJE")
       (ucs		  . #x045A)	; њ
@@ -3329,7 +3417,8 @@
     (iso-10646-comment	. "Serbocroatian")
     (->decomposition	wide #x045B)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER TSHE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER TSHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TSHE")
       (ucs		  . #x045B)	; ћ
@@ -3361,7 +3450,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x045C)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC SMALL LETTER KJE")))
+     ((name		  . "FULLWIDTH CYRILLIC SMALL LETTER KJE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER KJE")
       (ucs		  . #x045C)	; ќ
@@ -3407,7 +3497,8 @@
     (iso-10646-comment	. "Byelorussian")
     (->decomposition	wide #x045E)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER SHORT U")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER SHORT U")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHORT U")
       (ucs		  . #x045E)	; ў
@@ -3438,7 +3529,8 @@
     (mirrored		. nil)
     (->decomposition	wide #x045F)
     (->uppercase
-     ((name . "FULLWIDTH CYRILLIC CAPITAL LETTER DZHE")))
+     ((name		  . "FULLWIDTH CYRILLIC CAPITAL LETTER DZHE")
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DZHE")
       (ucs		  . #x045F)	; џ
@@ -3550,7 +3642,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS")
+     ((name . "CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS")
       (ucs		  . #x0468)	; Ѩ
       ))
     (ucs		. #x0469)	; Ñ©
@@ -3975,7 +4067,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK")
+     ((name . "CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK")
       (ucs		  . #x0494)	; Ҕ
       ))
     (ucs		. #x0495)	; ҕ
@@ -4047,23 +4139,23 @@
     (ucs		. #x049B)	; қ
     ))
 (define-char
-  '((name		. "CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE")
+  '((name . "CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name		  . "CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE")
+     ((name . "CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE")
       (ucs		  . #x049D)	; ҝ
       ))
     (ucs		. #x049C)	; Ҝ
     ))
 (define-char
-  '((name		. "CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE")
+  '((name . "CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE")
+     ((name . "CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE")
       (ucs		  . #x049C)	; Ҝ
       ))
     (ucs		. #x049D)	; ҝ
@@ -4175,7 +4267,7 @@
     (mirrored		. nil)
     (iso-10646-comment	. "Abkhasian")
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK")
+     ((name . "CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK")
       (ucs		  . #x04A6)	; Ò¦
       ))
     (ucs		. #x04A7)	; Ò§
@@ -4269,12 +4361,12 @@
     (ucs		. #x04AF)	; Ò¯
     ))
 (define-char
-  '((name		. "CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE")
+  '((name . "CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name		  . "CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE")
+     ((name . "CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE")
       (ucs		  . #x04B1)	; Ò±
       ))
     (ucs		. #x04B0)	; Ò°
@@ -4285,7 +4377,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE")
+     ((name . "CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE")
       (ucs		  . #x04B0)	; Ò°
       ))
     (ucs		. #x04B1)	; Ò±
@@ -4364,13 +4456,13 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (->lowercase
-     ((name		  . "CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE")
+     ((name . "CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE")
       (ucs		  . #x04B9)	; Ò¹
       ))
     (ucs		. #x04B8)	; Ò¸
     ))
 (define-char
-  '((name		. "CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE")
+  '((name . "CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
@@ -4678,7 +4770,7 @@
     (mirrored		. nil)
     (->decomposition	#x04D9 #x0308)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS")
+     ((name . "CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS")
       (ucs		  . #x04DA)	; Ӛ
       ))
     (ucs		. #x04DB)	; ӛ
@@ -4848,25 +4940,25 @@
     (ucs		. #x04E9)	; Ó©
     ))
 (define-char
-  '((name		. "CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS")
+  '((name . "CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x04E8 #x0308)
     (->lowercase
-     ((name		  . "CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS")
+     ((name . "CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS")
       (ucs		  . #x04EB)	; Ó«
       ))
     (ucs		. #x04EA)	; Óª
     ))
 (define-char
-  '((name		. "CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS")
+  '((name . "CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
     (->decomposition	#x04E9 #x0308)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS")
+     ((name . "CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS")
       (ucs		  . #x04EA)	; Óª
       ))
     (ucs		. #x04EB)	; Ó«
@@ -4962,7 +5054,7 @@
     (mirrored		. nil)
     (->decomposition	#x0443 #x030B)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE")
+     ((name . "CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE")
       (ucs		  . #x04F2)	; Ó²
       ))
     (ucs		. #x04F3)	; Ó³
@@ -5010,7 +5102,7 @@
     (mirrored		. nil)
     (->decomposition	#x044B #x0308)
     (->uppercase
-     ((name		  . "CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS")
+     ((name . "CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS")
       (ucs		  . #x04F8)	; Ó¸
       ))
     (ucs		. #x04F9)	; Ó¹
diff --git a/lisp/utf-2000/u00600-Arabic.el b/lisp/utf-2000/u00600-Arabic.el
index 8d368a3..c439a34 100644
--- a/lisp/utf-2000/u00600-Arabic.el
+++ b/lisp/utf-2000/u00600-Arabic.el
@@ -680,7 +680,7 @@
     (ucs		. #x0681)	; ځ
     ))
 (define-char
-  '((name		. "ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE")
+  '((name . "ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
@@ -743,7 +743,7 @@
     (ucs		. #x068A)	; ڊ
     ))
 (define-char
-  '((name		. "ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH")
+  '((name . "ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
@@ -820,7 +820,7 @@
     (ucs		. #x0695)	; ڕ
     ))
 (define-char
-  '((name		. "ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE")
+  '((name . "ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
@@ -848,7 +848,7 @@
     (ucs		. #x0699)	; ڙ
     ))
 (define-char
-  '((name		. "ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE")
+  '((name . "ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
diff --git a/lisp/utf-2000/u00A00-Gurmukhi.el b/lisp/utf-2000/u00A00-Gurmukhi.el
index bd8c443..4fa5db8 100644
--- a/lisp/utf-2000/u00A00-Gurmukhi.el
+++ b/lisp/utf-2000/u00A00-Gurmukhi.el
@@ -1,561 +1,561 @@
 (define-char
   '((name		. "GURMUKHI SIGN BINDI")
-    (ucs		. #x0A02)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A02)	; ਂ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER A")
-    (ucs		. #x0A05)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A05)	; ਅ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER AA")
-    (ucs		. #x0A06)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A06)	; ਆ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER I")
-    (ucs		. #x0A07)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A07)	; ਇ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER II")
-    (ucs		. #x0A08)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A08)	; ਈ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER U")
-    (ucs		. #x0A09)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A09)	; ਉ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER UU")
-    (ucs		. #x0A0A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A0A)	; ਊ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER EE")
-    (ucs		. #x0A0F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A0F)	; ਏ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER AI")
-    (ucs		. #x0A10)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A10)	; ਐ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER OO")
-    (ucs		. #x0A13)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A13)	; ਓ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER AU")
-    (ucs		. #x0A14)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A14)	; ਔ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER KA")
-    (ucs		. #x0A15)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A15)	; ਕ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER KHA")
-    (ucs		. #x0A16)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A16)	; ਖ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER GA")
-    (ucs		. #x0A17)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A17)	; ਗ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER GHA")
-    (ucs		. #x0A18)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A18)	; ਘ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER NGA")
-    (ucs		. #x0A19)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A19)	; ਙ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER CA")
-    (ucs		. #x0A1A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A1A)	; ਚ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER CHA")
-    (ucs		. #x0A1B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A1B)	; ਛ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER JA")
-    (ucs		. #x0A1C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A1C)	; ਜ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER JHA")
-    (ucs		. #x0A1D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A1D)	; ਝ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER NYA")
-    (ucs		. #x0A1E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A1E)	; ਞ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER TTA")
-    (ucs		. #x0A1F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A1F)	; ਟ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER TTHA")
-    (ucs		. #x0A20)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A20)	; ਠ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER DDA")
-    (ucs		. #x0A21)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A21)	; ਡ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER DDHA")
-    (ucs		. #x0A22)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A22)	; ਢ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER NNA")
-    (ucs		. #x0A23)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A23)	; ਣ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER TA")
-    (ucs		. #x0A24)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A24)	; ਤ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER THA")
-    (ucs		. #x0A25)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A25)	; ਥ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER DA")
-    (ucs		. #x0A26)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A26)	; ਦ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER DHA")
-    (ucs		. #x0A27)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A27)	; ਧ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER NA")
-    (ucs		. #x0A28)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A28)	; ਨ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER PA")
-    (ucs		. #x0A2A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A2A)	; ਪ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER PHA")
-    (ucs		. #x0A2B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A2B)	; ਫ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER BA")
-    (ucs		. #x0A2C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A2C)	; ਬ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER BHA")
-    (ucs		. #x0A2D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A2D)	; ਭ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER MA")
-    (ucs		. #x0A2E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A2E)	; ਮ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER YA")
-    (ucs		. #x0A2F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A2F)	; ਯ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER RA")
-    (ucs		. #x0A30)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A30)	; ਰ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER LA")
-    (ucs		. #x0A32)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A32)	; ਲ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER LLA")
-    (ucs		. #x0A33)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0A32 #x0A3C)
     (mirrored		. nil)
+    (->decomposition	#x0A32 #x0A3C)
+    (ucs		. #x0A33)	; ਲ਼
     ))
 (define-char
   '((name		. "GURMUKHI LETTER VA")
-    (ucs		. #x0A35)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A35)	; ਵ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER SHA")
-    (ucs		. #x0A36)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0A38 #x0A3C)
     (mirrored		. nil)
+    (->decomposition	#x0A38 #x0A3C)
+    (ucs		. #x0A36)	; ਸ਼
     ))
 (define-char
   '((name		. "GURMUKHI LETTER SA")
-    (ucs		. #x0A38)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A38)	; ਸ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER HA")
-    (ucs		. #x0A39)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A39)	; ਹ
     ))
 (define-char
   '((name		. "GURMUKHI SIGN NUKTA")
-    (ucs		. #x0A3C)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A3C)	; ਼
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN AA")
-    (ucs		. #x0A3E)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A3E)	; ਾ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN I")
-    (ucs		. #x0A3F)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A3F)	; ਿ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN II")
-    (ucs		. #x0A40)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A40)	; ੀ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN U")
-    (ucs		. #x0A41)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A41)	; ੁ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN UU")
-    (ucs		. #x0A42)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A42)	; ੂ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN EE")
-    (ucs		. #x0A47)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A47)	; ੇ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN AI")
-    (ucs		. #x0A48)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A48)	; ੈ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN OO")
-    (ucs		. #x0A4B)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A4B)	; ੋ
     ))
 (define-char
   '((name		. "GURMUKHI VOWEL SIGN AU")
-    (ucs		. #x0A4C)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A4C)	; ੌ
     ))
 (define-char
   '((name		. "GURMUKHI SIGN VIRAMA")
-    (ucs		. #x0A4D)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A4D)	; ੍
     ))
 (define-char
   '((name		. "GURMUKHI LETTER KHHA")
-    (ucs		. #x0A59)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0A16 #x0A3C)
     (mirrored		. nil)
+    (->decomposition	#x0A16 #x0A3C)
+    (ucs		. #x0A59)	; ਖ਼
     ))
 (define-char
   '((name		. "GURMUKHI LETTER GHHA")
-    (ucs		. #x0A5A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0A17 #x0A3C)
     (mirrored		. nil)
+    (->decomposition	#x0A17 #x0A3C)
+    (ucs		. #x0A5A)	; ਗ਼
     ))
 (define-char
   '((name		. "GURMUKHI LETTER ZA")
-    (ucs		. #x0A5B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0A1C #x0A3C)
     (mirrored		. nil)
+    (->decomposition	#x0A1C #x0A3C)
+    (ucs		. #x0A5B)	; ਜ਼
     ))
 (define-char
   '((name		. "GURMUKHI LETTER RRA")
-    (ucs		. #x0A5C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A5C)	; ੜ
     ))
 (define-char
   '((name		. "GURMUKHI LETTER FA")
-    (ucs		. #x0A5E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
-    (->decomposition	#x0A2B #x0A3C)
     (mirrored		. nil)
+    (->decomposition	#x0A2B #x0A3C)
+    (ucs		. #x0A5E)	; ਫ਼
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT ZERO")
-    (ucs		. #x0A66)
     (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		. #x0A66)	; ੦
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT ONE")
-    (ucs		. #x0A67)
     (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		. #x0A67)	; ੧
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT TWO")
-    (ucs		. #x0A68)
     (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		. #x0A68)	; ੨
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT THREE")
-    (ucs		. #x0A69)
     (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		. #x0A69)	; à©©
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT FOUR")
-    (ucs		. #x0A6A)
     (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		. #x0A6A)	; ੪
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT FIVE")
-    (ucs		. #x0A6B)
     (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		. #x0A6B)	; à©«
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT SIX")
-    (ucs		. #x0A6C)
     (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		. #x0A6C)	; ੬
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT SEVEN")
-    (ucs		. #x0A6D)
     (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		. #x0A6D)	; à©­
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT EIGHT")
-    (ucs		. #x0A6E)
     (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		. #x0A6E)	; à©®
     ))
 (define-char
   '((name		. "GURMUKHI DIGIT NINE")
-    (ucs		. #x0A6F)
     (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		. #x0A6F)	; ੯
     ))
 (define-char
   '((name		. "GURMUKHI TIPPI")
-    (ucs		. #x0A70)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A70)	; à©°
     ))
 (define-char
   '((name		. "GURMUKHI ADDAK")
-    (ucs		. #x0A71)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A71)	; ੱ
     ))
 (define-char
   '((name		. "GURMUKHI IRI")
-    (ucs		. #x0A72)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A72)	; ੲ
     ))
 (define-char
   '((name		. "GURMUKHI URA")
-    (ucs		. #x0A73)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A73)	; ੳ
     ))
 (define-char
   '((name		. "GURMUKHI EK ONKAR")
-    (ucs		. #x0A74)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A74)	; à©´
     ))
diff --git a/lisp/utf-2000/u00A80-Gujarati.el b/lisp/utf-2000/u00A80-Gujarati.el
index 9585e19..b615217 100644
--- a/lisp/utf-2000/u00A80-Gujarati.el
+++ b/lisp/utf-2000/u00A80-Gujarati.el
@@ -1,576 +1,576 @@
 (define-char
   '((name		. "GUJARATI SIGN CANDRABINDU")
-    (ucs		. #x0A81)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A81)	; ઁ
     ))
 (define-char
   '((name		. "GUJARATI SIGN ANUSVARA")
-    (ucs		. #x0A82)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0A82)	; ં
     ))
 (define-char
   '((name		. "GUJARATI SIGN VISARGA")
-    (ucs		. #x0A83)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A83)	; ઃ
     ))
 (define-char
   '((name		. "GUJARATI LETTER A")
-    (ucs		. #x0A85)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A85)	; અ
     ))
 (define-char
   '((name		. "GUJARATI LETTER AA")
-    (ucs		. #x0A86)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A86)	; આ
     ))
 (define-char
   '((name		. "GUJARATI LETTER I")
-    (ucs		. #x0A87)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A87)	; ઇ
     ))
 (define-char
   '((name		. "GUJARATI LETTER II")
-    (ucs		. #x0A88)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A88)	; ઈ
     ))
 (define-char
   '((name		. "GUJARATI LETTER U")
-    (ucs		. #x0A89)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A89)	; ઉ
     ))
 (define-char
   '((name		. "GUJARATI LETTER UU")
-    (ucs		. #x0A8A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A8A)	; ઊ
     ))
 (define-char
   '((name		. "GUJARATI LETTER VOCALIC R")
-    (ucs		. #x0A8B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A8B)	; ઋ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL CANDRA E")
-    (ucs		. #x0A8D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A8D)	; ઍ
     ))
 (define-char
   '((name		. "GUJARATI LETTER E")
-    (ucs		. #x0A8F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A8F)	; એ
     ))
 (define-char
   '((name		. "GUJARATI LETTER AI")
-    (ucs		. #x0A90)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A90)	; ઐ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL CANDRA O")
-    (ucs		. #x0A91)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A91)	; ઑ
     ))
 (define-char
   '((name		. "GUJARATI LETTER O")
-    (ucs		. #x0A93)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A93)	; ઓ
     ))
 (define-char
   '((name		. "GUJARATI LETTER AU")
-    (ucs		. #x0A94)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A94)	; ઔ
     ))
 (define-char
   '((name		. "GUJARATI LETTER KA")
-    (ucs		. #x0A95)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A95)	; ક
     ))
 (define-char
   '((name		. "GUJARATI LETTER KHA")
-    (ucs		. #x0A96)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A96)	; ખ
     ))
 (define-char
   '((name		. "GUJARATI LETTER GA")
-    (ucs		. #x0A97)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A97)	; ગ
     ))
 (define-char
   '((name		. "GUJARATI LETTER GHA")
-    (ucs		. #x0A98)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A98)	; ઘ
     ))
 (define-char
   '((name		. "GUJARATI LETTER NGA")
-    (ucs		. #x0A99)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A99)	; ઙ
     ))
 (define-char
   '((name		. "GUJARATI LETTER CA")
-    (ucs		. #x0A9A)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A9A)	; ચ
     ))
 (define-char
   '((name		. "GUJARATI LETTER CHA")
-    (ucs		. #x0A9B)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A9B)	; છ
     ))
 (define-char
   '((name		. "GUJARATI LETTER JA")
-    (ucs		. #x0A9C)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A9C)	; જ
     ))
 (define-char
   '((name		. "GUJARATI LETTER JHA")
-    (ucs		. #x0A9D)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A9D)	; ઝ
     ))
 (define-char
   '((name		. "GUJARATI LETTER NYA")
-    (ucs		. #x0A9E)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A9E)	; ઞ
     ))
 (define-char
   '((name		. "GUJARATI LETTER TTA")
-    (ucs		. #x0A9F)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0A9F)	; ટ
     ))
 (define-char
   '((name		. "GUJARATI LETTER TTHA")
-    (ucs		. #x0AA0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA0)	; ઠ
     ))
 (define-char
   '((name		. "GUJARATI LETTER DDA")
-    (ucs		. #x0AA1)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA1)	; ડ
     ))
 (define-char
   '((name		. "GUJARATI LETTER DDHA")
-    (ucs		. #x0AA2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA2)	; ઢ
     ))
 (define-char
   '((name		. "GUJARATI LETTER NNA")
-    (ucs		. #x0AA3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA3)	; ણ
     ))
 (define-char
   '((name		. "GUJARATI LETTER TA")
-    (ucs		. #x0AA4)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA4)	; ત
     ))
 (define-char
   '((name		. "GUJARATI LETTER THA")
-    (ucs		. #x0AA5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA5)	; થ
     ))
 (define-char
   '((name		. "GUJARATI LETTER DA")
-    (ucs		. #x0AA6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA6)	; દ
     ))
 (define-char
   '((name		. "GUJARATI LETTER DHA")
-    (ucs		. #x0AA7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA7)	; ધ
     ))
 (define-char
   '((name		. "GUJARATI LETTER NA")
-    (ucs		. #x0AA8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AA8)	; ન
     ))
 (define-char
   '((name		. "GUJARATI LETTER PA")
-    (ucs		. #x0AAA)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AAA)	; પ
     ))
 (define-char
   '((name		. "GUJARATI LETTER PHA")
-    (ucs		. #x0AAB)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AAB)	; ફ
     ))
 (define-char
   '((name		. "GUJARATI LETTER BA")
-    (ucs		. #x0AAC)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AAC)	; બ
     ))
 (define-char
   '((name		. "GUJARATI LETTER BHA")
-    (ucs		. #x0AAD)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AAD)	; ભ
     ))
 (define-char
   '((name		. "GUJARATI LETTER MA")
-    (ucs		. #x0AAE)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AAE)	; મ
     ))
 (define-char
   '((name		. "GUJARATI LETTER YA")
-    (ucs		. #x0AAF)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AAF)	; ય
     ))
 (define-char
   '((name		. "GUJARATI LETTER RA")
-    (ucs		. #x0AB0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB0)	; ર
     ))
 (define-char
   '((name		. "GUJARATI LETTER LA")
-    (ucs		. #x0AB2)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB2)	; લ
     ))
 (define-char
   '((name		. "GUJARATI LETTER LLA")
-    (ucs		. #x0AB3)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB3)	; ળ
     ))
 (define-char
   '((name		. "GUJARATI LETTER VA")
-    (ucs		. #x0AB5)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB5)	; વ
     ))
 (define-char
   '((name		. "GUJARATI LETTER SHA")
-    (ucs		. #x0AB6)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB6)	; શ
     ))
 (define-char
   '((name		. "GUJARATI LETTER SSA")
-    (ucs		. #x0AB7)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB7)	; ષ
     ))
 (define-char
   '((name		. "GUJARATI LETTER SA")
-    (ucs		. #x0AB8)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB8)	; સ
     ))
 (define-char
   '((name		. "GUJARATI LETTER HA")
-    (ucs		. #x0AB9)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AB9)	; હ
     ))
 (define-char
   '((name		. "GUJARATI SIGN NUKTA")
-    (ucs		. #x0ABC)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0ABC)	; ઼
     ))
 (define-char
   '((name		. "GUJARATI SIGN AVAGRAHA")
-    (ucs		. #x0ABD)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0ABD)	; ઽ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN AA")
-    (ucs		. #x0ABE)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0ABE)	; ા
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN I")
-    (ucs		. #x0ABF)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0ABF)	; િ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN II")
-    (ucs		. #x0AC0)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AC0)	; ી
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN U")
-    (ucs		. #x0AC1)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC1)	; ુ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN UU")
-    (ucs		. #x0AC2)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC2)	; ૂ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN VOCALIC R")
-    (ucs		. #x0AC3)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC3)	; ૃ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN VOCALIC RR")
-    (ucs		. #x0AC4)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC4)	; ૄ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN CANDRA E")
-    (ucs		. #x0AC5)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC5)	; ૅ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN E")
-    (ucs		. #x0AC7)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC7)	; ે
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN AI")
-    (ucs		. #x0AC8)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0AC8)	; ૈ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN CANDRA O")
-    (ucs		. #x0AC9)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AC9)	; ૉ
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN O")
-    (ucs		. #x0ACB)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0ACB)	; ો
     ))
 (define-char
   '((name		. "GUJARATI VOWEL SIGN AU")
-    (ucs		. #x0ACC)
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0ACC)	; ૌ
     ))
 (define-char
   '((name		. "GUJARATI SIGN VIRAMA")
-    (ucs		. #x0ACD)
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
+    (ucs		. #x0ACD)	; ્
     ))
 (define-char
   '((name		. "GUJARATI OM")
-    (ucs		. #x0AD0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AD0)	; ૐ
     ))
 (define-char
   '((name		. "GUJARATI LETTER VOCALIC RR")
-    (ucs		. #x0AE0)
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (ucs		. #x0AE0)	; à« 
     ))
 (define-char
   '((name		. "GUJARATI DIGIT ZERO")
-    (ucs		. #x0AE6)
     (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		. #x0AE6)	; ૦
     ))
 (define-char
   '((name		. "GUJARATI DIGIT ONE")
-    (ucs		. #x0AE7)
     (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		. #x0AE7)	; ૧
     ))
 (define-char
   '((name		. "GUJARATI DIGIT TWO")
-    (ucs		. #x0AE8)
     (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		. #x0AE8)	; ૨
     ))
 (define-char
   '((name		. "GUJARATI DIGIT THREE")
-    (ucs		. #x0AE9)
     (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		. #x0AE9)	; à«©
     ))
 (define-char
   '((name		. "GUJARATI DIGIT FOUR")
-    (ucs		. #x0AEA)
     (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		. #x0AEA)	; ૪
     ))
 (define-char
   '((name		. "GUJARATI DIGIT FIVE")
-    (ucs		. #x0AEB)
     (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		. #x0AEB)	; à««
     ))
 (define-char
   '((name		. "GUJARATI DIGIT SIX")
-    (ucs		. #x0AEC)
     (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		. #x0AEC)	; ૬
     ))
 (define-char
   '((name		. "GUJARATI DIGIT SEVEN")
-    (ucs		. #x0AED)
     (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		. #x0AED)	; à«­
     ))
 (define-char
   '((name		. "GUJARATI DIGIT EIGHT")
-    (ucs		. #x0AEE)
     (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		. #x0AEE)	; à«®
     ))
 (define-char
   '((name		. "GUJARATI DIGIT NINE")
-    (ucs		. #x0AEF)
     (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		. #x0AEF)	; ૯
     ))