X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fu00180-Latin-Extended-B.el;h=d1d23824668762528b1acfc1dc006708847a1b70;hb=528ca5c9afc87d2d698ce64b29cc9b069d09894f;hp=aacfd75a1375b7809c094651ded75fe611b18e24;hpb=ed79ca47b430a917433a5f779c37c2f7c8ee11ba;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/u00180-Latin-Extended-B.el b/lisp/utf-2000/u00180-Latin-Extended-B.el
index aacfd75..d1d2382 100644
--- a/lisp/utf-2000/u00180-Latin-Extended-B.el
+++ b/lisp/utf-2000/u00180-Latin-Extended-B.el
@@ -11,132 +11,132 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0181)	; Ɓ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER B WITH HOOK")
       (=ucs		  . #x0253)	; ɓ
       ))
-    (=ucs		. #x0181)	; Ɓ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER B WITH TOPBAR")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0182)	; Ƃ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER B WITH TOPBAR")
       (=ucs		  . #x0183)	; ƃ
       ))
-    (=ucs		. #x0182)	; Ƃ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER B WITH TOPBAR")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0183)	; ƃ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER B WITH TOPBAR")
       (=ucs		  . #x0182)	; Ƃ
       ))
-    (=ucs		. #x0183)	; ƃ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER TONE SIX")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0184)	; Ƅ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER TONE SIX")
       (=ucs		  . #x0185)	; ƅ
       ))
-    (=ucs		. #x0184)	; Ƅ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TONE SIX")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0185)	; ƅ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER TONE SIX")
       (=ucs		  . #x0184)	; Ƅ
       ))
-    (=ucs		. #x0185)	; ƅ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER OPEN O")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0186)	; Ɔ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER OPEN O")
       (=ucs		  . #x0254)	; ɔ
       ))
-    (=ucs		. #x0186)	; Ɔ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER C WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0187)	; Ƈ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER C WITH HOOK")
       (=ucs		  . #x0188)	; ƈ
       ))
-    (=ucs		. #x0187)	; Ƈ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER C WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0188)	; ƈ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER C WITH HOOK")
       (=ucs		  . #x0187)	; Ƈ
       ))
-    (=ucs		. #x0188)	; ƈ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER AFRICAN D")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0189)	; Ɖ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH TAIL")
       (=ucs		  . #x0256)	; ɖ
       ))
-    (=ucs		. #x0189)	; Ɖ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER D WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x018A)	; Ɗ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH HOOK")
       (=ucs		  . #x0257)	; ɗ
       ))
-    (=ucs		. #x018A)	; Ɗ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER D WITH TOPBAR")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x018B)	; Ƌ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH TOPBAR")
       (=ucs		  . #x018C)	; ƌ
       ))
-    (=ucs		. #x018B)	; Ƌ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER D WITH TOPBAR")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x018C)	; ƌ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER D WITH TOPBAR")
       (=ucs		  . #x018B)	; Ƌ
       ))
-    (=ucs		. #x018C)	; ƌ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED DELTA")
@@ -150,98 +150,93 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x018E)	; Ǝ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER TURNED E")
       (=ucs		  . #x01DD)	; ǝ
       ))
-    (=ucs		. #x018E)	; Ǝ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER SCHWA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x018F)	; Ə
     (->lowercase
      ((name		  . "LATIN SMALL LETTER SCHWA")
       (=ucs		  . #x0259)	; ə
       ))
-    (=ucs		. #x018F)	; Ə
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER OPEN E")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0190)	; Ɛ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER OPEN E")
       (=ucs		  . #x025B)	; ɛ
       ))
-    (=ucs		. #x0190)	; Ɛ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER F WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0191)	; Ƒ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER F WITH HOOK")
       (=ucs		  . #x0192)	; ƒ
       ))
-    (=ucs		. #x0191)	; Ƒ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER F WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0192)	; ƒ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER F WITH HOOK")
       (=ucs		  . #x0191)	; Ƒ
       ))
-    (=ucs		. #x0192)	; ƒ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER G WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth latin capital letter g with hook")
-      (=jis-x0213-1-2000  . #x2B29)	; &JX1-2B29; [11-09]
-      ))
+    (=ucs		. #x0193)	; Ɠ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER G WITH HOOK")
       (=ucs		  . #x0260)	; É 
       ))
-    (=ucs		. #x0193)	; Ɠ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter g with hook")
-    (=>ucs		. #x0193)	; Ɠ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x0193)
-    (->lowercase
-     ((name		  . "fullwidth latin small letter g with hook")
+  '((<-denotational
+     ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
+      (=ucs		  . #x0193)	; Ɠ
       ))
+    (=ucs@jis/fw	. #x0193)	; &JX1-2B29;
+    (=jis-x0213-1	. #x2B29)	; &JX1-2B29; [11-09]
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER G WITH HOOK")
       (=ucs		  . #x0193)	; Ɠ
       ))
-    (=jis-x0213-1-2000	. #x2B29)	; &JX1-2B29; [11-09]
-    (=ucs@jis		. #x0193)	; &JX1-2B29;
+    (->lowercase
+     ((=ucs@jis/fw	  . #x0260)	; &JX1-2B28;
+      (=jis-x0213-1	  . #x2B28)	; &JX1-2B28; [11-08]
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER GAMMA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0194)	; Ɣ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER GAMMA")
       (=ucs		  . #x0263)	; ɣ
       ))
-    (=ucs		. #x0194)	; Ɣ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER HV")
@@ -249,55 +244,55 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "hwair")
+    (=ucs		. #x0195)	; ƕ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER HWAIR")
       (=ucs		  . #x01F6)	; Ƕ
       ))
-    (=ucs		. #x0195)	; ƕ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER IOTA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0196)	; Ɩ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER IOTA")
       (=ucs		  . #x0269)	; É©
       ))
-    (=ucs		. #x0196)	; Ɩ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH STROKE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0197)	; Ɨ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH STROKE")
       (=ucs		  . #x0268)	; ɨ
       ))
-    (=ucs		. #x0197)	; Ɨ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER K WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0198)	; Ƙ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER K WITH HOOK")
       (=ucs		  . #x0199)	; ƙ
       ))
-    (=ucs		. #x0198)	; Ƙ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER K WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0199)	; ƙ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER K WITH HOOK")
       (=ucs		  . #x0198)	; Ƙ
       ))
-    (=ucs		. #x0199)	; ƙ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER L WITH BAR")
@@ -318,22 +313,22 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x019C)	; Ɯ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER TURNED M")
       (=ucs		  . #x026F)	; ɯ
       ))
-    (=ucs		. #x019C)	; Ɯ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER N WITH LEFT HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x019D)	; Ɲ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH LEFT HOOK")
       (=ucs		  . #x0272)	; ɲ
       ))
-    (=ucs		. #x019D)	; Ɲ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER N WITH LONG RIGHT LEG")
@@ -347,26 +342,32 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x019F)	; Ɵ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER BARRED O")
       (=ucs		  . #x0275)	; ɵ
       ))
-    (=ucs		. #x019F)	; Ɵ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH HORN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x031B)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING HORN")
+      (=ucs		  . #x031B)	; ̛
+      ))
+    (=ucs		. #x01A0)	; Æ 
+    (latin-tcvn5712	. #xA5)	; &I-VSCII2-25;
+    (latin-viscii	. #xB4)	; &I-MULE-VIET-U-3D;
+    (latin-viscii-upper . #xBD)	; &I-MULE-VIET-U-3D;
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH HORN")
       (=ucs		  . #x01A1)	; Æ¡
       ))
-    (=ucs		. #x01A0)	; Æ 
-    (latin-tcvn5712	. #xA5)	; &I-VSCII2-25;
-    (latin-viscii	. #xB4)	; &MCS-00E9277D;
-    (latin-viscii-upper . #xBD)	; &MCS-00E9277D;
     ))
 (define-char
   '((=>ucs		. #x01A0)	; Æ 
@@ -377,15 +378,21 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x031B)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING HORN")
+      (=ucs		  . #x031B)	; ̛
+      ))
+    (=ucs		. #x01A1)	; Æ¡
+    (latin-tcvn5712	. #xAC)	; &I-VSCII2-2C;
+    (latin-viscii	. #xBD)	; &I-MULE-VIET-L-3D;
+    (latin-viscii-lower . #xBD)	; &I-MULE-VIET-L-3D;
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
       (=ucs		  . #x01A0)	; Æ 
       ))
-    (=ucs		. #x01A1)	; Æ¡
-    (latin-tcvn5712	. #xAC)	; &I-VSCII2-2C;
-    (latin-viscii	. #xBD)	; &MCS-00E9271D;
-    (latin-viscii-lower . #xBD)	; &MCS-00E9271D;
     ))
 (define-char
   '((=>ucs		. #x01A1)	; Æ¡
@@ -397,11 +404,11 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "gha")
+    (=ucs		. #x01A2)	; Ƣ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER OI")
       (=ucs		  . #x01A3)	; ƣ
       ))
-    (=ucs		. #x01A2)	; Ƣ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER OI")
@@ -409,77 +416,77 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "gha")
+    (=ucs		. #x01A3)	; ƣ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER OI")
       (=ucs		  . #x01A2)	; Ƣ
       ))
-    (=ucs		. #x01A3)	; ƣ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER P WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01A4)	; Ƥ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER P WITH HOOK")
       (=ucs		  . #x01A5)	; ƥ
       ))
-    (=ucs		. #x01A4)	; Ƥ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER P WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01A5)	; ƥ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER P WITH HOOK")
       (=ucs		  . #x01A4)	; Ƥ
       ))
-    (=ucs		. #x01A5)	; ƥ
     ))
 (define-char
   '((name		. "LATIN LETTER YR")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01A6)	; Ʀ
     (->lowercase
      ((name		  . "LATIN LETTER SMALL CAPITAL R")
       (=ucs		  . #x0280)	; ʀ
       ))
-    (=ucs		. #x01A6)	; Ʀ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER TONE TWO")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01A7)	; Ƨ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER TONE TWO")
       (=ucs		  . #x01A8)	; ƨ
       ))
-    (=ucs		. #x01A7)	; Ƨ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TONE TWO")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01A8)	; ƨ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER TONE TWO")
       (=ucs		  . #x01A7)	; Ƨ
       ))
-    (=ucs		. #x01A8)	; ƨ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER ESH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01A9)	; Æ©
     (->lowercase
      ((name		  . "LATIN SMALL LETTER ESH")
       (=ucs		  . #x0283)	; ʃ
       ))
-    (=ucs		. #x01A9)	; Æ©
     ))
 (define-char
   '((name		. "LATIN LETTER REVERSED ESH LOOP")
@@ -500,48 +507,54 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01AC)	; Ƭ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH HOOK")
       (=ucs		  . #x01AD)	; Æ­
       ))
-    (=ucs		. #x01AC)	; Ƭ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER T WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01AD)	; Æ­
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER T WITH HOOK")
       (=ucs		  . #x01AC)	; Ƭ
       ))
-    (=ucs		. #x01AD)	; Æ­
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER T WITH RETROFLEX HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01AE)	; Æ®
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH RETROFLEX HOOK")
       (=ucs		  . #x0288)	; ʈ
       ))
-    (=ucs		. #x01AE)	; Æ®
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH HORN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x031B)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING HORN")
+      (=ucs		  . #x031B)	; ̛
+      ))
+    (=ucs		. #x01AF)	; Ư
+    (latin-tcvn5712	. #xA6)	; &I-VSCII2-26;
+    (latin-viscii	. #xBF)	; &I-MULE-VIET-U-5F;
+    (latin-viscii-upper . #xDF)	; &I-MULE-VIET-U-5F;
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH HORN")
       (=ucs		  . #x01B0)	; Æ°
       ))
-    (=ucs		. #x01AF)	; Ư
-    (latin-tcvn5712	. #xA6)	; &I-VSCII2-26;
-    (latin-viscii	. #xBF)	; &MCS-00E9279F;
-    (latin-viscii-upper . #xDF)	; &MCS-00E9279F;
     ))
 (define-char
   '((=>ucs		. #x01AF)	; Ư
@@ -552,15 +565,21 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x031B)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING HORN")
+      (=ucs		  . #x031B)	; ̛
+      ))
+    (=ucs		. #x01B0)	; Æ°
+    (latin-tcvn5712	. #xAD)	; &I-VSCII2-2D;
+    (latin-viscii	. #xDF)	; &I-MULE-VIET-L-5F;
+    (latin-viscii-lower . #xDF)	; &I-MULE-VIET-L-5F;
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
       (=ucs		  . #x01AF)	; Ư
       ))
-    (=ucs		. #x01B0)	; Æ°
-    (latin-tcvn5712	. #xAD)	; &I-VSCII2-2D;
-    (latin-viscii	. #xDF)	; &MCS-00E9273F;
-    (latin-viscii-lower . #xDF)	; &MCS-00E9273F;
     ))
 (define-char
   '((=>ucs		. #x01B0)	; Æ°
@@ -571,99 +590,99 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B1)	; Ʊ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER UPSILON")
       (=ucs		  . #x028A)	; ʊ
       ))
-    (=ucs		. #x01B1)	; Ʊ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER V WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B2)	; Ʋ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER V WITH HOOK")
       (=ucs		  . #x028B)	; ʋ
       ))
-    (=ucs		. #x01B2)	; Ʋ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Y WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B3)	; Ƴ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH HOOK")
       (=ucs		  . #x01B4)	; Æ´
       ))
-    (=ucs		. #x01B3)	; Ƴ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B4)	; Æ´
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH HOOK")
       (=ucs		  . #x01B3)	; Ƴ
       ))
-    (=ucs		. #x01B4)	; Æ´
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Z WITH STROKE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B5)	; Ƶ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Z WITH STROKE")
       (=ucs		  . #x01B6)	; ƶ
       ))
-    (=ucs		. #x01B5)	; Ƶ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Z WITH STROKE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B6)	; ƶ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Z WITH STROKE")
       (=ucs		  . #x01B5)	; Ƶ
       ))
-    (=ucs		. #x01B6)	; ƶ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER EZH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B7)	; Æ·
     (->lowercase
      ((name		  . "LATIN SMALL LETTER EZH")
       (=ucs		  . #x0292)	; ʒ
       ))
-    (=ucs		. #x01B7)	; Æ·
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER EZH REVERSED")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B8)	; Ƹ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER EZH REVERSED")
       (=ucs		  . #x01B9)	; ƹ
       ))
-    (=ucs		. #x01B8)	; Ƹ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER EZH REVERSED")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01B9)	; ƹ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER EZH REVERSED")
       (=ucs		  . #x01B8)	; Ƹ
       ))
-    (=ucs		. #x01B9)	; ƹ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER EZH WITH TAIL")
@@ -684,22 +703,22 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01BC)	; Ƽ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER TONE FIVE")
       (=ucs		  . #x01BD)	; ƽ
       ))
-    (=ucs		. #x01BC)	; Ƽ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TONE FIVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01BD)	; ƽ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER TONE FIVE")
       (=ucs		  . #x01BC)	; Ƽ
       ))
-    (=ucs		. #x01BD)	; ƽ
     ))
 (define-char
   '((name . "LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE")
@@ -713,11 +732,11 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01BF)	; Æ¿
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER WYNN")
       (=ucs		  . #x01F7)	; Ç·
       ))
-    (=ucs		. #x01BF)	; Æ¿
     ))
 (define-char
   '((name		. "LATIN LETTER DENTAL CLICK")
@@ -739,7 +758,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (=ucs		. #x01C2)	; ǂ
-    (=jis-x0213-1-2000	. #x2B24)	; &I-JX1-2B24; [11-04]
+    (=jis-x0213-1	. #x2B24)	; &I-JX1-2B24; [11-04]
     ))
 (define-char
   '((name		. "LATIN LETTER RETROFLEX CLICK")
@@ -753,7 +772,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0044 #x017D)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "LATIN CAPITAL LETTER Z WITH CARON")
+      (=ucs		  . #x017D)	; Ž
+      ))
+    (=ucs		. #x01C4)	; DŽ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER DZ WITH CARON")
       (=ucs		  . #x01C6)	; dž
@@ -762,14 +788,20 @@
      ((name . "LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON")
       (=ucs		  . #x01C5)	; Dž
       ))
-    (=ucs		. #x01C4)	; DŽ
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0044 #x017E)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "LATIN SMALL LETTER Z WITH CARON")
+      (=ucs		  . #x017E)	; ž
+      ))
+    (=ucs		. #x01C5)	; Dž
     (->lowercase
      ((name		  . "LATIN SMALL LETTER DZ WITH CARON")
       (=ucs		  . #x01C6)	; dž
@@ -778,14 +810,20 @@
      ((name		  . "LATIN CAPITAL LETTER DZ WITH CARON")
       (=ucs		  . #x01C4)	; DŽ
       ))
-    (=ucs		. #x01C5)	; Dž
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER DZ WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0064 #x017E)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "LATIN SMALL LETTER Z WITH CARON")
+      (=ucs		  . #x017E)	; ž
+      ))
+    (=ucs		. #x01C6)	; dž
     (->titlecase
      ((name . "LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON")
       (=ucs		  . #x01C5)	; Dž
@@ -794,14 +832,20 @@
      ((name		  . "LATIN CAPITAL LETTER DZ WITH CARON")
       (=ucs		  . #x01C4)	; DŽ
       ))
-    (=ucs		. #x01C6)	; dž
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER LJ")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x004C #x004A)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      )
+     ((name		  . "LATIN CAPITAL LETTER J")
+      (=ucs		  . #x004A)	; J
+      ))
+    (=ucs		. #x01C7)	; LJ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER LJ")
       (=ucs		  . #x01C9)	; lj
@@ -810,14 +854,20 @@
      ((name		  . "LATIN CAPITAL LETTER L WITH SMALL LETTER J")
       (=ucs		  . #x01C8)	; Lj
       ))
-    (=ucs		. #x01C7)	; LJ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER L WITH SMALL LETTER J")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x004C #x006A)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      )
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      ))
+    (=ucs		. #x01C8)	; Lj
     (->lowercase
      ((name		  . "LATIN SMALL LETTER LJ")
       (=ucs		  . #x01C9)	; lj
@@ -826,14 +876,20 @@
      ((name		  . "LATIN CAPITAL LETTER LJ")
       (=ucs		  . #x01C7)	; LJ
       ))
-    (=ucs		. #x01C8)	; Lj
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER LJ")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x006C #x006A)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      )
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      ))
+    (=ucs		. #x01C9)	; lj
     (->titlecase
      ((name		  . "LATIN CAPITAL LETTER L WITH SMALL LETTER J")
       (=ucs		  . #x01C8)	; Lj
@@ -842,14 +898,20 @@
      ((name		  . "LATIN CAPITAL LETTER LJ")
       (=ucs		  . #x01C7)	; LJ
       ))
-    (=ucs		. #x01C9)	; lj
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER NJ")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x004E #x004A)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "LATIN CAPITAL LETTER J")
+      (=ucs		  . #x004A)	; J
+      ))
+    (=ucs		. #x01CA)	; NJ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER NJ")
       (=ucs		  . #x01CC)	; nj
@@ -858,14 +920,20 @@
      ((name		  . "LATIN CAPITAL LETTER N WITH SMALL LETTER J")
       (=ucs		  . #x01CB)	; Nj
       ))
-    (=ucs		. #x01CA)	; NJ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER N WITH SMALL LETTER J")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x004E #x006A)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      ))
+    (=ucs		. #x01CB)	; Nj
     (->lowercase
      ((name		  . "LATIN SMALL LETTER NJ")
       (=ucs		  . #x01CC)	; nj
@@ -874,14 +942,20 @@
      ((name		  . "LATIN CAPITAL LETTER NJ")
       (=ucs		  . #x01CA)	; NJ
       ))
-    (=ucs		. #x01CB)	; Nj
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER NJ")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x006E #x006A)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      )
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      ))
+    (=ucs		. #x01CC)	; nj
     (->titlecase
      ((name		  . "LATIN CAPITAL LETTER N WITH SMALL LETTER J")
       (=ucs		  . #x01CB)	; Nj
@@ -890,643 +964,748 @@
      ((name		  . "LATIN CAPITAL LETTER NJ")
       (=ucs		  . #x01CA)	; NJ
       ))
-    (=ucs		. #x01CC)	; nj
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter a with caron")
-      (=jis-x0212	  . #x2A26)	; &JX1-286F; [10-06]
-      (=jis-x0213-1-2000  . #x286F)	; &I-JX1-286F; [08-79]
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01CD)	; Ǎ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH CARON")
       (=ucs		  . #x01CE)	; ǎ
       ))
-    (=ucs		. #x01CD)	; Ǎ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter a with caron")
-    (=>ucs		. #x01CD)	; Ǎ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01CD)
-    (->lowercase
-     ((name		  . "fullwidth latin small letter a with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
       (=ucs		  . #x01CD)	; Ǎ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER A")
+      (=ucs		  . #xFF21)	; Ａ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@jis/fw	. #x01CD)	; &JX1-286F;
     (=jis-x0212		. #x2A26)	; &JX1-286F; [10-06]
-    (=jis-x0213-1-2000	. #x286F)	; &I-JX1-286F; [08-79]
+    (=jis-x0213-1	. #x286F)	; &I-JX1-286F; [08-79]
     (=jef-china3	. #x88DF)	; &I-JC3-88DF;
-    (=ucs@jis		. #x01CD)	; &JX1-286F;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
+      (=ucs		  . #x01CD)	; Ǎ
+      ))
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01CE)	; &JX1-2870;
+      (=ucs@jis/fw	  . #x01CE)	; &JX1-2870;
+      (=gb2312		  . #x2823)	; &JX1-2870; [08-03]
+      (=jis-x0212	  . #x2B26)	; &I-JSP-2B26; [11-06]
+      (=jis-x0213-1	  . #x2870)	; &I-JX1-2870; [08-80]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter a with caron")
-      (=gb2312		  . #x2823)	; &JX1-2870; [08-03]
-      (=jis-x0212	  . #x2B26)	; &I-JSP-2B26; [11-06]
-      (=jis-x0213-1-2000  . #x2870)	; &I-JX1-2870; [08-80]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01CE)	; ǎ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH CARON")
       (=ucs		  . #x01CD)	; Ǎ
       ))
-    (=ucs		. #x01CE)	; ǎ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter a with caron")
-    (=>ucs		. #x01CE)	; ǎ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01CE)
-    (->uppercase
-     ((name . "fullwidth latin capital letter a with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER A WITH CARON")
       (=ucs		  . #x01CE)	; ǎ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER A")
+      (=ucs		  . #xFF41)	; ａ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@gb/fw		. #x01CE)	; &JX1-2870;
+    (=ucs@jis/fw	. #x01CE)	; &JX1-2870;
     (=gb2312		. #x2823)	; &JX1-2870; [08-03]
     (=jis-x0212		. #x2B26)	; &I-JSP-2B26; [11-06]
-    (=jis-x0213-1-2000	. #x2870)	; &I-JX1-2870; [08-80]
+    (=jis-x0213-1	. #x2870)	; &I-JX1-2870; [08-80]
     (=jef-china3	. #x88EE)	; &I-JC3-88EE;
-    (=ucs@jis		. #x01CE)	; &JX1-2870;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER A WITH CARON")
+      (=ucs		  . #x01CE)	; ǎ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01CD)	; &JX1-286F;
+      (=jis-x0212	  . #x2A26)	; &JX1-286F; [10-06]
+      (=jis-x0213-1	  . #x286F)	; &I-JX1-286F; [08-79]
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0049 #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter i with caron")
-      (=jis-x0212	  . #x2A43)	; &JSP-2A43; [10-35]
-      (=jef-china3	  . #x88E4)	; &I-JC3-88E4;
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01CF)	; Ǐ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH CARON")
       (=ucs		  . #x01D0)	; ǐ
       ))
-    (=ucs		. #x01CF)	; Ǐ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter i with caron")
-    (=>ucs		. #x01CF)	; Ǐ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01CF)
-    (->lowercase
-     ((name		  . "fullwidth latin small letter i with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
       (=ucs		  . #x01CF)	; Ǐ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER I")
+      (=ucs		  . #xFF29)	; Ｉ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@jis/fw	. #x01CF)	; &JSP-2A43;
     (=jis-x0212		. #x2A43)	; &JSP-2A43; [10-35]
     (=jef-china3	. #x88E4)	; &I-JC3-88E4;
-    (=ucs@jis		. #x01CF)	; &JSP-2A43;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
+      (=ucs		  . #x01CF)	; Ǐ
+      ))
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01D0)	; &JX1-2871;
+      (=ucs@jis/fw	  . #x01D0)	; &JX1-2871;
+      (=gb2312		  . #x282B)	; &JX1-2871; [08-11]
+      (=jis-x0212	  . #x2B43)	; &I-JSP-2B43; [11-35]
+      (=jis-x0213-1	  . #x2871)	; &I-JX1-2871; [08-81]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0069 #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter i with caron")
-      (=gb2312		  . #x282B)	; &JX1-2871; [08-11]
-      (=jis-x0212	  . #x2B43)	; &I-JSP-2B43; [11-35]
-      (=jis-x0213-1-2000  . #x2871)	; &I-JX1-2871; [08-81]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01D0)	; ǐ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH CARON")
       (=ucs		  . #x01CF)	; Ǐ
       ))
-    (=ucs		. #x01D0)	; ǐ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter i with caron")
-    (=>ucs		. #x01D0)	; ǐ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D0)
-    (->uppercase
-     ((name . "fullwidth latin capital letter i with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER I WITH CARON")
       (=ucs		  . #x01D0)	; ǐ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER I")
+      (=ucs		  . #xFF49)	; ｉ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@gb/fw		. #x01D0)	; &JX1-2871;
+    (=ucs@jis/fw	. #x01D0)	; &JX1-2871;
     (=gb2312		. #x282B)	; &JX1-2871; [08-11]
     (=jis-x0212		. #x2B43)	; &I-JSP-2B43; [11-35]
-    (=jis-x0213-1-2000	. #x2871)	; &I-JX1-2871; [08-81]
-    (=ucs@jis		. #x01D0)	; &JX1-2871;
+    (=jis-x0213-1	. #x2871)	; &I-JX1-2871; [08-81]
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER I WITH CARON")
+      (=ucs		  . #x01D0)	; ǐ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01CF)	; &JSP-2A43;
+      (=jis-x0212	  . #x2A43)	; &JSP-2A43; [10-35]
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter o with caron")
-      (=jis-x0212	  . #x2A55)	; &JX1-2876; [10-53]
-      (=jis-x0213-1-2000  . #x2876)	; &I-JX1-2876; [08-86]
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01D1)	; Ǒ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH CARON")
       (=ucs		  . #x01D2)	; ǒ
       ))
-    (=ucs		. #x01D1)	; Ǒ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter o with caron")
-    (=>ucs		. #x01D1)	; Ǒ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D1)
-    (->lowercase
-     ((name		  . "fullwidth latin small letter o with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
       (=ucs		  . #x01D1)	; Ǒ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER O")
+      (=ucs		  . #xFF2F)	; Ｏ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@jis/fw	. #x01D1)	; &JX1-2876;
     (=jis-x0212		. #x2A55)	; &JX1-2876; [10-53]
-    (=jis-x0213-1-2000	. #x2876)	; &I-JX1-2876; [08-86]
+    (=jis-x0213-1	. #x2876)	; &I-JX1-2876; [08-86]
     (=jef-china3	. #x88E8)	; &I-JC3-88E8;
-    (=ucs@jis		. #x01D1)	; &JX1-2876;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
+      (=ucs		  . #x01D1)	; Ǒ
+      ))
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01D2)	; &JX1-2877;
+      (=ucs@jis/fw	  . #x01D2)	; &JX1-2877;
+      (=gb2312		  . #x282F)	; &JX1-2877; [08-15]
+      (=jis-x0212	  . #x2B55)	; &I-JSP-2B55; [11-53]
+      (=jis-x0213-1	  . #x2877)	; &I-JX1-2877; [08-87]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter o with caron")
-      (=gb2312		  . #x282F)	; &JX1-2877; [08-15]
-      (=jis-x0212	  . #x2B55)	; &I-JSP-2B55; [11-53]
-      (=jis-x0213-1-2000  . #x2877)	; &I-JX1-2877; [08-87]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01D2)	; ǒ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH CARON")
       (=ucs		  . #x01D1)	; Ǒ
       ))
-    (=ucs		. #x01D2)	; ǒ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter o with caron")
-    (=>ucs		. #x01D2)	; ǒ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D2)
-    (->uppercase
-     ((name . "fullwidth latin capital letter o with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER O WITH CARON")
       (=ucs		  . #x01D2)	; ǒ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER O")
+      (=ucs		  . #xFF4F)	; ｏ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@gb/fw		. #x01D2)	; &JX1-2877;
+    (=ucs@jis/fw	. #x01D2)	; &JX1-2877;
     (=gb2312		. #x282F)	; &JX1-2877; [08-15]
     (=jis-x0212		. #x2B55)	; &I-JSP-2B55; [11-53]
-    (=jis-x0213-1-2000	. #x2877)	; &I-JX1-2877; [08-87]
+    (=jis-x0213-1	. #x2877)	; &I-JX1-2877; [08-87]
     (=jef-china3	. #x88F7)	; &I-JC3-88F7;
-    (=ucs@jis		. #x01D2)	; &JX1-2877;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER O WITH CARON")
+      (=ucs		  . #x01D2)	; ǒ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01D1)	; &JX1-2876;
+      (=jis-x0212	  . #x2A55)	; &JX1-2876; [10-53]
+      (=jis-x0213-1	  . #x2876)	; &I-JX1-2876; [08-86]
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with caron")
-      (=jis-x0212	  . #x2A67)	; &JSP-2A67; [10-71]
-      (=jef-china3	  . #x88EC)	; &I-JC3-88EC;
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01D3)	; Ǔ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH CARON")
       (=ucs		  . #x01D4)	; ǔ
       ))
-    (=ucs		. #x01D3)	; Ǔ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter u with caron")
-    (=>ucs		. #x01D3)	; Ǔ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D3)
-    (->lowercase
-     ((name		  . "fullwidth latin small letter u with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
       (=ucs		  . #x01D3)	; Ǔ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER U")
+      (=ucs		  . #xFF35)	; ï¼µ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@jis/fw	. #x01D3)	; &JSP-2A67;
     (=jis-x0212		. #x2A67)	; &JSP-2A67; [10-71]
     (=jef-china3	. #x88EC)	; &I-JC3-88EC;
-    (=ucs@jis		. #x01D3)	; &JSP-2A67;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
+      (=ucs		  . #x01D3)	; Ǔ
+      ))
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01D4)	; &JX1-2878;
+      (=ucs@jis/fw	  . #x01D4)	; &JX1-2878;
+      (=gb2312		  . #x2833)	; &JX1-2878; [08-19]
+      (=jis-x0212	  . #x2B67)	; &I-JSP-2B67; [11-71]
+      (=jis-x0213-1	  . #x2878)	; &I-JX1-2878; [08-88]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x030C)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter u with caron")
-      (=gb2312		  . #x2833)	; &JX1-2878; [08-19]
-      (=jis-x0212	  . #x2B67)	; &I-JSP-2B67; [11-71]
-      (=jis-x0213-1-2000  . #x2878)	; &I-JX1-2878; [08-88]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01D4)	; ǔ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH CARON")
       (=ucs		  . #x01D3)	; Ǔ
       ))
-    (=ucs		. #x01D4)	; ǔ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter u with caron")
-    (=>ucs		. #x01D4)	; ǔ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D4)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER U WITH CARON")
       (=ucs		  . #x01D4)	; ǔ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER U")
+      (=ucs		  . #xFF55)	; ｕ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs@gb/fw		. #x01D4)	; &JX1-2878;
+    (=ucs@jis/fw	. #x01D4)	; &JX1-2878;
     (=gb2312		. #x2833)	; &JX1-2878; [08-19]
     (=jis-x0212		. #x2B67)	; &I-JSP-2B67; [11-71]
-    (=jis-x0213-1-2000	. #x2878)	; &I-JX1-2878; [08-88]
+    (=jis-x0213-1	. #x2878)	; &I-JX1-2878; [08-88]
     (=jef-china3	. #x88FB)	; &I-JC3-88FB;
-    (=ucs@jis		. #x01D4)	; &JX1-2878;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER U WITH CARON")
+      (=ucs		  . #x01D4)	; ǔ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01D3)	; &JSP-2A67;
+      (=jis-x0212	  . #x2A67)	; &JSP-2A67; [10-71]
+      ))
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00DC #x0304)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and macron")
-      (=jis-x0212	  . #x2A70)	; &JSP-2A70; [10-80]
-      (=ucs@jis		  . #x01D5)	; &JSP-2A70;
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00DC)	; Ü
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
       ))
+    (=ucs		. #x01D5)	; Ǖ
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D6)	; ǖ
       ))
-    (=ucs		. #x01D5)	; Ǖ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and macron")
-    (=>ucs		. #x01D5)	; Ǖ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D5)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and macron")
+  '((<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
+      (=ucs		  . #x01D5)	; Ǖ
       ))
+    (=ucs@jis/fw	. #x01D5)	; &JSP-2A70;
+    (=jis-x0212		. #x2A70)	; &JSP-2A70; [10-80]
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D5)	; Ǖ
       ))
-    (=jis-x0212		. #x2A70)	; &JSP-2A70; [10-80]
-    (=ucs@jis		. #x01D5)	; &JSP-2A70;
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01D6)	; &JX1-2879;
+      (=ucs@jis/fw	  . #x01D6)	; &JX1-2879;
+      (=gb2312		  . #x2835)	; &JX1-2879; [08-21]
+      (=jis-x0212	  . #x2B70)	; &I-JSP-2B70; [11-80]
+      (=jis-x0213-1	  . #x2879)	; &I-JX1-2879; [08-89]
+      ))
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00FC #x0304)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and macron")
-      (=gb2312		  . #x2835)	; &JX1-2879; [08-21]
-      (=jis-x0212	  . #x2B70)	; &I-JSP-2B70; [11-80]
-      (=jis-x0213-1-2000  . #x2879)	; &I-JX1-2879; [08-89]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00FC)	; ü
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
       ))
+    (=ucs		. #x01D6)	; ǖ
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D5)	; Ǖ
       ))
-    (=ucs		. #x01D6)	; ǖ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and macron")
-    (=>ucs		. #x01D6)	; ǖ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D6)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and macron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01D6)	; ǖ
       ))
+    (=ucs@gb/fw		. #x01D6)	; &JX1-2879;
+    (=ucs@jis/fw	. #x01D6)	; &JX1-2879;
     (=gb2312		. #x2835)	; &JX1-2879; [08-21]
     (=jis-x0212		. #x2B70)	; &I-JSP-2B70; [11-80]
-    (=jis-x0213-1-2000	. #x2879)	; &I-JX1-2879; [08-89]
-    (=ucs@jis		. #x01D6)	; &JX1-2879;
+    (=jis-x0213-1	. #x2879)	; &I-JX1-2879; [08-89]
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND MACRON")
+      (=ucs		  . #x01D6)	; ǖ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01D5)	; &JSP-2A70;
+      (=jis-x0212	  . #x2A70)	; &JSP-2A70; [10-80]
+      ))
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00DC #x0301)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and acute")
-      (=jis-x0212	  . #x2A6D)	; &JSP-2A6D; [10-77]
-      (=ucs@jis		  . #x01D7)	; &JSP-2A6D;
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00DC)	; Ü
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
       ))
+    (=ucs		. #x01D7)	; Ǘ
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D8)	; ǘ
       ))
-    (=ucs		. #x01D7)	; Ǘ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and acute")
-    (=>ucs		. #x01D7)	; Ǘ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D7)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and acute")
+  '((<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
+      (=ucs		  . #x01D7)	; Ǘ
       ))
+    (=ucs@jis/fw	. #x01D7)	; &JSP-2A6D;
+    (=jis-x0212		. #x2A6D)	; &JSP-2A6D; [10-77]
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D7)	; Ǘ
       ))
-    (=jis-x0212		. #x2A6D)	; &JSP-2A6D; [10-77]
-    (=ucs@jis		. #x01D7)	; &JSP-2A6D;
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01D8)	; &JX1-287A;
+      (=ucs@jis/fw	  . #x01D8)	; &JX1-287A;
+      (=gb2312		  . #x2836)	; &JX1-287A; [08-22]
+      (=jis-x0212	  . #x2B6D)	; &I-JSP-2B6D; [11-77]
+      (=jis-x0213-1	  . #x287A)	; &I-JX1-287A; [08-90]
+      ))
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00FC #x0301)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and acute")
-      (=gb2312		  . #x2836)	; &JX1-287A; [08-22]
-      (=jis-x0212	  . #x2B6D)	; &I-JSP-2B6D; [11-77]
-      (=jis-x0213-1-2000  . #x287A)	; &I-JX1-287A; [08-90]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00FC)	; ü
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
       ))
+    (=ucs		. #x01D8)	; ǘ
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D7)	; Ǘ
       ))
-    (=ucs		. #x01D8)	; ǘ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and acute")
-    (=>ucs		. #x01D8)	; ǘ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D8)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and acute")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x01D8)	; ǘ
       ))
+    (=ucs@gb/fw		. #x01D8)	; &JX1-287A;
+    (=ucs@jis/fw	. #x01D8)	; &JX1-287A;
     (=gb2312		. #x2836)	; &JX1-287A; [08-22]
     (=jis-x0212		. #x2B6D)	; &I-JSP-2B6D; [11-77]
-    (=jis-x0213-1-2000	. #x287A)	; &I-JX1-287A; [08-90]
-    (=ucs@jis		. #x01D8)	; &JX1-287A;
+    (=jis-x0213-1	. #x287A)	; &I-JX1-287A; [08-90]
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE")
+      (=ucs		  . #x01D8)	; ǘ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01D7)	; &JSP-2A6D;
+      (=jis-x0212	  . #x2A6D)	; &JSP-2A6D; [10-77]
+      ))
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00DC #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and caron")
-      (=jis-x0212	  . #x2A6F)	; &JSP-2A6F; [10-79]
-      (=ucs@jis		  . #x01D9)	; &JSP-2A6F;
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00DC)	; Ü
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01D9)	; Ǚ
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01DA)	; ǚ
       ))
-    (=ucs		. #x01D9)	; Ǚ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and caron")
-    (=>ucs		. #x01D9)	; Ǚ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01D9)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and caron")
+  '((<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
+      (=ucs		  . #x01D9)	; Ǚ
       ))
+    (=ucs@jis/fw	. #x01D9)	; &JSP-2A6F;
+    (=jis-x0212		. #x2A6F)	; &JSP-2A6F; [10-79]
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01D9)	; Ǚ
       ))
-    (=jis-x0212		. #x2A6F)	; &JSP-2A6F; [10-79]
-    (=ucs@jis		. #x01D9)	; &JSP-2A6F;
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01DA)	; &JX1-287B;
+      (=ucs@jis/fw	  . #x01DA)	; &JX1-287B;
+      (=gb2312		  . #x2837)	; &JX1-287B; [08-23]
+      (=jis-x0212	  . #x2B6F)	; &I-JSP-2B6F; [11-79]
+      (=jis-x0213-1	  . #x287B)	; &I-JX1-287B; [08-91]
+      ))
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00FC #x030C)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and caron")
-      (=gb2312		  . #x2837)	; &JX1-287B; [08-23]
-      (=jis-x0212	  . #x2B6F)	; &I-JSP-2B6F; [11-79]
-      (=jis-x0213-1-2000  . #x287B)	; &I-JX1-287B; [08-91]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00FC)	; ü
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
       ))
+    (=ucs		. #x01DA)	; ǚ
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01D9)	; Ǚ
       ))
-    (=ucs		. #x01DA)	; ǚ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and caron")
-    (=>ucs		. #x01DA)	; ǚ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01DA)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and caron")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
       (=ucs		  . #x01DA)	; ǚ
       ))
+    (=ucs@gb/fw		. #x01DA)	; &JX1-287B;
+    (=ucs@jis/fw	. #x01DA)	; &JX1-287B;
     (=gb2312		. #x2837)	; &JX1-287B; [08-23]
     (=jis-x0212		. #x2B6F)	; &I-JSP-2B6F; [11-79]
-    (=jis-x0213-1-2000	. #x287B)	; &I-JX1-287B; [08-91]
-    (=ucs@jis		. #x01DA)	; &JX1-287B;
+    (=jis-x0213-1	. #x287B)	; &I-JX1-287B; [08-91]
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND CARON")
+      (=ucs		  . #x01DA)	; ǚ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01D9)	; &JSP-2A6F;
+      (=jis-x0212	  . #x2A6F)	; &JSP-2A6F; [10-79]
+      ))
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00DC #x0300)
-    (->fullwidth
-     ((name . "fullwidth latin capital letter u with diaeresis and grave")
-      (=jis-x0212	  . #x2A6E)	; &JSP-2A6E; [10-78]
-      (=ucs@jis		  . #x01DB)	; &JSP-2A6E;
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00DC)	; Ü
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
       ))
+    (=ucs		. #x01DB)	; Ǜ
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DC)	; ǜ
       ))
-    (=ucs		. #x01DB)	; Ǜ
     ))
 (define-char
-  '((name . "fullwidth latin capital letter u with diaeresis and grave")
-    (=>ucs		. #x01DB)	; Ǜ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01DB)
-    (->lowercase
-     ((name . "fullwidth latin small letter u with diaeresis and grave")
+  '((<-denotational
+     ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
+      (=ucs		  . #x01DB)	; Ǜ
       ))
+    (=ucs@jis/fw	. #x01DB)	; &JSP-2A6E;
+    (=jis-x0212		. #x2A6E)	; &JSP-2A6E; [10-78]
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DB)	; Ǜ
       ))
-    (=jis-x0212		. #x2A6E)	; &JSP-2A6E; [10-78]
-    (=ucs@jis		. #x01DB)	; &JSP-2A6E;
+    (->lowercase
+     ((=ucs@gb/fw	  . #x01DC)	; &JX1-287C;
+      (=ucs@jis/fw	  . #x01DC)	; &JX1-287C;
+      (=gb2312		  . #x2838)	; &JX1-287C; [08-24]
+      (=jis-x0212	  . #x2B6E)	; &I-JSP-2B6E; [11-78]
+      (=jis-x0213-1	  . #x287C)	; &I-JX1-287C; [08-92]
+      ))
     ))
 (define-char
   '((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00FC #x0300)
-    (->fullwidth
-     ((name . "fullwidth latin small letter u with diaeresis and grave")
-      (=gb2312		  . #x2838)	; &JX1-287C; [08-24]
-      (=jis-x0212	  . #x2B6E)	; &I-JSP-2B6E; [11-78]
-      (=jis-x0213-1-2000  . #x287C)	; &I-JX1-287C; [08-92]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS")
+      (=ucs		  . #x00FC)	; ü
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
       ))
+    (=ucs		. #x01DC)	; ǜ
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DB)	; Ǜ
       ))
-    (=ucs		. #x01DC)	; ǜ
     ))
 (define-char
-  '((name . "fullwidth latin small letter u with diaeresis and grave")
-    (=>ucs		. #x01DC)	; ǜ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01DC)
-    (->uppercase
-     ((name . "fullwidth latin capital letter u with diaeresis and grave")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
       (=ucs		  . #x01DC)	; ǜ
       ))
+    (=ucs@gb/fw		. #x01DC)	; &JX1-287C;
+    (=ucs@jis/fw	. #x01DC)	; &JX1-287C;
     (=gb2312		. #x2838)	; &JX1-287C; [08-24]
     (=jis-x0212		. #x2B6E)	; &I-JSP-2B6E; [11-78]
-    (=jis-x0213-1-2000	. #x287C)	; &I-JX1-287C; [08-92]
-    (=ucs@jis		. #x01DC)	; &JX1-287C;
+    (=jis-x0213-1	. #x287C)	; &I-JX1-287C; [08-92]
+    (<-fullwidth
+     ((name . "LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE")
+      (=ucs		  . #x01DC)	; ǜ
+      ))
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01DB)	; &JSP-2A6E;
+      (=jis-x0212	  . #x2A6E)	; &JSP-2A6E; [10-78]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER TURNED E")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01DD)	; ǝ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER REVERSED E")
       (=ucs		  . #x018E)	; Ǝ
       ))
-    (=ucs		. #x01DD)	; ǝ
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C4 #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH DIAERESIS")
+      (=ucs		  . #x00C4)	; Ä
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01DE)	; Ǟ
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01DF)	; ǟ
       ))
-    (=ucs		. #x01DE)	; Ǟ
     ))
 (define-char
   '((name . "LATIN SMALL LETTER A WITH DIAERESIS AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E4 #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH DIAERESIS")
+      (=ucs		  . #x00E4)	; ä
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01DF)	; ǟ
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON")
       (=ucs		  . #x01DE)	; Ǟ
       ))
-    (=ucs		. #x01DF)	; ǟ
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0226 #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH DOT ABOVE")
+      (=ucs		  . #x0226)	; Ȧ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01E0)	; Ç 
     (->lowercase
      ((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")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0227 #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH DOT ABOVE")
+      (=ucs		  . #x0227)	; ȧ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01E1)	; Ç¡
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON")
       (=ucs		  . #x01E0)	; Ç 
       ))
-    (=ucs		. #x01E1)	; Ç¡
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER AE WITH MACRON")
@@ -1534,12 +1713,18 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "ash *")
-    (->decomposition	#x00C6 #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER AE")
+      (=ucs		  . #x00C6)	; Æ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01E2)	; Ǣ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER AE WITH MACRON")
       (=ucs		  . #x01E3)	; ǣ
       ))
-    (=ucs		. #x01E2)	; Ǣ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER AE WITH MACRON")
@@ -1547,161 +1732,233 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "ash *")
-    (->decomposition	#x00E6 #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER AE")
+      (=ucs		  . #x00E6)	; æ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01E3)	; ǣ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER AE WITH MACRON")
       (=ucs		  . #x01E2)	; Ǣ
       ))
-    (=ucs		. #x01E3)	; ǣ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER G WITH STROKE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01E4)	; Ǥ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER G WITH STROKE")
       (=ucs		  . #x01E5)	; ǥ
       ))
-    (=ucs		. #x01E4)	; Ǥ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER G WITH STROKE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01E5)	; ǥ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER G WITH STROKE")
       (=ucs		  . #x01E4)	; Ǥ
       ))
-    (=ucs		. #x01E5)	; ǥ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER G WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0047 #x030C)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER G")
+      (=ucs		  . #x0047)	; G
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x01E6)	; Ǧ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER G WITH CARON")
       (=ucs		  . #x01E7)	; ǧ
       ))
-    (=ucs		. #x01E6)	; Ǧ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER G WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0067 #x030C)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER G")
+      (=ucs		  . #x0067)	; g
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x01E7)	; ǧ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER G WITH CARON")
       (=ucs		  . #x01E6)	; Ǧ
       ))
-    (=ucs		. #x01E7)	; ǧ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER K WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004B #x030C)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER K")
+      (=ucs		  . #x004B)	; K
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x01E8)	; Ǩ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER K WITH CARON")
       (=ucs		  . #x01E9)	; Ç©
       ))
-    (=ucs		. #x01E8)	; Ǩ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER K WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006B #x030C)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER K")
+      (=ucs		  . #x006B)	; k
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x01E9)	; Ç©
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER K WITH CARON")
       (=ucs		  . #x01E8)	; Ǩ
       ))
-    (=ucs		. #x01E9)	; Ç©
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH OGONEK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x0328)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING OGONEK")
+      (=ucs		  . #x0328)	; ̨
+      ))
+    (=ucs		. #x01EA)	; Ǫ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH OGONEK")
       (=ucs		  . #x01EB)	; Ç«
       ))
-    (=ucs		. #x01EA)	; Ǫ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH OGONEK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x0328)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING OGONEK")
+      (=ucs		  . #x0328)	; ̨
+      ))
+    (=ucs		. #x01EB)	; Ç«
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH OGONEK")
       (=ucs		  . #x01EA)	; Ǫ
       ))
-    (=ucs		. #x01EB)	; Ç«
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH OGONEK AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01EA #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH OGONEK")
+      (=ucs		  . #x01EA)	; Ǫ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01EC)	; Ǭ
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH OGONEK AND MACRON")
       (=ucs		  . #x01ED)	; Ç­
       ))
-    (=ucs		. #x01EC)	; Ǭ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH OGONEK AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01EB #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH OGONEK")
+      (=ucs		  . #x01EB)	; Ç«
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x01ED)	; Ç­
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH OGONEK AND MACRON")
       (=ucs		  . #x01EC)	; Ǭ
       ))
-    (=ucs		. #x01ED)	; Ç­
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER EZH WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01B7 #x030C)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER EZH")
+      (=ucs		  . #x01B7)	; Æ·
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x01EE)	; Ç®
     (->lowercase
      ((name		  . "LATIN SMALL LETTER EZH WITH CARON")
       (=ucs		  . #x01EF)	; ǯ
       ))
-    (=ucs		. #x01EE)	; Ç®
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER EZH WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0292 #x030C)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER EZH")
+      (=ucs		  . #x0292)	; ʒ
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x01EF)	; ǯ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER EZH WITH CARON")
       (=ucs		  . #x01EE)	; Ç®
       ))
-    (=ucs		. #x01EF)	; ǯ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER J WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006A #x030C)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
     (=ucs		. #x01F0)	; Ç°
     ))
 (define-char
@@ -1709,7 +1966,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0044 #x005A)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      ))
+    (=ucs		. #x01F1)	; DZ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER DZ")
       (=ucs		  . #x01F3)	; dz
@@ -1718,14 +1982,20 @@
      ((name		  . "LATIN CAPITAL LETTER D WITH SMALL LETTER Z")
       (=ucs		  . #x01F2)	; Dz
       ))
-    (=ucs		. #x01F1)	; DZ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER D WITH SMALL LETTER Z")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0044 #x007A)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "LATIN SMALL LETTER Z")
+      (=ucs		  . #x007A)	; z
+      ))
+    (=ucs		. #x01F2)	; Dz
     (->lowercase
      ((name		  . "LATIN SMALL LETTER DZ")
       (=ucs		  . #x01F3)	; dz
@@ -1734,14 +2004,20 @@
      ((name		  . "LATIN CAPITAL LETTER DZ")
       (=ucs		  . #x01F1)	; DZ
       ))
-    (=ucs		. #x01F2)	; Dz
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER DZ")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0064 #x007A)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "LATIN SMALL LETTER Z")
+      (=ucs		  . #x007A)	; z
+      ))
+    (=ucs		. #x01F3)	; dz
     (->titlecase
      ((name		  . "LATIN CAPITAL LETTER D WITH SMALL LETTER Z")
       (=ucs		  . #x01F2)	; Dz
@@ -1750,168 +2026,228 @@
      ((name		  . "LATIN CAPITAL LETTER DZ")
       (=ucs		  . #x01F1)	; DZ
       ))
-    (=ucs		. #x01F3)	; dz
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER G WITH ACUTE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0047 #x0301)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER G")
+      (=ucs		  . #x0047)	; G
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x01F4)	; Ç´
     (->lowercase
      ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
       (=ucs		  . #x01F5)	; ǵ
       ))
-    (=ucs		. #x01F4)	; Ç´
     ))
 (define-char
-  '((=>ucs		. #x01F4)	; Ç´
+  '((<-denotational
+     ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
+      (=ucs		  . #x01F4)	; Ç´
+      ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER G")
+      (=ucs		  . #xFF27)	; Ｇ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85D9)	; &JC3-85D9;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
+      (=ucs		  . #x01F4)	; Ç´
+      ))
+    (->lowercase
+     ((=ucs@jis/fw	  . #x01F5)	; &JSP-2B39;
+      (=jis-x0212	  . #x2B39)	; &JSP-2B39; [11-25]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER G WITH ACUTE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0067 #x0301)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter g with acute")
-      (=jis-x0212	  . #x2B39)	; &JSP-2B39; [11-25]
-      (=jef-china3	  . #x85EF)	; &I-JC3-85EF;
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER G")
+      (=ucs		  . #x0067)	; g
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
       ))
+    (=ucs		. #x01F5)	; ǵ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER G WITH ACUTE")
       (=ucs		  . #x01F4)	; Ç´
       ))
-    (=ucs		. #x01F5)	; ǵ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter g with acute")
-    (=>ucs		. #x01F5)	; ǵ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01F5)
-    (->uppercase
-     ((name . "fullwidth latin capital letter g with acute")
-      ))
-    (<-fullwidth
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
       (=ucs		  . #x01F5)	; ǵ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER G")
+      (=ucs		  . #xFF47)	; ｇ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs@jis/fw	. #x01F5)	; &JSP-2B39;
     (=jis-x0212		. #x2B39)	; &JSP-2B39; [11-25]
     (=jef-china3	. #x85EF)	; &I-JC3-85EF;
-    (=ucs@jis		. #x01F5)	; &JSP-2B39;
+    (<-fullwidth
+     ((name		  . "LATIN SMALL LETTER G WITH ACUTE")
+      (=ucs		  . #x01F5)	; ǵ
+      ))
+    (->uppercase
+     ((=jef-china3	  . #x85D9)	; &JC3-85D9;
+      ))
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER HWAIR")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01F6)	; Ƕ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER HV")
       (=ucs		  . #x0195)	; ƕ
       ))
-    (=ucs		. #x01F6)	; Ƕ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER WYNN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x01F7)	; Ç·
     (->lowercase
      ((name		  . "LATIN LETTER WYNN")
       (=ucs		  . #x01BF)	; Æ¿
       ))
-    (=ucs		. #x01F7)	; Ç·
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER N WITH GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004E #x0300)
-    (->fullwidth
-     ((=jis-x0213-1-2000  . #x2874)	; &JX1-2874; [08-84]
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
       ))
+    (=ucs		. #x01F8)	; Ǹ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
       (=ucs		  . #x01F9)	; ǹ
       ))
-    (=ucs		. #x01F8)	; Ǹ
     ))
 (define-char
-  '((name		. "fullwidth latin capital letter n with grave")
-    (=>ucs		. #x01F8)	; Ǹ
-    (general-category	letter uppercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->lowercase
-     ((=jis-x0213-1-2000  . #x2875)	; &JX1-2875; [08-85]
+  '((<-denotational
+     ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F8)	; Ǹ
       ))
-    (<-fullwidth
-     ((=ucs		  . #x01F8)	; Ǹ
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER N")
+      (=ucs		  . #xFF2E)	; ï¼®
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
       ))
-    (=jis-x0213-1-2000	. #x2874)	; &JX1-2874; [08-84]
+    (=ucs@jis/fw	. #x01F8)	; &JX1-2874;
+    (=jis-x0213-1	. #x2874)	; &JX1-2874; [08-84]
     (=jef-china3	. #x85BC)	; &I-JC3-85BC;
-    (=ucs@jis		. #x01F8)	; &JX1-2874;
+    (<-fullwidth
+     ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F8)	; Ǹ
+      ))
+    (->lowercase
+     ((=ucs@jis/fw	  . #x01F9)	; &JX1-2875;
+      (=jis-x0213-1	  . #x2875)	; &JX1-2875; [08-85]
+      ))
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER N WITH GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006E #x0300)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter n with grave")
-      (=jis-x0213-1-2000  . #x2875)	; &JX1-2875; [08-85]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
       ))
+    (=ucs		. #x01F9)	; ǹ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER N WITH GRAVE")
       (=ucs		  . #x01F8)	; Ǹ
       ))
-    (=ucs		. #x01F9)	; ǹ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter n with grave")
-    (=>ucs		. #x01F9)	; ǹ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01F9)
-    (->uppercase
-     ((=jis-x0213-1-2000  . #x2874)	; &JX1-2874; [08-84]
+  '((<-denotational
+     ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
+      (=ucs		  . #x01F9)	; ǹ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER N")
+      (=ucs		  . #xFF4E)	; ｎ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs@jis/fw	. #x01F9)	; &JX1-2875;
+    (=jis-x0213-1	. #x2875)	; &JX1-2875; [08-85]
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER N WITH GRAVE")
       (=ucs		  . #x01F9)	; ǹ
       ))
-    (=jis-x0213-1-2000	. #x2875)	; &JX1-2875; [08-85]
-    (=ucs@jis		. #x01F9)	; &JX1-2875;
+    (->uppercase
+     ((=ucs@jis/fw	  . #x01F8)	; &JX1-2874;
+      (=jis-x0213-1	  . #x2874)	; &JX1-2874; [08-84]
+      ))
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C5 #x0301)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH RING ABOVE")
+      (=ucs		  . #x00C5)	; Å
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x01FA)	; Ǻ
     (->lowercase
      ((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")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E5 #x0301)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH RING ABOVE")
+      (=ucs		  . #x00E5)	; å
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x01FB)	; Ç»
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE")
       (=ucs		  . #x01FA)	; Ǻ
       ))
-    (=ucs		. #x01FB)	; Ç»
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER AE WITH ACUTE")
@@ -1919,12 +2255,18 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "ash *")
-    (->decomposition	#x00C6 #x0301)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER AE")
+      (=ucs		  . #x00C6)	; Æ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x01FC)	; Ǽ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FD)	; ǽ
       ))
-    (=ucs		. #x01FC)	; Ǽ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER AE WITH ACUTE")
@@ -1932,649 +2274,931 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "ash *")
-    (->decomposition	#x00E6 #x0301)
-    (->fullwidth
-     ((name		  . "fullwidth latin small letter ae with acute")
-      (=jis-x0213-1-2000  . #x2B45)	; &JX1-2B45; [11-37]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER AE")
+      (=ucs		  . #x00E6)	; æ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
       ))
+    (=ucs		. #x01FD)	; ǽ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FC)	; Ǽ
       ))
-    (=ucs		. #x01FD)	; ǽ
     ))
 (define-char
-  '((name		. "fullwidth latin small letter ae with acute")
-    (=>ucs		. #x01FD)	; ǽ
-    (general-category	letter lowercase) ; Normative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x01FD)
-    (->uppercase
-     ((name . "fullwidth latin capital letter ae with acute")
+  '((<-denotational
+     ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
+      (=ucs		  . #x01FD)	; ǽ
       ))
+    (=decomposition
+     ((=ucs@jis/fw	  . #x00E6)	; &JX1-295C;
+      (=ks-x1001	  . #x2921)	; &JX1-295C; [09-01]
+      (=jis-x0212	  . #x2941)	; &I-JSP-2941; [09-33]
+      (=jis-x0213-1	  . #x295C)	; &I-JX1-295C; [09-60]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs@jis/fw	. #x01FD)	; &JX1-2B45;
+    (=jis-x0213-1	. #x2B45)	; &JX1-2B45; [11-37]
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER AE WITH ACUTE")
       (=ucs		  . #x01FD)	; ǽ
       ))
-    (=jis-x0213-1-2000	. #x2B45)	; &JX1-2B45; [11-37]
-    (=ucs@jis		. #x01FD)	; &JX1-2B45;
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH STROKE AND ACUTE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D8 #x0301)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH STROKE")
+      (=ucs		  . #x00D8)	; Ø
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x01FE)	; Ǿ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH STROKE AND ACUTE")
       (=ucs		  . #x01FF)	; Ç¿
       ))
-    (=ucs		. #x01FE)	; Ǿ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH STROKE AND ACUTE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F8 #x0301)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH STROKE")
+      (=ucs		  . #x00F8)	; ø
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x01FF)	; Ç¿
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH STROKE AND ACUTE")
       (=ucs		  . #x01FE)	; Ǿ
       ))
-    (=ucs		. #x01FF)	; Ç¿
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH DOUBLE GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x030F)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0200)	; Ȁ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH DOUBLE GRAVE")
       (=ucs		  . #x0201)	; ȁ
       ))
-    (=ucs		. #x0200)	; Ȁ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH DOUBLE GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x030F)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0201)	; ȁ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH DOUBLE GRAVE")
       (=ucs		  . #x0200)	; Ȁ
       ))
-    (=ucs		. #x0201)	; ȁ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH INVERTED BREVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x0311)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0202)	; Ȃ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH INVERTED BREVE")
       (=ucs		  . #x0203)	; ȃ
       ))
-    (=ucs		. #x0202)	; Ȃ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH INVERTED BREVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x0311)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0203)	; ȃ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH INVERTED BREVE")
       (=ucs		  . #x0202)	; Ȃ
       ))
-    (=ucs		. #x0203)	; ȃ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER E WITH DOUBLE GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x030F)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0204)	; Ȅ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH DOUBLE GRAVE")
       (=ucs		  . #x0205)	; ȅ
       ))
-    (=ucs		. #x0204)	; Ȅ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER E WITH DOUBLE GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x030F)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0205)	; ȅ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH DOUBLE GRAVE")
       (=ucs		  . #x0204)	; Ȅ
       ))
-    (=ucs		. #x0205)	; ȅ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER E WITH INVERTED BREVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x0311)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0206)	; Ȇ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH INVERTED BREVE")
       (=ucs		  . #x0207)	; ȇ
       ))
-    (=ucs		. #x0206)	; Ȇ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER E WITH INVERTED BREVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x0311)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0207)	; ȇ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH INVERTED BREVE")
       (=ucs		  . #x0206)	; Ȇ
       ))
-    (=ucs		. #x0207)	; ȇ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH DOUBLE GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0049 #x030F)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0208)	; Ȉ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH DOUBLE GRAVE")
       (=ucs		  . #x0209)	; ȉ
       ))
-    (=ucs		. #x0208)	; Ȉ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH DOUBLE GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0069 #x030F)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0209)	; ȉ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH DOUBLE GRAVE")
       (=ucs		  . #x0208)	; Ȉ
       ))
-    (=ucs		. #x0209)	; ȉ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER I WITH INVERTED BREVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0049 #x0311)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x020A)	; Ȋ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH INVERTED BREVE")
       (=ucs		  . #x020B)	; ȋ
       ))
-    (=ucs		. #x020A)	; Ȋ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER I WITH INVERTED BREVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0069 #x0311)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x020B)	; ȋ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH INVERTED BREVE")
       (=ucs		  . #x020A)	; Ȋ
       ))
-    (=ucs		. #x020B)	; ȋ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH DOUBLE GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x030F)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x020C)	; Ȍ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH DOUBLE GRAVE")
       (=ucs		  . #x020D)	; ȍ
       ))
-    (=ucs		. #x020C)	; Ȍ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH DOUBLE GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x030F)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x020D)	; ȍ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH DOUBLE GRAVE")
       (=ucs		  . #x020C)	; Ȍ
       ))
-    (=ucs		. #x020D)	; ȍ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH INVERTED BREVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x0311)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x020E)	; Ȏ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH INVERTED BREVE")
       (=ucs		  . #x020F)	; ȏ
       ))
-    (=ucs		. #x020E)	; Ȏ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH INVERTED BREVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x0311)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x020F)	; ȏ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH INVERTED BREVE")
       (=ucs		  . #x020E)	; Ȏ
       ))
-    (=ucs		. #x020F)	; ȏ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER R WITH DOUBLE GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0052 #x030F)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0210)	; Ȑ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER R WITH DOUBLE GRAVE")
       (=ucs		  . #x0211)	; ȑ
       ))
-    (=ucs		. #x0210)	; Ȑ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER R WITH DOUBLE GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0072 #x030F)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0211)	; ȑ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER R WITH DOUBLE GRAVE")
       (=ucs		  . #x0210)	; Ȑ
       ))
-    (=ucs		. #x0211)	; ȑ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER R WITH INVERTED BREVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0052 #x0311)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0212)	; Ȓ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER R WITH INVERTED BREVE")
       (=ucs		  . #x0213)	; ȓ
       ))
-    (=ucs		. #x0212)	; Ȓ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER R WITH INVERTED BREVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0072 #x0311)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0213)	; ȓ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER R WITH INVERTED BREVE")
       (=ucs		  . #x0212)	; Ȓ
       ))
-    (=ucs		. #x0213)	; ȓ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH DOUBLE GRAVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x030F)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0214)	; Ȕ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH DOUBLE GRAVE")
       (=ucs		  . #x0215)	; ȕ
       ))
-    (=ucs		. #x0214)	; Ȕ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH DOUBLE GRAVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x030F)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
+    (=ucs		. #x0215)	; ȕ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH DOUBLE GRAVE")
       (=ucs		  . #x0214)	; Ȕ
       ))
-    (=ucs		. #x0215)	; ȕ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER U WITH INVERTED BREVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x0311)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0216)	; Ȗ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH INVERTED BREVE")
       (=ucs		  . #x0217)	; ȗ
       ))
-    (=ucs		. #x0216)	; Ȗ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER U WITH INVERTED BREVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x0311)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING INVERTED BREVE")
+      (=ucs		  . #x0311)	; ̑
+      ))
+    (=ucs		. #x0217)	; ȗ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH INVERTED BREVE")
       (=ucs		  . #x0216)	; Ȗ
       ))
-    (=ucs		. #x0217)	; ȗ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER S WITH COMMA BELOW")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0053 #x0326)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER S")
+      (=ucs		  . #x0053)	; S
+      )
+     ((name		  . "COMBINING COMMA BELOW")
+      (=ucs		  . #x0326)	; ̦
+      ))
+    (=ucs		. #x0218)	; Ș
     (->lowercase
      ((name		  . "LATIN SMALL LETTER S WITH COMMA BELOW")
       (=ucs		  . #x0219)	; ș
       ))
-    (=ucs		. #x0218)	; Ș
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER S WITH COMMA BELOW")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0073 #x0326)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER S")
+      (=ucs		  . #x0073)	; s
+      )
+     ((name		  . "COMBINING COMMA BELOW")
+      (=ucs		  . #x0326)	; ̦
+      ))
+    (=ucs		. #x0219)	; ș
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER S WITH COMMA BELOW")
       (=ucs		  . #x0218)	; Ș
       ))
-    (=ucs		. #x0219)	; ș
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER T WITH COMMA BELOW")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0054 #x0326)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "COMBINING COMMA BELOW")
+      (=ucs		  . #x0326)	; ̦
+      ))
+    (=ucs		. #x021A)	; Ț
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH COMMA BELOW")
       (=ucs		  . #x021B)	; ț
       ))
-    (=ucs		. #x021A)	; Ț
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER T WITH COMMA BELOW")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0074 #x0326)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      )
+     ((name		  . "COMBINING COMMA BELOW")
+      (=ucs		  . #x0326)	; ̦
+      ))
+    (=ucs		. #x021B)	; ț
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER T WITH COMMA BELOW")
       (=ucs		  . #x021A)	; Ț
       ))
-    (=ucs		. #x021B)	; ț
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER YOGH")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x021C)	; Ȝ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER YOGH")
       (=ucs		  . #x021D)	; ȝ
       ))
-    (=ucs		. #x021C)	; Ȝ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER YOGH")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x021D)	; ȝ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER YOGH")
       (=ucs		  . #x021C)	; Ȝ
       ))
-    (=ucs		. #x021D)	; ȝ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER H WITH CARON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0048 #x030C)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x021E)	; Ȟ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER H WITH CARON")
       (=ucs		  . #x021F)	; ȟ
       ))
-    (=ucs		. #x021E)	; Ȟ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER H WITH CARON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x030C)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING CARON")
+      (=ucs		  . #x030C)	; ̌
+      ))
+    (=ucs		. #x021F)	; ȟ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER H WITH CARON")
       (=ucs		  . #x021E)	; Ȟ
       ))
-    (=ucs		. #x021F)	; ȟ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER OU")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0222)	; Ȣ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER OU")
       (=ucs		  . #x0223)	; ȣ
       ))
-    (=ucs		. #x0222)	; Ȣ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER OU")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0223)	; ȣ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER OU")
       (=ucs		  . #x0222)	; Ȣ
       ))
-    (=ucs		. #x0223)	; ȣ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Z WITH HOOK")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0224)	; Ȥ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Z WITH HOOK")
       (=ucs		  . #x0225)	; ȥ
       ))
-    (=ucs		. #x0224)	; Ȥ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Z WITH HOOK")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
+    (=ucs		. #x0225)	; ȥ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Z WITH HOOK")
       (=ucs		  . #x0224)	; Ȥ
       ))
-    (=ucs		. #x0225)	; ȥ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER A WITH DOT ABOVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x0307)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
+    (=ucs		. #x0226)	; Ȧ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH DOT ABOVE")
       (=ucs		  . #x0227)	; ȧ
       ))
-    (=ucs		. #x0226)	; Ȧ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER A WITH DOT ABOVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x0307)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
+    (=ucs		. #x0227)	; ȧ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH DOT ABOVE")
       (=ucs		  . #x0226)	; Ȧ
       ))
-    (=ucs		. #x0227)	; ȧ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER E WITH CEDILLA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x0327)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING CEDILLA")
+      (=ucs		  . #x0327)	; ̧
+      ))
+    (=ucs		. #x0228)	; Ȩ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH CEDILLA")
       (=ucs		  . #x0229)	; È©
       ))
-    (=ucs		. #x0228)	; Ȩ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER E WITH CEDILLA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x0327)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING CEDILLA")
+      (=ucs		  . #x0327)	; ̧
+      ))
+    (=ucs		. #x0229)	; È©
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH CEDILLA")
       (=ucs		  . #x0228)	; Ȩ
       ))
-    (=ucs		. #x0229)	; È©
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D6 #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH DIAERESIS")
+      (=ucs		  . #x00D6)	; Ö
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x022A)	; Ȫ
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH DIAERESIS AND MACRON")
       (=ucs		  . #x022B)	; È«
       ))
-    (=ucs		. #x022A)	; Ȫ
     ))
 (define-char
   '((name . "LATIN SMALL LETTER O WITH DIAERESIS AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F6 #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH DIAERESIS")
+      (=ucs		  . #x00F6)	; ö
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x022B)	; È«
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON")
       (=ucs		  . #x022A)	; Ȫ
       ))
-    (=ucs		. #x022B)	; È«
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH TILDE AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D5 #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
+      (=ucs		  . #x00D5)	; Õ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x022C)	; Ȭ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH TILDE AND MACRON")
       (=ucs		  . #x022D)	; È­
       ))
-    (=ucs		. #x022C)	; Ȭ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH TILDE AND MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F5 #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH TILDE")
+      (=ucs		  . #x00F5)	; õ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x022D)	; È­
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH TILDE AND MACRON")
       (=ucs		  . #x022C)	; Ȭ
       ))
-    (=ucs		. #x022D)	; È­
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER O WITH DOT ABOVE")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x0307)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
+    (=ucs		. #x022E)	; È®
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH DOT ABOVE")
       (=ucs		  . #x022F)	; ȯ
       ))
-    (=ucs		. #x022E)	; È®
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER O WITH DOT ABOVE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x0307)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
+    (=ucs		. #x022F)	; ȯ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH DOT ABOVE")
       (=ucs		  . #x022E)	; È®
       ))
-    (=ucs		. #x022F)	; ȯ
     ))
 (define-char
   '((name . "LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x022E #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH DOT ABOVE")
+      (=ucs		  . #x022E)	; È®
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x0230)	; È°
     (->lowercase
      ((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")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x022F #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH DOT ABOVE")
+      (=ucs		  . #x022F)	; ȯ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x0231)	; ȱ
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON")
       (=ucs		  . #x0230)	; È°
       ))
-    (=ucs		. #x0231)	; ȱ
     ))
 (define-char
   '((name		. "LATIN CAPITAL LETTER Y WITH MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0059 #x0304)
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x0232)	; Ȳ
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH MACRON")
       (=ucs		  . #x0233)	; ȳ
       ))
-    (=ucs		. #x0232)	; Ȳ
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER Y WITH MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x0304)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x0233)	; ȳ
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH MACRON")
       (=ucs		  . #x0232)	; Ȳ
       ))
-    (=ucs		. #x0233)	; ȳ
     ))