From: tomo <tomo>
Date: Sun, 24 Jul 2005 23:01:43 +0000 (+0000)
Subject: Use `=decomposition' instead of `->decomposition'.
X-Git-Tag: r21-4-17-chise-0_22-4^20~379
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f2081a2679dcc3c34f20af777975b8354661f047;p=chise%2Fxemacs-chise.git.1

Use `=decomposition' instead of `->decomposition'.
---

diff --git a/lisp/utf-2000/u00400-Cyrillic.el b/lisp/utf-2000/u00400-Cyrillic.el
index 7f9943d..465e931 100644
--- a/lisp/utf-2000/u00400-Cyrillic.el
+++ b/lisp/utf-2000/u00400-Cyrillic.el
@@ -4,11 +4,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0415 #x0300)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER IE WITH GRAVE")
       (=ucs		  . #x0450)	; ѐ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER IE")
+      (=ucs		  . #x0415)	; Е
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x0400)	; Ѐ
     ))
 (define-char
@@ -16,28 +22,42 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0415 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER IO")
       (=ucs		  . #x0451)	; ё
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER IE")
+      (=ucs		  . #x0415)	; Е
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x0401)	; Ё
     (cyrillic-iso8859-5 . #xA1)	; &I-CYRILLIC-21;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER IO")
+      (=ucs		  . #x0401)	; Ё
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2757)	; &J90-2757; [07-55]
       (=gb2312		  . #x2757)	; &I-G0-2757; [07-55]
       (=ks-x1001	  . #x2C57)	; &I-K0-2C57; [12-55]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER IO")
-      (=ucs		  . #x0401)	; Ё
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER IO")
       (=ucs		  . #x0401)	; Ё
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x2726)	; &J90-2726; [07-06]
+      (=gb2312		  . #x2726)	; &I-G0-2726; [07-06]
+      (=ks-x1001	  . #x2C26)	; &I-K0-2C26; [12-06]
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=jis-x0208		. #x2727)	; &J90-2727; [07-07]
     (=gb2312		. #x2727)	; &I-G0-2727; [07-07]
     (=ks-x1001		. #x2C27)	; &I-K0-2C27; [12-07]
@@ -59,13 +79,13 @@
     (cyrillic-iso8859-5 . #xA2)	; &I-CYRILLIC-22;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2772)	; &JSP-2772; [07-82]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER DJE")
       (=ucs		  . #x0402)	; Ђ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2772)	; &JSP-2772; [07-82]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DJE")
       (=ucs		  . #x0402)	; Ђ
@@ -78,26 +98,40 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0413 #x0301)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER GJE")
       (=ucs		  . #x0453)	; ѓ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER GHE")
+      (=ucs		  . #x0413)	; Г
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x0403)	; Ѓ
     (cyrillic-iso8859-5 . #xA3)	; &I-CYRILLIC-23;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2773)	; &JSP-2773; [07-83]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER GJE")
       (=ucs		  . #x0403)	; Ѓ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2773)	; &JSP-2773; [07-83]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER GJE")
       (=ucs		  . #x0403)	; Ѓ
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x2724)	; &J90-2724; [07-04]
+      (=gb2312		  . #x2724)	; &I-G0-2724; [07-04]
+      (=ks-x1001	  . #x2C24)	; &I-K0-2C24; [12-04]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0212		. #x2743)	; &JSP-2743; [07-35]
     (=ucs@jis/fw	. #x0403)	; &JSP-2743;
     ))
@@ -114,13 +148,13 @@
     (cyrillic-iso8859-5 . #xA4)	; &I-CYRILLIC-24;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2774)	; &JSP-2774; [07-84]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER UKRAINIAN IE")
       (=ucs		  . #x0404)	; Є
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2774)	; &JSP-2774; [07-84]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER UKRAINIAN IE")
       (=ucs		  . #x0404)	; Є
@@ -141,13 +175,13 @@
     (cyrillic-iso8859-5 . #xA5)	; &I-CYRILLIC-25;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2775)	; &JSP-2775; [07-85]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER DZE")
       (=ucs		  . #x0405)	; Ѕ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2775)	; &JSP-2775; [07-85]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DZE")
       (=ucs		  . #x0405)	; Ѕ
@@ -168,13 +202,13 @@
     (cyrillic-iso8859-5 . #xA6)	; &I-CYRILLIC-26;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2776)	; &JSP-2776; [07-86]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0406)	; І
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2776)	; &JSP-2776; [07-86]
+      ))
     (<-fullwidth
      ((name . "CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0406)	; І
@@ -188,26 +222,38 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Ukrainian")
-    (->decomposition	#x0406 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER YI")
       (=ucs		  . #x0457)	; ї
       ))
+    (=decomposition
+     ((name . "CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I")
+      (=ucs		  . #x0406)	; І
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x0407)	; Ї
     (cyrillic-iso8859-5 . #xA7)	; &I-CYRILLIC-27;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2777)	; &JSP-2777; [07-87]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER YI")
       (=ucs		  . #x0407)	; Ї
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2777)	; &JSP-2777; [07-87]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YI")
       (=ucs		  . #x0407)	; Ї
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2746)	; &JSP-2746; [07-38]
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=jis-x0212		. #x2747)	; &JSP-2747; [07-39]
     (=ucs@jis/fw	. #x0407)	; &JSP-2747;
     ))
@@ -224,13 +270,13 @@
     (cyrillic-iso8859-5 . #xA8)	; &I-CYRILLIC-28;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2778)	; &JSP-2778; [07-88]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER JE")
       (=ucs		  . #x0408)	; Ј
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2778)	; &JSP-2778; [07-88]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER JE")
       (=ucs		  . #x0408)	; Ј
@@ -251,13 +297,13 @@
     (cyrillic-iso8859-5 . #xA9)	; &I-CYRILLIC-29;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x2779)	; &JSP-2779; [07-89]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER LJE")
       (=ucs		  . #x0409)	; Љ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x2779)	; &JSP-2779; [07-89]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER LJE")
       (=ucs		  . #x0409)	; Љ
@@ -278,13 +324,13 @@
     (cyrillic-iso8859-5 . #xAA)	; &I-CYRILLIC-2A;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x277A)	; &JSP-277A; [07-90]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER NJE")
       (=ucs		  . #x040A)	; Њ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x277A)	; &JSP-277A; [07-90]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER NJE")
       (=ucs		  . #x040A)	; Њ
@@ -306,13 +352,13 @@
     (cyrillic-iso8859-5 . #xAB)	; &I-CYRILLIC-2B;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x277B)	; &JSP-277B; [07-91]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER TSHE")
       (=ucs		  . #x040B)	; Ћ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x277B)	; &JSP-277B; [07-91]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER TSHE")
       (=ucs		  . #x040B)	; Ћ
@@ -325,22 +371,28 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x041A #x0301)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER KJE")
       (=ucs		  . #x045C)	; ќ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER KA")
+      (=ucs		  . #x041A)	; К
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x040C)	; Ќ
     (cyrillic-iso8859-5 . #xAC)	; &I-CYRILLIC-2C;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x277C)	; &JSP-277C; [07-92]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER KJE")
       (=ucs		  . #x040C)	; Ќ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x277C)	; &JSP-277C; [07-92]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER KJE")
       (=ucs		  . #x040C)	; Ќ
@@ -353,11 +405,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0418 #x0300)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER I WITH GRAVE")
       (=ucs		  . #x045D)	; ѝ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER I")
+      (=ucs		  . #x0418)	; И
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x040D)	; Ѝ
     ))
 (define-char
@@ -366,22 +424,28 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Byelorussian")
-    (->decomposition	#x0423 #x0306)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER SHORT U")
       (=ucs		  . #x045E)	; ў
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER U")
+      (=ucs		  . #x0423)	; У
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x040E)	; Ў
     (cyrillic-iso8859-5 . #xAE)	; &I-CYRILLIC-2E;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x277D)	; &JSP-277D; [07-93]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT U")
       (=ucs		  . #x040E)	; Ў
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x277D)	; &JSP-277D; [07-93]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT U")
       (=ucs		  . #x040E)	; Ў
@@ -402,13 +466,13 @@
     (cyrillic-iso8859-5 . #xAF)	; &I-CYRILLIC-2F;
     ))
 (define-char
-  '((->lowercase
-     ((=jis-x0212	  . #x277E)	; &JSP-277E; [07-94]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC CAPITAL LETTER DZHE")
       (=ucs		  . #x040F)	; Џ
       ))
+    (->lowercase
+     ((=jis-x0212	  . #x277E)	; &JSP-277E; [07-94]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DZHE")
       (=ucs		  . #x040F)	; Џ
@@ -429,15 +493,15 @@
     (cyrillic-iso8859-5 . #xB0)	; &I-CYRILLIC-30;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER A")
+      (=ucs		  . #x0410)	; А
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2751)	; &J90-2751; [07-49]
       (=gb2312		  . #x2751)	; &I-G0-2751; [07-49]
       (=ks-x1001	  . #x2C51)	; &I-K0-2C51; [12-49]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER A")
-      (=ucs		  . #x0410)	; А
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER A")
       (=ucs		  . #x0410)	; А
@@ -462,15 +526,15 @@
     (cyrillic-iso8859-5 . #xB1)	; &I-CYRILLIC-31;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER BE")
+      (=ucs		  . #x0411)	; Б
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2752)	; &J90-2752; [07-50]
       (=gb2312		  . #x2752)	; &I-G0-2752; [07-50]
       (=ks-x1001	  . #x2C52)	; &I-K0-2C52; [12-50]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER BE")
-      (=ucs		  . #x0411)	; Б
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER BE")
       (=ucs		  . #x0411)	; Б
@@ -495,15 +559,15 @@
     (cyrillic-iso8859-5 . #xB2)	; &I-CYRILLIC-32;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER VE")
+      (=ucs		  . #x0412)	; В
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2753)	; &J90-2753; [07-51]
       (=gb2312		  . #x2753)	; &I-G0-2753; [07-51]
       (=ks-x1001	  . #x2C53)	; &I-K0-2C53; [12-51]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER VE")
-      (=ucs		  . #x0412)	; В
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER VE")
       (=ucs		  . #x0412)	; В
@@ -528,15 +592,15 @@
     (cyrillic-iso8859-5 . #xB3)	; &I-CYRILLIC-33;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER GHE")
+      (=ucs		  . #x0413)	; Г
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2754)	; &J90-2754; [07-52]
       (=gb2312		  . #x2754)	; &I-G0-2754; [07-52]
       (=ks-x1001	  . #x2C54)	; &I-K0-2C54; [12-52]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER GHE")
-      (=ucs		  . #x0413)	; Г
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER GHE")
       (=ucs		  . #x0413)	; Г
@@ -561,15 +625,15 @@
     (cyrillic-iso8859-5 . #xB4)	; &I-CYRILLIC-34;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER DE")
+      (=ucs		  . #x0414)	; Д
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2755)	; &J90-2755; [07-53]
       (=gb2312		  . #x2755)	; &I-G0-2755; [07-53]
       (=ks-x1001	  . #x2C55)	; &I-K0-2C55; [12-53]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER DE")
-      (=ucs		  . #x0414)	; Д
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER DE")
       (=ucs		  . #x0414)	; Д
@@ -594,15 +658,15 @@
     (cyrillic-iso8859-5 . #xB5)	; &I-CYRILLIC-35;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER IE")
+      (=ucs		  . #x0415)	; Е
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2756)	; &J90-2756; [07-54]
       (=gb2312		  . #x2756)	; &I-G0-2756; [07-54]
       (=ks-x1001	  . #x2C56)	; &I-K0-2C56; [12-54]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER IE")
-      (=ucs		  . #x0415)	; Е
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER IE")
       (=ucs		  . #x0415)	; Е
@@ -627,15 +691,15 @@
     (cyrillic-iso8859-5 . #xB6)	; &I-CYRILLIC-36;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
+      (=ucs		  . #x0416)	; Ж
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2758)	; &J90-2758; [07-56]
       (=gb2312		  . #x2758)	; &I-G0-2758; [07-56]
       (=ks-x1001	  . #x2C58)	; &I-K0-2C58; [12-56]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
-      (=ucs		  . #x0416)	; Ж
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
       (=ucs		  . #x0416)	; Ж
@@ -660,15 +724,15 @@
     (cyrillic-iso8859-5 . #xB7)	; &I-CYRILLIC-37;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER ZE")
+      (=ucs		  . #x0417)	; З
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2759)	; &J90-2759; [07-57]
       (=gb2312		  . #x2759)	; &I-G0-2759; [07-57]
       (=ks-x1001	  . #x2C59)	; &I-K0-2C59; [12-57]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER ZE")
-      (=ucs		  . #x0417)	; З
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ZE")
       (=ucs		  . #x0417)	; З
@@ -693,15 +757,15 @@
     (cyrillic-iso8859-5 . #xB8)	; &I-CYRILLIC-38;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER I")
+      (=ucs		  . #x0418)	; И
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x275A)	; &J90-275A; [07-58]
       (=gb2312		  . #x275A)	; &I-G0-275A; [07-58]
       (=ks-x1001	  . #x2C5A)	; &I-K0-2C5A; [12-58]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER I")
-      (=ucs		  . #x0418)	; И
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER I")
       (=ucs		  . #x0418)	; И
@@ -718,24 +782,30 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0418 #x0306)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER SHORT I")
       (=ucs		  . #x0439)	; й
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER I")
+      (=ucs		  . #x0418)	; И
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x0419)	; Й
     (cyrillic-iso8859-5 . #xB9)	; &I-CYRILLIC-39;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
+      (=ucs		  . #x0419)	; Й
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x275B)	; &J90-275B; [07-59]
       (=gb2312		  . #x275B)	; &I-G0-275B; [07-59]
       (=ks-x1001	  . #x2C5B)	; &I-K0-2C5B; [12-59]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
-      (=ucs		  . #x0419)	; Й
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
       (=ucs		  . #x0419)	; Й
@@ -760,15 +830,15 @@
     (cyrillic-iso8859-5 . #xBA)	; &I-CYRILLIC-3A;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER KA")
+      (=ucs		  . #x041A)	; К
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x275C)	; &J90-275C; [07-60]
       (=gb2312		  . #x275C)	; &I-G0-275C; [07-60]
       (=ks-x1001	  . #x2C5C)	; &I-K0-2C5C; [12-60]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER KA")
-      (=ucs		  . #x041A)	; К
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER KA")
       (=ucs		  . #x041A)	; К
@@ -793,15 +863,15 @@
     (cyrillic-iso8859-5 . #xBB)	; &I-CYRILLIC-3B;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER EL")
+      (=ucs		  . #x041B)	; Л
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x275D)	; &J90-275D; [07-61]
       (=gb2312		  . #x275D)	; &I-G0-275D; [07-61]
       (=ks-x1001	  . #x2C5D)	; &I-K0-2C5D; [12-61]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER EL")
-      (=ucs		  . #x041B)	; Л
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EL")
       (=ucs		  . #x041B)	; Л
@@ -826,15 +896,15 @@
     (cyrillic-iso8859-5 . #xBC)	; &I-CYRILLIC-3C;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER EM")
+      (=ucs		  . #x041C)	; М
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x275E)	; &J90-275E; [07-62]
       (=gb2312		  . #x275E)	; &I-G0-275E; [07-62]
       (=ks-x1001	  . #x2C5E)	; &I-K0-2C5E; [12-62]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER EM")
-      (=ucs		  . #x041C)	; М
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EM")
       (=ucs		  . #x041C)	; М
@@ -859,15 +929,15 @@
     (cyrillic-iso8859-5 . #xBD)	; &I-CYRILLIC-3D;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER EN")
+      (=ucs		  . #x041D)	; Н
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x275F)	; &J90-275F; [07-63]
       (=gb2312		  . #x275F)	; &I-G0-275F; [07-63]
       (=ks-x1001	  . #x2C5F)	; &I-K0-2C5F; [12-63]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER EN")
-      (=ucs		  . #x041D)	; Н
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EN")
       (=ucs		  . #x041D)	; Н
@@ -892,15 +962,15 @@
     (cyrillic-iso8859-5 . #xBE)	; &I-CYRILLIC-3E;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER O")
+      (=ucs		  . #x041E)	; О
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2760)	; &J90-2760; [07-64]
       (=gb2312		  . #x2760)	; &I-G0-2760; [07-64]
       (=ks-x1001	  . #x2C60)	; &I-K0-2C60; [12-64]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER O")
-      (=ucs		  . #x041E)	; О
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER O")
       (=ucs		  . #x041E)	; О
@@ -925,15 +995,15 @@
     (cyrillic-iso8859-5 . #xBF)	; &I-CYRILLIC-3F;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER PE")
+      (=ucs		  . #x041F)	; П
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2761)	; &J90-2761; [07-65]
       (=gb2312		  . #x2761)	; &I-G0-2761; [07-65]
       (=ks-x1001	  . #x2C61)	; &I-K0-2C61; [12-65]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER PE")
-      (=ucs		  . #x041F)	; П
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER PE")
       (=ucs		  . #x041F)	; П
@@ -958,15 +1028,15 @@
     (cyrillic-iso8859-5 . #xC0)	; &I-CYRILLIC-40;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER ER")
+      (=ucs		  . #x0420)	; Р
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2762)	; &J90-2762; [07-66]
       (=gb2312		  . #x2762)	; &I-G0-2762; [07-66]
       (=ks-x1001	  . #x2C62)	; &I-K0-2C62; [12-66]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER ER")
-      (=ucs		  . #x0420)	; Р
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ER")
       (=ucs		  . #x0420)	; Р
@@ -991,15 +1061,15 @@
     (cyrillic-iso8859-5 . #xC1)	; &I-CYRILLIC-41;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER ES")
+      (=ucs		  . #x0421)	; С
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2763)	; &J90-2763; [07-67]
       (=gb2312		  . #x2763)	; &I-G0-2763; [07-67]
       (=ks-x1001	  . #x2C63)	; &I-K0-2C63; [12-67]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER ES")
-      (=ucs		  . #x0421)	; С
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER ES")
       (=ucs		  . #x0421)	; С
@@ -1024,15 +1094,15 @@
     (cyrillic-iso8859-5 . #xC2)	; &I-CYRILLIC-42;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER TE")
+      (=ucs		  . #x0422)	; Т
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2764)	; &J90-2764; [07-68]
       (=gb2312		  . #x2764)	; &I-G0-2764; [07-68]
       (=ks-x1001	  . #x2C64)	; &I-K0-2C64; [12-68]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER TE")
-      (=ucs		  . #x0422)	; Т
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER TE")
       (=ucs		  . #x0422)	; Т
@@ -1057,15 +1127,15 @@
     (cyrillic-iso8859-5 . #xC3)	; &I-CYRILLIC-43;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER U")
+      (=ucs		  . #x0423)	; У
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2765)	; &J90-2765; [07-69]
       (=gb2312		  . #x2765)	; &I-G0-2765; [07-69]
       (=ks-x1001	  . #x2C65)	; &I-K0-2C65; [12-69]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER U")
-      (=ucs		  . #x0423)	; У
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER U")
       (=ucs		  . #x0423)	; У
@@ -1090,15 +1160,15 @@
     (cyrillic-iso8859-5 . #xC4)	; &I-CYRILLIC-44;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER EF")
+      (=ucs		  . #x0424)	; Ф
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2766)	; &J90-2766; [07-70]
       (=gb2312		  . #x2766)	; &I-G0-2766; [07-70]
       (=ks-x1001	  . #x2C66)	; &I-K0-2C66; [12-70]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER EF")
-      (=ucs		  . #x0424)	; Ф
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER EF")
       (=ucs		  . #x0424)	; Ф
@@ -1123,15 +1193,15 @@
     (cyrillic-iso8859-5 . #xC5)	; &I-CYRILLIC-45;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER HA")
+      (=ucs		  . #x0425)	; Х
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2767)	; &J90-2767; [07-71]
       (=gb2312		  . #x2767)	; &I-G0-2767; [07-71]
       (=ks-x1001	  . #x2C67)	; &I-K0-2C67; [12-71]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER HA")
-      (=ucs		  . #x0425)	; Х
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER HA")
       (=ucs		  . #x0425)	; Х
@@ -1156,15 +1226,15 @@
     (cyrillic-iso8859-5 . #xC6)	; &I-CYRILLIC-46;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER TSE")
+      (=ucs		  . #x0426)	; Ц
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2768)	; &J90-2768; [07-72]
       (=gb2312		  . #x2768)	; &I-G0-2768; [07-72]
       (=ks-x1001	  . #x2C68)	; &I-K0-2C68; [12-72]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER TSE")
-      (=ucs		  . #x0426)	; Ц
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER TSE")
       (=ucs		  . #x0426)	; Ц
@@ -1189,15 +1259,15 @@
     (cyrillic-iso8859-5 . #xC7)	; &I-CYRILLIC-47;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER CHE")
+      (=ucs		  . #x0427)	; Ч
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2769)	; &J90-2769; [07-73]
       (=gb2312		  . #x2769)	; &I-G0-2769; [07-73]
       (=ks-x1001	  . #x2C69)	; &I-K0-2C69; [12-73]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER CHE")
-      (=ucs		  . #x0427)	; Ч
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER CHE")
       (=ucs		  . #x0427)	; Ч
@@ -1222,15 +1292,15 @@
     (cyrillic-iso8859-5 . #xC8)	; &I-CYRILLIC-48;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER SHA")
+      (=ucs		  . #x0428)	; Ш
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x276A)	; &J90-276A; [07-74]
       (=gb2312		  . #x276A)	; &I-G0-276A; [07-74]
       (=ks-x1001	  . #x2C6A)	; &I-K0-2C6A; [12-74]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER SHA")
-      (=ucs		  . #x0428)	; Ш
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHA")
       (=ucs		  . #x0428)	; Ш
@@ -1255,15 +1325,15 @@
     (cyrillic-iso8859-5 . #xC9)	; &I-CYRILLIC-49;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
+      (=ucs		  . #x0429)	; Щ
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x276B)	; &J90-276B; [07-75]
       (=gb2312		  . #x276B)	; &I-G0-276B; [07-75]
       (=ks-x1001	  . #x2C6B)	; &I-K0-2C6B; [12-75]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
-      (=ucs		  . #x0429)	; Щ
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SHCHA")
       (=ucs		  . #x0429)	; Щ
@@ -1288,15 +1358,15 @@
     (cyrillic-iso8859-5 . #xCA)	; &I-CYRILLIC-4A;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
+      (=ucs		  . #x042A)	; Ъ
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x276C)	; &J90-276C; [07-76]
       (=gb2312		  . #x276C)	; &I-G0-276C; [07-76]
       (=ks-x1001	  . #x2C6C)	; &I-K0-2C6C; [12-76]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
-      (=ucs		  . #x042A)	; Ъ
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER HARD SIGN")
       (=ucs		  . #x042A)	; Ъ
@@ -1321,15 +1391,15 @@
     (cyrillic-iso8859-5 . #xCB)	; &I-CYRILLIC-4B;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER YERU")
+      (=ucs		  . #x042B)	; Ы
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x276D)	; &J90-276D; [07-77]
       (=gb2312		  . #x276D)	; &I-G0-276D; [07-77]
       (=ks-x1001	  . #x2C6D)	; &I-K0-2C6D; [12-77]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER YERU")
-      (=ucs		  . #x042B)	; Ы
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YERU")
       (=ucs		  . #x042B)	; Ы
@@ -1354,15 +1424,15 @@
     (cyrillic-iso8859-5 . #xCC)	; &I-CYRILLIC-4C;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
+      (=ucs		  . #x042C)	; Ь
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x276E)	; &J90-276E; [07-78]
       (=gb2312		  . #x276E)	; &I-G0-276E; [07-78]
       (=ks-x1001	  . #x2C6E)	; &I-K0-2C6E; [12-78]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
-      (=ucs		  . #x042C)	; Ь
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER SOFT SIGN")
       (=ucs		  . #x042C)	; Ь
@@ -1387,15 +1457,15 @@
     (cyrillic-iso8859-5 . #xCD)	; &I-CYRILLIC-4D;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER E")
+      (=ucs		  . #x042D)	; Э
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x276F)	; &J90-276F; [07-79]
       (=gb2312		  . #x276F)	; &I-G0-276F; [07-79]
       (=ks-x1001	  . #x2C6F)	; &I-K0-2C6F; [12-79]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER E")
-      (=ucs		  . #x042D)	; Э
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER E")
       (=ucs		  . #x042D)	; Э
@@ -1420,15 +1490,15 @@
     (cyrillic-iso8859-5 . #xCE)	; &I-CYRILLIC-4E;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER YU")
+      (=ucs		  . #x042E)	; Ю
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2770)	; &J90-2770; [07-80]
       (=gb2312		  . #x2770)	; &I-G0-2770; [07-80]
       (=ks-x1001	  . #x2C70)	; &I-K0-2C70; [12-80]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER YU")
-      (=ucs		  . #x042E)	; Ю
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YU")
       (=ucs		  . #x042E)	; Ю
@@ -1453,15 +1523,15 @@
     (cyrillic-iso8859-5 . #xCF)	; &I-CYRILLIC-4F;
     ))
 (define-char
-  '((->lowercase
+  '((<-denotational
+     ((name		  . "CYRILLIC CAPITAL LETTER YA")
+      (=ucs		  . #x042F)	; Я
+      ))
+    (->lowercase
      ((=jis-x0208	  . #x2771)	; &J90-2771; [07-81]
       (=gb2312		  . #x2771)	; &I-G0-2771; [07-81]
       (=ks-x1001	  . #x2C71)	; &I-K0-2C71; [12-81]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC CAPITAL LETTER YA")
-      (=ucs		  . #x042F)	; Я
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC CAPITAL LETTER YA")
       (=ucs		  . #x042F)	; Я
@@ -1486,15 +1556,15 @@
     (cyrillic-iso8859-5 . #xD0)	; &I-CYRILLIC-50;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER A")
+      (=ucs		  . #x0430)	; а
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2721)	; &J90-2721; [07-01]
       (=gb2312		  . #x2721)	; &I-G0-2721; [07-01]
       (=ks-x1001	  . #x2C21)	; &I-K0-2C21; [12-01]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER A")
-      (=ucs		  . #x0430)	; а
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER A")
       (=ucs		  . #x0430)	; а
@@ -1519,15 +1589,15 @@
     (cyrillic-iso8859-5 . #xD1)	; &I-CYRILLIC-51;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER BE")
+      (=ucs		  . #x0431)	; б
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2722)	; &J90-2722; [07-02]
       (=gb2312		  . #x2722)	; &I-G0-2722; [07-02]
       (=ks-x1001	  . #x2C22)	; &I-K0-2C22; [12-02]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER BE")
-      (=ucs		  . #x0431)	; б
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER BE")
       (=ucs		  . #x0431)	; б
@@ -1552,15 +1622,15 @@
     (cyrillic-iso8859-5 . #xD2)	; &I-CYRILLIC-52;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER VE")
+      (=ucs		  . #x0432)	; в
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2723)	; &J90-2723; [07-03]
       (=gb2312		  . #x2723)	; &I-G0-2723; [07-03]
       (=ks-x1001	  . #x2C23)	; &I-K0-2C23; [12-03]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER VE")
-      (=ucs		  . #x0432)	; в
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER VE")
       (=ucs		  . #x0432)	; в
@@ -1585,15 +1655,15 @@
     (cyrillic-iso8859-5 . #xD3)	; &I-CYRILLIC-53;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER GHE")
+      (=ucs		  . #x0433)	; г
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2724)	; &J90-2724; [07-04]
       (=gb2312		  . #x2724)	; &I-G0-2724; [07-04]
       (=ks-x1001	  . #x2C24)	; &I-K0-2C24; [12-04]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER GHE")
-      (=ucs		  . #x0433)	; г
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER GHE")
       (=ucs		  . #x0433)	; г
@@ -1618,15 +1688,15 @@
     (cyrillic-iso8859-5 . #xD4)	; &I-CYRILLIC-54;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER DE")
+      (=ucs		  . #x0434)	; д
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2725)	; &J90-2725; [07-05]
       (=gb2312		  . #x2725)	; &I-G0-2725; [07-05]
       (=ks-x1001	  . #x2C25)	; &I-K0-2C25; [12-05]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER DE")
-      (=ucs		  . #x0434)	; д
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DE")
       (=ucs		  . #x0434)	; д
@@ -1651,15 +1721,15 @@
     (cyrillic-iso8859-5 . #xD5)	; &I-CYRILLIC-55;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER IE")
+      (=ucs		  . #x0435)	; е
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2726)	; &J90-2726; [07-06]
       (=gb2312		  . #x2726)	; &I-G0-2726; [07-06]
       (=ks-x1001	  . #x2C26)	; &I-K0-2C26; [12-06]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER IE")
-      (=ucs		  . #x0435)	; е
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER IE")
       (=ucs		  . #x0435)	; е
@@ -1684,15 +1754,15 @@
     (cyrillic-iso8859-5 . #xD6)	; &I-CYRILLIC-56;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER ZHE")
+      (=ucs		  . #x0436)	; ж
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2728)	; &J90-2728; [07-08]
       (=gb2312		  . #x2728)	; &I-G0-2728; [07-08]
       (=ks-x1001	  . #x2C28)	; &I-K0-2C28; [12-08]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER ZHE")
-      (=ucs		  . #x0436)	; ж
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ZHE")
       (=ucs		  . #x0436)	; ж
@@ -1717,15 +1787,15 @@
     (cyrillic-iso8859-5 . #xD7)	; &I-CYRILLIC-57;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER ZE")
+      (=ucs		  . #x0437)	; з
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2729)	; &J90-2729; [07-09]
       (=gb2312		  . #x2729)	; &I-G0-2729; [07-09]
       (=ks-x1001	  . #x2C29)	; &I-K0-2C29; [12-09]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER ZE")
-      (=ucs		  . #x0437)	; з
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ZE")
       (=ucs		  . #x0437)	; з
@@ -1750,15 +1820,15 @@
     (cyrillic-iso8859-5 . #xD8)	; &I-CYRILLIC-58;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER I")
+      (=ucs		  . #x0438)	; и
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x272A)	; &J90-272A; [07-10]
       (=gb2312		  . #x272A)	; &I-G0-272A; [07-10]
       (=ks-x1001	  . #x2C2A)	; &I-K0-2C2A; [12-10]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER I")
-      (=ucs		  . #x0438)	; и
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER I")
       (=ucs		  . #x0438)	; и
@@ -1775,28 +1845,42 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0438 #x0306)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT I")
       (=ucs		  . #x0419)	; Й
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER I")
+      (=ucs		  . #x0438)	; и
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x0439)	; й
     (cyrillic-iso8859-5 . #xD9)	; &I-CYRILLIC-59;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER SHORT I")
+      (=ucs		  . #x0439)	; й
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x272B)	; &J90-272B; [07-11]
       (=gb2312		  . #x272B)	; &I-G0-272B; [07-11]
       (=ks-x1001	  . #x2C2B)	; &I-K0-2C2B; [12-11]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER SHORT I")
-      (=ucs		  . #x0439)	; й
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHORT I")
       (=ucs		  . #x0439)	; й
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x275A)	; &J90-275A; [07-58]
+      (=gb2312		  . #x275A)	; &I-G0-275A; [07-58]
+      (=ks-x1001	  . #x2C5A)	; &I-K0-2C5A; [12-58]
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=jis-x0208		. #x275B)	; &J90-275B; [07-59]
     (=gb2312		. #x275B)	; &I-G0-275B; [07-59]
     (=ks-x1001		. #x2C5B)	; &I-K0-2C5B; [12-59]
@@ -1817,15 +1901,15 @@
     (cyrillic-iso8859-5 . #xDA)	; &I-CYRILLIC-5A;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER KA")
+      (=ucs		  . #x043A)	; к
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x272C)	; &J90-272C; [07-12]
       (=gb2312		  . #x272C)	; &I-G0-272C; [07-12]
       (=ks-x1001	  . #x2C2C)	; &I-K0-2C2C; [12-12]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER KA")
-      (=ucs		  . #x043A)	; к
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER KA")
       (=ucs		  . #x043A)	; к
@@ -1850,15 +1934,15 @@
     (cyrillic-iso8859-5 . #xDB)	; &I-CYRILLIC-5B;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER EL")
+      (=ucs		  . #x043B)	; л
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x272D)	; &J90-272D; [07-13]
       (=gb2312		  . #x272D)	; &I-G0-272D; [07-13]
       (=ks-x1001	  . #x2C2D)	; &I-K0-2C2D; [12-13]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER EL")
-      (=ucs		  . #x043B)	; л
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EL")
       (=ucs		  . #x043B)	; л
@@ -1883,15 +1967,15 @@
     (cyrillic-iso8859-5 . #xDC)	; &I-CYRILLIC-5C;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER EM")
+      (=ucs		  . #x043C)	; м
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x272E)	; &J90-272E; [07-14]
       (=gb2312		  . #x272E)	; &I-G0-272E; [07-14]
       (=ks-x1001	  . #x2C2E)	; &I-K0-2C2E; [12-14]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER EM")
-      (=ucs		  . #x043C)	; м
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EM")
       (=ucs		  . #x043C)	; м
@@ -1916,15 +2000,15 @@
     (cyrillic-iso8859-5 . #xDD)	; &I-CYRILLIC-5D;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER EN")
+      (=ucs		  . #x043D)	; н
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x272F)	; &J90-272F; [07-15]
       (=gb2312		  . #x272F)	; &I-G0-272F; [07-15]
       (=ks-x1001	  . #x2C2F)	; &I-K0-2C2F; [12-15]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER EN")
-      (=ucs		  . #x043D)	; н
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EN")
       (=ucs		  . #x043D)	; н
@@ -1949,15 +2033,15 @@
     (cyrillic-iso8859-5 . #xDE)	; &I-CYRILLIC-5E;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER O")
+      (=ucs		  . #x043E)	; о
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2730)	; &J90-2730; [07-16]
       (=gb2312		  . #x2730)	; &I-G0-2730; [07-16]
       (=ks-x1001	  . #x2C30)	; &I-K0-2C30; [12-16]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER O")
-      (=ucs		  . #x043E)	; о
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER O")
       (=ucs		  . #x043E)	; о
@@ -1982,15 +2066,15 @@
     (cyrillic-iso8859-5 . #xDF)	; &I-CYRILLIC-5F;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER PE")
+      (=ucs		  . #x043F)	; п
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2731)	; &J90-2731; [07-17]
       (=gb2312		  . #x2731)	; &I-G0-2731; [07-17]
       (=ks-x1001	  . #x2C31)	; &I-K0-2C31; [12-17]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER PE")
-      (=ucs		  . #x043F)	; п
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER PE")
       (=ucs		  . #x043F)	; п
@@ -2015,15 +2099,15 @@
     (cyrillic-iso8859-5 . #xE0)	; &I-CYRILLIC-60;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER ER")
+      (=ucs		  . #x0440)	; р
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2732)	; &J90-2732; [07-18]
       (=gb2312		  . #x2732)	; &I-G0-2732; [07-18]
       (=ks-x1001	  . #x2C32)	; &I-K0-2C32; [12-18]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER ER")
-      (=ucs		  . #x0440)	; р
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ER")
       (=ucs		  . #x0440)	; р
@@ -2048,15 +2132,15 @@
     (cyrillic-iso8859-5 . #xE1)	; &I-CYRILLIC-61;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER ES")
+      (=ucs		  . #x0441)	; с
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2733)	; &J90-2733; [07-19]
       (=gb2312		  . #x2733)	; &I-G0-2733; [07-19]
       (=ks-x1001	  . #x2C33)	; &I-K0-2C33; [12-19]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER ES")
-      (=ucs		  . #x0441)	; с
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER ES")
       (=ucs		  . #x0441)	; с
@@ -2081,15 +2165,15 @@
     (cyrillic-iso8859-5 . #xE2)	; &I-CYRILLIC-62;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER TE")
+      (=ucs		  . #x0442)	; т
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2734)	; &J90-2734; [07-20]
       (=gb2312		  . #x2734)	; &I-G0-2734; [07-20]
       (=ks-x1001	  . #x2C34)	; &I-K0-2C34; [12-20]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER TE")
-      (=ucs		  . #x0442)	; т
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TE")
       (=ucs		  . #x0442)	; т
@@ -2114,15 +2198,15 @@
     (cyrillic-iso8859-5 . #xE3)	; &I-CYRILLIC-63;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER U")
+      (=ucs		  . #x0443)	; у
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2735)	; &J90-2735; [07-21]
       (=gb2312		  . #x2735)	; &I-G0-2735; [07-21]
       (=ks-x1001	  . #x2C35)	; &I-K0-2C35; [12-21]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER U")
-      (=ucs		  . #x0443)	; у
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER U")
       (=ucs		  . #x0443)	; у
@@ -2147,15 +2231,15 @@
     (cyrillic-iso8859-5 . #xE4)	; &I-CYRILLIC-64;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER EF")
+      (=ucs		  . #x0444)	; ф
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2736)	; &J90-2736; [07-22]
       (=gb2312		  . #x2736)	; &I-G0-2736; [07-22]
       (=ks-x1001	  . #x2C36)	; &I-K0-2C36; [12-22]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER EF")
-      (=ucs		  . #x0444)	; ф
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER EF")
       (=ucs		  . #x0444)	; ф
@@ -2180,15 +2264,15 @@
     (cyrillic-iso8859-5 . #xE5)	; &I-CYRILLIC-65;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER HA")
+      (=ucs		  . #x0445)	; х
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2737)	; &J90-2737; [07-23]
       (=gb2312		  . #x2737)	; &I-G0-2737; [07-23]
       (=ks-x1001	  . #x2C37)	; &I-K0-2C37; [12-23]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER HA")
-      (=ucs		  . #x0445)	; х
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER HA")
       (=ucs		  . #x0445)	; х
@@ -2213,15 +2297,15 @@
     (cyrillic-iso8859-5 . #xE6)	; &I-CYRILLIC-66;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER TSE")
+      (=ucs		  . #x0446)	; ц
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2738)	; &J90-2738; [07-24]
       (=gb2312		  . #x2738)	; &I-G0-2738; [07-24]
       (=ks-x1001	  . #x2C38)	; &I-K0-2C38; [12-24]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER TSE")
-      (=ucs		  . #x0446)	; ц
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TSE")
       (=ucs		  . #x0446)	; ц
@@ -2246,15 +2330,15 @@
     (cyrillic-iso8859-5 . #xE7)	; &I-CYRILLIC-67;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER CHE")
+      (=ucs		  . #x0447)	; ч
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2739)	; &J90-2739; [07-25]
       (=gb2312		  . #x2739)	; &I-G0-2739; [07-25]
       (=ks-x1001	  . #x2C39)	; &I-K0-2C39; [12-25]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER CHE")
-      (=ucs		  . #x0447)	; ч
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER CHE")
       (=ucs		  . #x0447)	; ч
@@ -2279,15 +2363,15 @@
     (cyrillic-iso8859-5 . #xE8)	; &I-CYRILLIC-68;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER SHA")
+      (=ucs		  . #x0448)	; ш
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x273A)	; &J90-273A; [07-26]
       (=gb2312		  . #x273A)	; &I-G0-273A; [07-26]
       (=ks-x1001	  . #x2C3A)	; &I-K0-2C3A; [12-26]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER SHA")
-      (=ucs		  . #x0448)	; ш
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHA")
       (=ucs		  . #x0448)	; ш
@@ -2312,15 +2396,15 @@
     (cyrillic-iso8859-5 . #xE9)	; &I-CYRILLIC-69;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER SHCHA")
+      (=ucs		  . #x0449)	; щ
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x273B)	; &J90-273B; [07-27]
       (=gb2312		  . #x273B)	; &I-G0-273B; [07-27]
       (=ks-x1001	  . #x2C3B)	; &I-K0-2C3B; [12-27]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER SHCHA")
-      (=ucs		  . #x0449)	; щ
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHCHA")
       (=ucs		  . #x0449)	; щ
@@ -2345,15 +2429,15 @@
     (cyrillic-iso8859-5 . #xEA)	; &I-CYRILLIC-6A;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0208	  . #x273C)	; &J90-273C; [07-28]
-      (=gb2312		  . #x273C)	; &I-G0-273C; [07-28]
-      (=ks-x1001	  . #x2C3C)	; &I-K0-2C3C; [12-28]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER HARD SIGN")
       (=ucs		  . #x044A)	; ъ
       ))
+    (->uppercase
+     ((=jis-x0208	  . #x273C)	; &J90-273C; [07-28]
+      (=gb2312		  . #x273C)	; &I-G0-273C; [07-28]
+      (=ks-x1001	  . #x2C3C)	; &I-K0-2C3C; [12-28]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER HARD SIGN")
       (=ucs		  . #x044A)	; ъ
@@ -2378,15 +2462,15 @@
     (cyrillic-iso8859-5 . #xEB)	; &I-CYRILLIC-6B;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER YERU")
+      (=ucs		  . #x044B)	; ы
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x273D)	; &J90-273D; [07-29]
       (=gb2312		  . #x273D)	; &I-G0-273D; [07-29]
       (=ks-x1001	  . #x2C3D)	; &I-K0-2C3D; [12-29]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER YERU")
-      (=ucs		  . #x044B)	; ы
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YERU")
       (=ucs		  . #x044B)	; ы
@@ -2411,15 +2495,15 @@
     (cyrillic-iso8859-5 . #xEC)	; &I-CYRILLIC-6C;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
+      (=ucs		  . #x044C)	; ь
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x273E)	; &J90-273E; [07-30]
       (=gb2312		  . #x273E)	; &I-G0-273E; [07-30]
       (=ks-x1001	  . #x2C3E)	; &I-K0-2C3E; [12-30]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
-      (=ucs		  . #x044C)	; ь
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SOFT SIGN")
       (=ucs		  . #x044C)	; ь
@@ -2444,15 +2528,15 @@
     (cyrillic-iso8859-5 . #xED)	; &I-CYRILLIC-6D;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER E")
+      (=ucs		  . #x044D)	; э
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x273F)	; &J90-273F; [07-31]
       (=gb2312		  . #x273F)	; &I-G0-273F; [07-31]
       (=ks-x1001	  . #x2C3F)	; &I-K0-2C3F; [12-31]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER E")
-      (=ucs		  . #x044D)	; э
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER E")
       (=ucs		  . #x044D)	; э
@@ -2477,15 +2561,15 @@
     (cyrillic-iso8859-5 . #xEE)	; &I-CYRILLIC-6E;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER YU")
+      (=ucs		  . #x044E)	; ю
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2740)	; &J90-2740; [07-32]
       (=gb2312		  . #x2740)	; &I-G0-2740; [07-32]
       (=ks-x1001	  . #x2C40)	; &I-K0-2C40; [12-32]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER YU")
-      (=ucs		  . #x044E)	; ю
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YU")
       (=ucs		  . #x044E)	; ю
@@ -2510,15 +2594,15 @@
     (cyrillic-iso8859-5 . #xEF)	; &I-CYRILLIC-6F;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER YA")
+      (=ucs		  . #x044F)	; я
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2741)	; &J90-2741; [07-33]
       (=gb2312		  . #x2741)	; &I-G0-2741; [07-33]
       (=ks-x1001	  . #x2C41)	; &I-K0-2C41; [12-33]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER YA")
-      (=ucs		  . #x044F)	; я
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YA")
       (=ucs		  . #x044F)	; я
@@ -2535,11 +2619,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0435 #x0300)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER IE WITH GRAVE")
       (=ucs		  . #x0400)	; Ѐ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER IE")
+      (=ucs		  . #x0435)	; е
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x0450)	; ѐ
     ))
 (define-char
@@ -2547,28 +2637,42 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0435 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER IO")
       (=ucs		  . #x0401)	; Ё
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER IE")
+      (=ucs		  . #x0435)	; е
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x0451)	; ё
     (cyrillic-iso8859-5 . #xF1)	; &I-CYRILLIC-71;
     ))
 (define-char
-  '((->uppercase
+  '((<-denotational
+     ((name		  . "CYRILLIC SMALL LETTER IO")
+      (=ucs		  . #x0451)	; ё
+      ))
+    (->uppercase
      ((=jis-x0208	  . #x2727)	; &J90-2727; [07-07]
       (=gb2312		  . #x2727)	; &I-G0-2727; [07-07]
       (=ks-x1001	  . #x2C27)	; &I-K0-2C27; [12-07]
       ))
-    (<-denotational
-     ((name		  . "CYRILLIC SMALL LETTER IO")
-      (=ucs		  . #x0451)	; ё
-      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER IO")
       (=ucs		  . #x0451)	; ё
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x2756)	; &J90-2756; [07-54]
+      (=gb2312		  . #x2756)	; &I-G0-2756; [07-54]
+      (=ks-x1001	  . #x2C56)	; &I-K0-2C56; [12-54]
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=jis-x0208		. #x2757)	; &J90-2757; [07-55]
     (=gb2312		. #x2757)	; &I-G0-2757; [07-55]
     (=ks-x1001		. #x2C57)	; &I-K0-2C57; [12-55]
@@ -2590,13 +2694,13 @@
     (cyrillic-iso8859-5 . #xF2)	; &I-CYRILLIC-72;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2742)	; &JSP-2742; [07-34]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER DJE")
       (=ucs		  . #x0452)	; ђ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2742)	; &JSP-2742; [07-34]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DJE")
       (=ucs		  . #x0452)	; ђ
@@ -2609,26 +2713,40 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0433 #x0301)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER GJE")
       (=ucs		  . #x0403)	; Ѓ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER GHE")
+      (=ucs		  . #x0433)	; г
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x0453)	; ѓ
     (cyrillic-iso8859-5 . #xF3)	; &I-CYRILLIC-73;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2743)	; &JSP-2743; [07-35]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER GJE")
       (=ucs		  . #x0453)	; ѓ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2743)	; &JSP-2743; [07-35]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER GJE")
       (=ucs		  . #x0453)	; ѓ
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x2754)	; &J90-2754; [07-52]
+      (=gb2312		  . #x2754)	; &I-G0-2754; [07-52]
+      (=ks-x1001	  . #x2C54)	; &I-K0-2C54; [12-52]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0212		. #x2773)	; &JSP-2773; [07-83]
     (=ucs@jis/fw	. #x0453)	; &JSP-2773;
     ))
@@ -2645,13 +2763,13 @@
     (cyrillic-iso8859-5 . #xF4)	; &I-CYRILLIC-74;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2744)	; &JSP-2744; [07-36]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER UKRAINIAN IE")
       (=ucs		  . #x0454)	; є
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2744)	; &JSP-2744; [07-36]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER UKRAINIAN IE")
       (=ucs		  . #x0454)	; є
@@ -2672,13 +2790,13 @@
     (cyrillic-iso8859-5 . #xF5)	; &I-CYRILLIC-75;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2745)	; &JSP-2745; [07-37]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER DZE")
       (=ucs		  . #x0455)	; ѕ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2745)	; &JSP-2745; [07-37]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DZE")
       (=ucs		  . #x0455)	; ѕ
@@ -2699,13 +2817,13 @@
     (cyrillic-iso8859-5 . #xF6)	; &I-CYRILLIC-76;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2746)	; &JSP-2746; [07-38]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0456)	; і
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2746)	; &JSP-2746; [07-38]
+      ))
     (<-fullwidth
      ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
       (=ucs		  . #x0456)	; і
@@ -2719,26 +2837,38 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Ukrainian")
-    (->decomposition	#x0456 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER YI")
       (=ucs		  . #x0407)	; Ї
       ))
+    (=decomposition
+     ((name . "CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I")
+      (=ucs		  . #x0456)	; і
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x0457)	; ї
     (cyrillic-iso8859-5 . #xF7)	; &I-CYRILLIC-77;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2747)	; &JSP-2747; [07-39]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER YI")
       (=ucs		  . #x0457)	; ї
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2747)	; &JSP-2747; [07-39]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER YI")
       (=ucs		  . #x0457)	; ї
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2776)	; &JSP-2776; [07-86]
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=jis-x0212		. #x2777)	; &JSP-2777; [07-87]
     (=ucs@jis/fw	. #x0457)	; &JSP-2777;
     ))
@@ -2755,13 +2885,13 @@
     (cyrillic-iso8859-5 . #xF8)	; &I-CYRILLIC-78;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2748)	; &JSP-2748; [07-40]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER JE")
       (=ucs		  . #x0458)	; ј
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2748)	; &JSP-2748; [07-40]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER JE")
       (=ucs		  . #x0458)	; ј
@@ -2782,13 +2912,13 @@
     (cyrillic-iso8859-5 . #xF9)	; &I-CYRILLIC-79;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x2749)	; &JSP-2749; [07-41]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER LJE")
       (=ucs		  . #x0459)	; љ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x2749)	; &JSP-2749; [07-41]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER LJE")
       (=ucs		  . #x0459)	; љ
@@ -2809,13 +2939,13 @@
     (cyrillic-iso8859-5 . #xFA)	; &I-CYRILLIC-7A;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x274A)	; &JSP-274A; [07-42]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER NJE")
       (=ucs		  . #x045A)	; њ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x274A)	; &JSP-274A; [07-42]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER NJE")
       (=ucs		  . #x045A)	; њ
@@ -2837,13 +2967,13 @@
     (cyrillic-iso8859-5 . #xFB)	; &I-CYRILLIC-7B;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x274B)	; &JSP-274B; [07-43]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER TSHE")
       (=ucs		  . #x045B)	; ћ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x274B)	; &JSP-274B; [07-43]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER TSHE")
       (=ucs		  . #x045B)	; ћ
@@ -2856,26 +2986,40 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x043A #x0301)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER KJE")
       (=ucs		  . #x040C)	; Ќ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER KA")
+      (=ucs		  . #x043A)	; к
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x045C)	; ќ
     (cyrillic-iso8859-5 . #xFC)	; &I-CYRILLIC-7C;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x274C)	; &JSP-274C; [07-44]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER KJE")
       (=ucs		  . #x045C)	; ќ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x274C)	; &JSP-274C; [07-44]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER KJE")
       (=ucs		  . #x045C)	; ќ
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x275C)	; &J90-275C; [07-60]
+      (=gb2312		  . #x275C)	; &I-G0-275C; [07-60]
+      (=ks-x1001	  . #x2C5C)	; &I-K0-2C5C; [12-60]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0212		. #x277C)	; &JSP-277C; [07-92]
     (=ucs@jis/fw	. #x045C)	; &JSP-277C;
     ))
@@ -2884,11 +3028,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0438 #x0300)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER I WITH GRAVE")
       (=ucs		  . #x040D)	; Ѝ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER I")
+      (=ucs		  . #x0438)	; и
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x045D)	; ѝ
     ))
 (define-char
@@ -2897,26 +3047,40 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (iso-10646-comment	. "Byelorussian")
-    (->decomposition	#x0443 #x0306)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER SHORT U")
       (=ucs		  . #x040E)	; Ў
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER U")
+      (=ucs		  . #x0443)	; у
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x045E)	; ў
     (cyrillic-iso8859-5 . #xFE)	; &I-CYRILLIC-7E;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x274D)	; &JSP-274D; [07-45]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER SHORT U")
       (=ucs		  . #x045E)	; ў
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x274D)	; &JSP-274D; [07-45]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER SHORT U")
       (=ucs		  . #x045E)	; ў
       ))
+    (=decomposition
+     ((=jis-x0208	  . #x2765)	; &J90-2765; [07-69]
+      (=gb2312		  . #x2765)	; &I-G0-2765; [07-69]
+      (=ks-x1001	  . #x2C65)	; &I-K0-2C65; [12-69]
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=jis-x0212		. #x277D)	; &JSP-277D; [07-93]
     (=ucs@jis/fw	. #x045E)	; &JSP-277D;
     ))
@@ -2933,13 +3097,13 @@
     (cyrillic-iso8859-5 . #xFF)	; &I-CYRILLIC-7F;
     ))
 (define-char
-  '((->uppercase
-     ((=jis-x0212	  . #x274E)	; &JSP-274E; [07-46]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "CYRILLIC SMALL LETTER DZHE")
       (=ucs		  . #x045F)	; џ
       ))
+    (->uppercase
+     ((=jis-x0212	  . #x274E)	; &JSP-274E; [07-46]
+      ))
     (<-fullwidth
      ((name		  . "CYRILLIC SMALL LETTER DZHE")
       (=ucs		  . #x045F)	; џ
@@ -3194,11 +3358,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0474 #x030F)
     (->lowercase
      ((name . "CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT")
       (=ucs		  . #x0477)	; Ñ·
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER IZHITSA")
+      (=ucs		  . #x0474)	; Ñ´
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
     (=ucs		. #x0476)	; Ѷ
     ))
 (define-char
@@ -3206,11 +3376,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0475 #x030F)
     (->uppercase
      ((name . "CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT")
       (=ucs		  . #x0476)	; Ѷ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER IZHITSA")
+      (=ucs		  . #x0475)	; ѵ
+      )
+     ((name		  . "COMBINING DOUBLE GRAVE ACCENT")
+      (=ucs		  . #x030F)	; ̏
+      ))
     (=ucs		. #x0477)	; Ñ·
     ))
 (define-char
@@ -3960,11 +4136,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0416 #x0306)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER ZHE WITH BREVE")
       (=ucs		  . #x04C2)	; ӂ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
+      (=ucs		  . #x0416)	; Ж
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x04C1)	; Ӂ
     ))
 (define-char
@@ -3972,11 +4154,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0436 #x0306)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER ZHE WITH BREVE")
       (=ucs		  . #x04C1)	; Ӂ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER ZHE")
+      (=ucs		  . #x0436)	; ж
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x04C2)	; ӂ
     ))
 (define-char
@@ -4050,11 +4238,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0410 #x0306)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER A WITH BREVE")
       (=ucs		  . #x04D1)	; ӑ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER A")
+      (=ucs		  . #x0410)	; А
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x04D0)	; Ӑ
     ))
 (define-char
@@ -4062,11 +4256,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0430 #x0306)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER A WITH BREVE")
       (=ucs		  . #x04D0)	; Ӑ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER A")
+      (=ucs		  . #x0430)	; а
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x04D1)	; ӑ
     ))
 (define-char
@@ -4074,11 +4274,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0410 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER A WITH DIAERESIS")
       (=ucs		  . #x04D3)	; ӓ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER A")
+      (=ucs		  . #x0410)	; А
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04D2)	; Ӓ
     ))
 (define-char
@@ -4086,11 +4292,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0430 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER A WITH DIAERESIS")
       (=ucs		  . #x04D2)	; Ӓ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER A")
+      (=ucs		  . #x0430)	; а
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04D3)	; ӓ
     ))
 (define-char
@@ -4120,11 +4332,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0415 #x0306)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER IE WITH BREVE")
       (=ucs		  . #x04D7)	; ӗ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER IE")
+      (=ucs		  . #x0415)	; Е
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x04D6)	; Ӗ
     ))
 (define-char
@@ -4132,11 +4350,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0435 #x0306)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER IE WITH BREVE")
       (=ucs		  . #x04D6)	; Ӗ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER IE")
+      (=ucs		  . #x0435)	; е
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x04D7)	; ӗ
     ))
 (define-char
@@ -4166,11 +4390,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x04D8 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS")
       (=ucs		  . #x04DB)	; ӛ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER SCHWA")
+      (=ucs		  . #x04D8)	; Ә
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04DA)	; Ӛ
     ))
 (define-char
@@ -4178,11 +4408,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x04D9 #x0308)
     (->uppercase
      ((name . "CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS")
       (=ucs		  . #x04DA)	; Ӛ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER SCHWA")
+      (=ucs		  . #x04D9)	; ә
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04DB)	; ӛ
     ))
 (define-char
@@ -4190,11 +4426,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0416 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER ZHE WITH DIAERESIS")
       (=ucs		  . #x04DD)	; ӝ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER ZHE")
+      (=ucs		  . #x0416)	; Ж
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04DC)	; Ӝ
     ))
 (define-char
@@ -4202,11 +4444,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0436 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS")
       (=ucs		  . #x04DC)	; Ӝ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER ZHE")
+      (=ucs		  . #x0436)	; ж
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04DD)	; ӝ
     ))
 (define-char
@@ -4214,11 +4462,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0417 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER ZE WITH DIAERESIS")
       (=ucs		  . #x04DF)	; ӟ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER ZE")
+      (=ucs		  . #x0417)	; З
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04DE)	; Ӟ
     ))
 (define-char
@@ -4226,11 +4480,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0437 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS")
       (=ucs		  . #x04DE)	; Ӟ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER ZE")
+      (=ucs		  . #x0437)	; з
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04DF)	; ӟ
     ))
 (define-char
@@ -4260,11 +4520,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0418 #x0304)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER I WITH MACRON")
       (=ucs		  . #x04E3)	; Ó£
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER I")
+      (=ucs		  . #x0418)	; И
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x04E2)	; Ó¢
     ))
 (define-char
@@ -4272,11 +4538,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0438 #x0304)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER I WITH MACRON")
       (=ucs		  . #x04E2)	; Ó¢
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER I")
+      (=ucs		  . #x0438)	; и
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x04E3)	; Ó£
     ))
 (define-char
@@ -4284,11 +4556,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0418 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER I WITH DIAERESIS")
       (=ucs		  . #x04E5)	; Ó¥
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER I")
+      (=ucs		  . #x0418)	; И
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04E4)	; Ó¤
     ))
 (define-char
@@ -4296,11 +4574,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0438 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER I WITH DIAERESIS")
       (=ucs		  . #x04E4)	; Ó¤
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER I")
+      (=ucs		  . #x0438)	; и
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04E5)	; Ó¥
     ))
 (define-char
@@ -4308,11 +4592,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x041E #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER O WITH DIAERESIS")
       (=ucs		  . #x04E7)	; Ó§
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER O")
+      (=ucs		  . #x041E)	; О
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04E6)	; Ó¦
     ))
 (define-char
@@ -4320,11 +4610,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x043E #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER O WITH DIAERESIS")
       (=ucs		  . #x04E6)	; Ó¦
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER O")
+      (=ucs		  . #x043E)	; о
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04E7)	; Ó§
     ))
 (define-char
@@ -4354,11 +4650,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x04E8 #x0308)
     (->lowercase
      ((name . "CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS")
       (=ucs		  . #x04EB)	; Ó«
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER BARRED O")
+      (=ucs		  . #x04E8)	; Ó¨
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04EA)	; Óª
     ))
 (define-char
@@ -4366,11 +4668,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x04E9 #x0308)
     (->uppercase
      ((name . "CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS")
       (=ucs		  . #x04EA)	; Óª
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER BARRED O")
+      (=ucs		  . #x04E9)	; Ó©
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04EB)	; Ó«
     ))
 (define-char
@@ -4378,11 +4686,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x042D #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER E WITH DIAERESIS")
       (=ucs		  . #x04ED)	; Ó­
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER E")
+      (=ucs		  . #x042D)	; Э
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04EC)	; Ó¬
     ))
 (define-char
@@ -4390,11 +4704,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x044D #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER E WITH DIAERESIS")
       (=ucs		  . #x04EC)	; Ó¬
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER E")
+      (=ucs		  . #x044D)	; э
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04ED)	; Ó­
     ))
 (define-char
@@ -4402,11 +4722,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0423 #x0304)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER U WITH MACRON")
       (=ucs		  . #x04EF)	; Ó¯
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER U")
+      (=ucs		  . #x0423)	; У
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x04EE)	; Ó®
     ))
 (define-char
@@ -4414,11 +4740,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0443 #x0304)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER U WITH MACRON")
       (=ucs		  . #x04EE)	; Ó®
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER U")
+      (=ucs		  . #x0443)	; у
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x04EF)	; Ó¯
     ))
 (define-char
@@ -4426,11 +4758,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0423 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER U WITH DIAERESIS")
       (=ucs		  . #x04F1)	; Ó±
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER U")
+      (=ucs		  . #x0423)	; У
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04F0)	; Ó°
     ))
 (define-char
@@ -4438,11 +4776,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0443 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER U WITH DIAERESIS")
       (=ucs		  . #x04F0)	; Ó°
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER U")
+      (=ucs		  . #x0443)	; у
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04F1)	; Ó±
     ))
 (define-char
@@ -4450,11 +4794,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0423 #x030B)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE")
       (=ucs		  . #x04F3)	; Ó³
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER U")
+      (=ucs		  . #x0423)	; У
+      )
+     ((name		  . "COMBINING DOUBLE ACUTE ACCENT")
+      (=ucs		  . #x030B)	; ̋
+      ))
     (=ucs		. #x04F2)	; Ó²
     ))
 (define-char
@@ -4462,11 +4812,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0443 #x030B)
     (->uppercase
      ((name . "CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE")
       (=ucs		  . #x04F2)	; Ó²
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER U")
+      (=ucs		  . #x0443)	; у
+      )
+     ((name		  . "COMBINING DOUBLE ACUTE ACCENT")
+      (=ucs		  . #x030B)	; ̋
+      ))
     (=ucs		. #x04F3)	; Ó³
     ))
 (define-char
@@ -4474,11 +4830,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0427 #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER CHE WITH DIAERESIS")
       (=ucs		  . #x04F5)	; Óµ
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER CHE")
+      (=ucs		  . #x0427)	; Ч
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04F4)	; Ó´
     ))
 (define-char
@@ -4486,11 +4848,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0447 #x0308)
     (->uppercase
      ((name		  . "CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS")
       (=ucs		  . #x04F4)	; Ó´
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER CHE")
+      (=ucs		  . #x0447)	; ч
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04F5)	; Óµ
     ))
 (define-char
@@ -4498,11 +4866,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x042B #x0308)
     (->lowercase
      ((name		  . "CYRILLIC SMALL LETTER YERU WITH DIAERESIS")
       (=ucs		  . #x04F9)	; Ó¹
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC CAPITAL LETTER YERU")
+      (=ucs		  . #x042B)	; Ы
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04F8)	; Ó¸
     ))
 (define-char
@@ -4510,10 +4884,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x044B #x0308)
     (->uppercase
      ((name . "CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS")
       (=ucs		  . #x04F8)	; Ó¸
       ))
+    (=decomposition
+     ((name		  . "CYRILLIC SMALL LETTER YERU")
+      (=ucs		  . #x044B)	; ы
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x04F9)	; Ó¹
     ))
diff --git a/lisp/utf-2000/u00600-Arabic.el b/lisp/utf-2000/u00600-Arabic.el
index 658bdce..c420780 100644
--- a/lisp/utf-2000/u00600-Arabic.el
+++ b/lisp/utf-2000/u00600-Arabic.el
@@ -39,7 +39,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x0627 #x0653)
+    (=decomposition
+     ((name		  . "ARABIC LETTER ALEF")
+      (=ucs		  . #x0627)	; ا
+      )
+     ((name		  . "ARABIC MADDAH ABOVE")
+      (=ucs		  . #x0653)	; ٓ
+      ))
     (=ucs		. #x0622)	; آ
     (arabic-iso8859-6	. #xC2)	; آ
     ))
@@ -48,7 +54,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x0627 #x0654)
+    (=decomposition
+     ((name		  . "ARABIC LETTER ALEF")
+      (=ucs		  . #x0627)	; ا
+      )
+     ((name		  . "ARABIC HAMZA ABOVE")
+      (=ucs		  . #x0654)	; ٔ
+      ))
     (=ucs		. #x0623)	; أ
     (arabic-iso8859-6	. #xC3)	; أ
     ))
@@ -57,7 +69,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x0648 #x0654)
+    (=decomposition
+     ((name		  . "ARABIC LETTER WAW")
+      (=ucs		  . #x0648)	; و
+      )
+     ((name		  . "ARABIC HAMZA ABOVE")
+      (=ucs		  . #x0654)	; ٔ
+      ))
     (=ucs		. #x0624)	; ؤ
     (arabic-iso8859-6	. #xC4)	; ؤ
     ))
@@ -66,7 +84,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x0627 #x0655)
+    (=decomposition
+     ((name		  . "ARABIC LETTER ALEF")
+      (=ucs		  . #x0627)	; ا
+      )
+     ((name		  . "ARABIC HAMZA BELOW")
+      (=ucs		  . #x0655)	; ٕ
+      ))
     (=ucs		. #x0625)	; إ
     (arabic-iso8859-6	. #xC5)	; إ
     ))
@@ -75,7 +99,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x064A #x0654)
+    (=decomposition
+     ((name		  . "ARABIC LETTER YEH")
+      (=ucs		  . #x064A)	; ي
+      )
+     ((name		  . "ARABIC HAMZA ABOVE")
+      (=ucs		  . #x0654)	; ٔ
+      ))
     (=ucs		. #x0626)	; ئ
     (arabic-iso8859-6	. #xC6)	; ئ
     ))
@@ -590,7 +620,14 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	compat #x0627 #x0674)
+    (=decomposition
+     compat
+     ((name		  . "ARABIC LETTER ALEF")
+      (=ucs		  . #x0627)	; ا
+      )
+     ((name		  . "ARABIC LETTER HIGH HAMZA")
+      (=ucs		  . #x0674)	; Ù´
+      ))
     (=ucs		. #x0675)	; Ùµ
     ))
 (define-char
@@ -598,7 +635,14 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	compat #x0648 #x0674)
+    (=decomposition
+     compat
+     ((name		  . "ARABIC LETTER WAW")
+      (=ucs		  . #x0648)	; و
+      )
+     ((name		  . "ARABIC LETTER HIGH HAMZA")
+      (=ucs		  . #x0674)	; Ù´
+      ))
     (=ucs		. #x0676)	; Ù¶
     ))
 (define-char
@@ -606,7 +650,14 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	compat #x06C7 #x0674)
+    (=decomposition
+     compat
+     ((name		  . "ARABIC LETTER U")
+      (=ucs		  . #x06C7)	; ۇ
+      )
+     ((name		  . "ARABIC LETTER HIGH HAMZA")
+      (=ucs		  . #x0674)	; Ù´
+      ))
     (=ucs		. #x0677)	; Ù·
     ))
 (define-char
@@ -614,7 +665,14 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	compat #x064A #x0674)
+    (=decomposition
+     compat
+     ((name		  . "ARABIC LETTER YEH")
+      (=ucs		  . #x064A)	; ي
+      )
+     ((name		  . "ARABIC LETTER HIGH HAMZA")
+      (=ucs		  . #x0674)	; Ù´
+      ))
     (=ucs		. #x0678)	; Ù¸
     ))
 (define-char
@@ -1119,7 +1177,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x06D5 #x0654)
+    (=decomposition
+     ((name		  . "ARABIC LETTER AE")
+      (=ucs		  . #x06D5)	; ە
+      )
+     ((name		  . "ARABIC HAMZA ABOVE")
+      (=ucs		  . #x0654)	; ٔ
+      ))
     (=ucs		. #x06C0)	; ۀ
     ))
 (define-char
@@ -1134,7 +1198,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x06C1 #x0654)
+    (=decomposition
+     ((name		  . "ARABIC LETTER HEH GOAL")
+      (=ucs		  . #x06C1)	; ہ
+      )
+     ((name		  . "ARABIC HAMZA ABOVE")
+      (=ucs		  . #x0654)	; ٔ
+      ))
     (=ucs		. #x06C2)	; ۂ
     ))
 (define-char
@@ -1255,7 +1325,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "AL")
     (mirrored		. nil)
-    (->decomposition	#x06D2 #x0654)
+    (=decomposition
+     ((name		  . "ARABIC LETTER YEH BARREE")
+      (=ucs		  . #x06D2)	; ے
+      )
+     ((name		  . "ARABIC HAMZA ABOVE")
+      (=ucs		  . #x0654)	; ٔ
+      ))
     (=ucs		. #x06D3)	; ۓ
     ))
 (define-char
diff --git a/lisp/utf-2000/u00900-Devanagari.el b/lisp/utf-2000/u00900-Devanagari.el
index f2d6716..a85f67a 100644
--- a/lisp/utf-2000/u00900-Devanagari.el
+++ b/lisp/utf-2000/u00900-Devanagari.el
@@ -277,7 +277,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0928 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER NA")
+      (=ucs		  . #x0928)	; न
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x0929)	; ऩ
     ))
 (define-char
@@ -334,7 +340,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0930 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER RA")
+      (=ucs		  . #x0930)	; र
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x0931)	; ऱ
     ))
 (define-char
@@ -356,7 +368,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0933 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER LLA")
+      (=ucs		  . #x0933)	; ळ
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x0934)	; ऴ
     ))
 (define-char
@@ -560,7 +578,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0915 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER KA")
+      (=ucs		  . #x0915)	; क
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x0958)	; क़
     ))
 (define-char
@@ -568,7 +592,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0916 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER KHA")
+      (=ucs		  . #x0916)	; ख
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x0959)	; ख़
     ))
 (define-char
@@ -576,7 +606,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0917 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER GA")
+      (=ucs		  . #x0917)	; ग
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x095A)	; ग़
     ))
 (define-char
@@ -584,7 +620,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x091C #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER JA")
+      (=ucs		  . #x091C)	; ज
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x095B)	; ज़
     ))
 (define-char
@@ -592,7 +634,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0921 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER DDA")
+      (=ucs		  . #x0921)	; ड
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x095C)	; ड़
     ))
 (define-char
@@ -600,7 +648,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0922 #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER DDHA")
+      (=ucs		  . #x0922)	; ढ
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x095D)	; ढ़
     ))
 (define-char
@@ -608,7 +662,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x092B #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER PHA")
+      (=ucs		  . #x092B)	; फ
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x095E)	; फ़
     ))
 (define-char
@@ -616,7 +676,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x092F #x093C)
+    (=decomposition
+     ((name		  . "DEVANAGARI LETTER YA")
+      (=ucs		  . #x092F)	; य
+      )
+     ((name		  . "DEVANAGARI SIGN NUKTA")
+      (=ucs		  . #x093C)	; ़
+      ))
     (=ucs		. #x095F)	; य़
     ))
 (define-char
diff --git a/lisp/utf-2000/u00980-Bengali.el b/lisp/utf-2000/u00980-Bengali.el
index da7476e..bac25f9 100644
--- a/lisp/utf-2000/u00980-Bengali.el
+++ b/lisp/utf-2000/u00980-Bengali.el
@@ -403,7 +403,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x09C7 #x09BE)
+    (=decomposition
+     ((name		  . "BENGALI VOWEL SIGN E")
+      (=ucs		  . #x09C7)	; ে
+      )
+     ((name		  . "BENGALI VOWEL SIGN AA")
+      (=ucs		  . #x09BE)	; া
+      ))
     (=ucs		. #x09CB)	; ো
     ))
 (define-char
@@ -411,7 +417,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x09C7 #x09D7)
+    (=decomposition
+     ((name		  . "BENGALI VOWEL SIGN E")
+      (=ucs		  . #x09C7)	; ে
+      )
+     ((name		  . "BENGALI AU LENGTH MARK")
+      (=ucs		  . #x09D7)	; ৗ
+      ))
     (=ucs		. #x09CC)	; ৌ
     ))
 (define-char
@@ -433,7 +445,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x09A1 #x09BC)
+    (=decomposition
+     ((name		  . "BENGALI LETTER DDA")
+      (=ucs		  . #x09A1)	; ড
+      )
+     ((name		  . "BENGALI SIGN NUKTA")
+      (=ucs		  . #x09BC)	; ়
+      ))
     (=ucs		. #x09DC)	; ড়
     ))
 (define-char
@@ -441,7 +459,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x09A2 #x09BC)
+    (=decomposition
+     ((name		  . "BENGALI LETTER DDHA")
+      (=ucs		  . #x09A2)	; ঢ
+      )
+     ((name		  . "BENGALI SIGN NUKTA")
+      (=ucs		  . #x09BC)	; ়
+      ))
     (=ucs		. #x09DD)	; ঢ়
     ))
 (define-char
@@ -449,7 +473,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x09AF #x09BC)
+    (=decomposition
+     ((name		  . "BENGALI LETTER YA")
+      (=ucs		  . #x09AF)	; য
+      )
+     ((name		  . "BENGALI SIGN NUKTA")
+      (=ucs		  . #x09BC)	; ়
+      ))
     (=ucs		. #x09DF)	; য়
     ))
 (define-char
diff --git a/lisp/utf-2000/u00A00-Gurmukhi.el b/lisp/utf-2000/u00A00-Gurmukhi.el
index a0e2da1..b7156b4 100644
--- a/lisp/utf-2000/u00A00-Gurmukhi.el
+++ b/lisp/utf-2000/u00A00-Gurmukhi.el
@@ -277,7 +277,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0A32 #x0A3C)
+    (=decomposition
+     ((name		  . "GURMUKHI LETTER LA")
+      (=ucs		  . #x0A32)	; ਲ
+      )
+     ((name		  . "GURMUKHI SIGN NUKTA")
+      (=ucs		  . #x0A3C)	; ਼
+      ))
     (=ucs		. #x0A33)	; ਲ਼
     ))
 (define-char
@@ -292,7 +298,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0A38 #x0A3C)
+    (=decomposition
+     ((name		  . "GURMUKHI LETTER SA")
+      (=ucs		  . #x0A38)	; ਸ
+      )
+     ((name		  . "GURMUKHI SIGN NUKTA")
+      (=ucs		  . #x0A3C)	; ਼
+      ))
     (=ucs		. #x0A36)	; ਸ਼
     ))
 (define-char
@@ -391,7 +403,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0A16 #x0A3C)
+    (=decomposition
+     ((name		  . "GURMUKHI LETTER KHA")
+      (=ucs		  . #x0A16)	; ਖ
+      )
+     ((name		  . "GURMUKHI SIGN NUKTA")
+      (=ucs		  . #x0A3C)	; ਼
+      ))
     (=ucs		. #x0A59)	; ਖ਼
     ))
 (define-char
@@ -399,7 +417,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0A17 #x0A3C)
+    (=decomposition
+     ((name		  . "GURMUKHI LETTER GA")
+      (=ucs		  . #x0A17)	; ਗ
+      )
+     ((name		  . "GURMUKHI SIGN NUKTA")
+      (=ucs		  . #x0A3C)	; ਼
+      ))
     (=ucs		. #x0A5A)	; ਗ਼
     ))
 (define-char
@@ -407,7 +431,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0A1C #x0A3C)
+    (=decomposition
+     ((name		  . "GURMUKHI LETTER JA")
+      (=ucs		  . #x0A1C)	; ਜ
+      )
+     ((name		  . "GURMUKHI SIGN NUKTA")
+      (=ucs		  . #x0A3C)	; ਼
+      ))
     (=ucs		. #x0A5B)	; ਜ਼
     ))
 (define-char
@@ -422,7 +452,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0A2B #x0A3C)
+    (=decomposition
+     ((name		  . "GURMUKHI LETTER PHA")
+      (=ucs		  . #x0A2B)	; ਫ
+      )
+     ((name		  . "GURMUKHI SIGN NUKTA")
+      (=ucs		  . #x0A3C)	; ਼
+      ))
     (=ucs		. #x0A5E)	; ਫ਼
     ))
 (define-char
diff --git a/lisp/utf-2000/u00B00-Oriya.el b/lisp/utf-2000/u00B00-Oriya.el
index 3893066..aff7d2d 100644
--- a/lisp/utf-2000/u00B00-Oriya.el
+++ b/lisp/utf-2000/u00B00-Oriya.el
@@ -403,7 +403,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0B47 #x0B56)
+    (=decomposition
+     ((name		  . "ORIYA VOWEL SIGN E")
+      (=ucs		  . #x0B47)	; େ
+      )
+     ((name		  . "ORIYA AI LENGTH MARK")
+      (=ucs		  . #x0B56)	; ୖ
+      ))
     (=ucs		. #x0B48)	; ୈ
     ))
 (define-char
@@ -411,7 +417,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0B47 #x0B3E)
+    (=decomposition
+     ((name		  . "ORIYA VOWEL SIGN E")
+      (=ucs		  . #x0B47)	; େ
+      )
+     ((name		  . "ORIYA VOWEL SIGN AA")
+      (=ucs		  . #x0B3E)	; ା
+      ))
     (=ucs		. #x0B4B)	; ୋ
     ))
 (define-char
@@ -419,7 +431,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0B47 #x0B57)
+    (=decomposition
+     ((name		  . "ORIYA VOWEL SIGN E")
+      (=ucs		  . #x0B47)	; େ
+      )
+     ((name		  . "ORIYA AU LENGTH MARK")
+      (=ucs		  . #x0B57)	; ୗ
+      ))
     (=ucs		. #x0B4C)	; ୌ
     ))
 (define-char
@@ -448,7 +466,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0B21 #x0B3C)
+    (=decomposition
+     ((name		  . "ORIYA LETTER DDA")
+      (=ucs		  . #x0B21)	; ଡ
+      )
+     ((name		  . "ORIYA SIGN NUKTA")
+      (=ucs		  . #x0B3C)	; ଼
+      ))
     (=ucs		. #x0B5C)	; ଡ଼
     ))
 (define-char
@@ -456,7 +480,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0B22 #x0B3C)
+    (=decomposition
+     ((name		  . "ORIYA LETTER DDHA")
+      (=ucs		  . #x0B22)	; ଢ
+      )
+     ((name		  . "ORIYA SIGN NUKTA")
+      (=ucs		  . #x0B3C)	; ଼
+      ))
     (=ucs		. #x0B5D)	; ଢ଼
     ))
 (define-char
diff --git a/lisp/utf-2000/u00B80-Tamil.el b/lisp/utf-2000/u00B80-Tamil.el
index 8f5d458..865eecb 100644
--- a/lisp/utf-2000/u00B80-Tamil.el
+++ b/lisp/utf-2000/u00B80-Tamil.el
@@ -95,7 +95,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0B92 #x0BD7)
+    (=decomposition
+     ((name		  . "TAMIL LETTER O")
+      (=ucs		  . #x0B92)	; ஒ
+      )
+     ((name		  . "TAMIL AU LENGTH MARK")
+      (=ucs		  . #x0BD7)	; ௗ
+      ))
     (=ucs		. #x0B94)	; ஔ
     ))
 (define-char
@@ -313,7 +319,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0BC6 #x0BBE)
+    (=decomposition
+     ((name		  . "TAMIL VOWEL SIGN E")
+      (=ucs		  . #x0BC6)	; ெ
+      )
+     ((name		  . "TAMIL VOWEL SIGN AA")
+      (=ucs		  . #x0BBE)	; ா
+      ))
     (=ucs		. #x0BCA)	; ொ
     ))
 (define-char
@@ -321,7 +333,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0BC7 #x0BBE)
+    (=decomposition
+     ((name		  . "TAMIL VOWEL SIGN EE")
+      (=ucs		  . #x0BC7)	; ே
+      )
+     ((name		  . "TAMIL VOWEL SIGN AA")
+      (=ucs		  . #x0BBE)	; ா
+      ))
     (=ucs		. #x0BCB)	; ோ
     ))
 (define-char
@@ -329,7 +347,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0BC6 #x0BD7)
+    (=decomposition
+     ((name		  . "TAMIL VOWEL SIGN E")
+      (=ucs		  . #x0BC6)	; ெ
+      )
+     ((name		  . "TAMIL AU LENGTH MARK")
+      (=ucs		  . #x0BD7)	; ௗ
+      ))
     (=ucs		. #x0BCC)	; ௌ
     ))
 (define-char
diff --git a/lisp/utf-2000/u00C00-Telugu.el b/lisp/utf-2000/u00C00-Telugu.el
index 2065f3e..c0aad67 100644
--- a/lisp/utf-2000/u00C00-Telugu.el
+++ b/lisp/utf-2000/u00C00-Telugu.el
@@ -431,7 +431,13 @@
     (general-category	mark non-spacing) ; Normative Category
     (bidi-category	. "NSM")
     (mirrored		. nil)
-    (->decomposition	#x0C46 #x0C56)
+    (=decomposition
+     ((name		  . "TELUGU VOWEL SIGN E")
+      (=ucs		  . #x0C46)	; ె
+      )
+     ((name		  . "TELUGU AI LENGTH MARK")
+      (=ucs		  . #x0C56)	; ౖ
+      ))
     (=ucs		. #x0C48)	; ై
     ))
 (define-char
diff --git a/lisp/utf-2000/u00C80-Kannada.el b/lisp/utf-2000/u00C80-Kannada.el
index 08df09a..79c6a94 100644
--- a/lisp/utf-2000/u00C80-Kannada.el
+++ b/lisp/utf-2000/u00C80-Kannada.el
@@ -375,7 +375,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0CBF #x0CD5)
+    (=decomposition
+     ((name		  . "KANNADA VOWEL SIGN I")
+      (=ucs		  . #x0CBF)	; ಿ
+      )
+     ((name		  . "KANNADA LENGTH MARK")
+      (=ucs		  . #x0CD5)	; ೕ
+      ))
     (=ucs		. #x0CC0)	; ೀ
     ))
 (define-char
@@ -418,7 +424,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0CC6 #x0CD5)
+    (=decomposition
+     ((name		  . "KANNADA VOWEL SIGN E")
+      (=ucs		  . #x0CC6)	; ೆ
+      )
+     ((name		  . "KANNADA LENGTH MARK")
+      (=ucs		  . #x0CD5)	; ೕ
+      ))
     (=ucs		. #x0CC7)	; ೇ
     ))
 (define-char
@@ -426,7 +438,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0CC6 #x0CD6)
+    (=decomposition
+     ((name		  . "KANNADA VOWEL SIGN E")
+      (=ucs		  . #x0CC6)	; ೆ
+      )
+     ((name		  . "KANNADA AI LENGTH MARK")
+      (=ucs		  . #x0CD6)	; ೖ
+      ))
     (=ucs		. #x0CC8)	; ೈ
     ))
 (define-char
@@ -434,7 +452,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0CC6 #x0CC2)
+    (=decomposition
+     ((name		  . "KANNADA VOWEL SIGN E")
+      (=ucs		  . #x0CC6)	; ೆ
+      )
+     ((name		  . "KANNADA VOWEL SIGN UU")
+      (=ucs		  . #x0CC2)	; ೂ
+      ))
     (=ucs		. #x0CCA)	; ೊ
     ))
 (define-char
@@ -442,7 +466,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0CCA #x0CD5)
+    (=decomposition
+     ((name		  . "KANNADA VOWEL SIGN O")
+      (=ucs		  . #x0CCA)	; ೊ
+      )
+     ((name		  . "KANNADA LENGTH MARK")
+      (=ucs		  . #x0CD5)	; ೕ
+      ))
     (=ucs		. #x0CCB)	; ೋ
     ))
 (define-char
diff --git a/lisp/utf-2000/u00D00-Malayalam.el b/lisp/utf-2000/u00D00-Malayalam.el
index 879f6ad..f003a38 100644
--- a/lisp/utf-2000/u00D00-Malayalam.el
+++ b/lisp/utf-2000/u00D00-Malayalam.el
@@ -431,7 +431,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0D46 #x0D3E)
+    (=decomposition
+     ((name		  . "MALAYALAM VOWEL SIGN E")
+      (=ucs		  . #x0D46)	; െ
+      )
+     ((name		  . "MALAYALAM VOWEL SIGN AA")
+      (=ucs		  . #x0D3E)	; à´¾
+      ))
     (=ucs		. #x0D4A)	; ൊ
     ))
 (define-char
@@ -439,7 +445,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0D47 #x0D3E)
+    (=decomposition
+     ((name		  . "MALAYALAM VOWEL SIGN EE")
+      (=ucs		  . #x0D47)	; േ
+      )
+     ((name		  . "MALAYALAM VOWEL SIGN AA")
+      (=ucs		  . #x0D3E)	; à´¾
+      ))
     (=ucs		. #x0D4B)	; ോ
     ))
 (define-char
@@ -447,7 +459,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0D46 #x0D57)
+    (=decomposition
+     ((name		  . "MALAYALAM VOWEL SIGN E")
+      (=ucs		  . #x0D46)	; െ
+      )
+     ((name		  . "MALAYALAM AU LENGTH MARK")
+      (=ucs		  . #x0D57)	; ൗ
+      ))
     (=ucs		. #x0D4C)	; ൌ
     ))
 (define-char
diff --git a/lisp/utf-2000/u00D80-Sinhala.el b/lisp/utf-2000/u00D80-Sinhala.el
index 9c00efe..e338c1a 100644
--- a/lisp/utf-2000/u00D80-Sinhala.el
+++ b/lisp/utf-2000/u00D80-Sinhala.el
@@ -501,7 +501,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0DD9 #x0DCA)
+    (=decomposition
+     ((name		  . "SINHALA VOWEL SIGN KOMBUVA")
+      (=ucs		  . #x0DD9)	; ෙ
+      )
+     ((name		  . "SINHALA SIGN AL-LAKUNA")
+      (=ucs		  . #x0DCA)	; ්
+      ))
     (=ucs		. #x0DDA)	; ේ
     ))
 (define-char
@@ -516,7 +522,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0DD9 #x0DCF)
+    (=decomposition
+     ((name		  . "SINHALA VOWEL SIGN KOMBUVA")
+      (=ucs		  . #x0DD9)	; ෙ
+      )
+     ((name		  . "SINHALA VOWEL SIGN AELA-PILLA")
+      (=ucs		  . #x0DCF)	; ා
+      ))
     (=ucs		. #x0DDC)	; ො
     ))
 (define-char
@@ -524,7 +536,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0DDC #x0DCA)
+    (=decomposition
+     ((name		  . "SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA")
+      (=ucs		  . #x0DDC)	; ො
+      )
+     ((name		  . "SINHALA SIGN AL-LAKUNA")
+      (=ucs		  . #x0DCA)	; ්
+      ))
     (=ucs		. #x0DDD)	; ෝ
     ))
 (define-char
@@ -532,7 +550,13 @@
     (general-category	mark spacing-combining) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0DD9 #x0DDF)
+    (=decomposition
+     ((name		  . "SINHALA VOWEL SIGN KOMBUVA")
+      (=ucs		  . #x0DD9)	; ෙ
+      )
+     ((name		  . "SINHALA VOWEL SIGN GAYANUKITTA")
+      (=ucs		  . #x0DDF)	; ෟ
+      ))
     (=ucs		. #x0DDE)	; ෞ
     ))
 (define-char
diff --git a/lisp/utf-2000/u01000-Myanmar.el b/lisp/utf-2000/u01000-Myanmar.el
index 2f611c9..0a279b7 100644
--- a/lisp/utf-2000/u01000-Myanmar.el
+++ b/lisp/utf-2000/u01000-Myanmar.el
@@ -263,7 +263,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1025 #x102E)
+    (=decomposition
+     ((name		  . "MYANMAR LETTER U")
+      (=ucs		  . #x1025)	; ဥ
+      )
+     ((name		  . "MYANMAR VOWEL SIGN II")
+      (=ucs		  . #x102E)	; ီ
+      ))
     (=ucs		. #x1026)	; ဦ
     ))
 (define-char
diff --git a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
index bcabf44..18a7ddc 100644
--- a/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
+++ b/lisp/utf-2000/u01E00-Latin-Extended-Additional.el
@@ -4,11 +4,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x0325)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH RING BELOW")
       (=ucs		  . #x1E01)	; ḁ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING RING BELOW")
+      (=ucs		  . #x0325)	; ̥
+      ))
     (=ucs		. #x1E00)	; Ḁ
     ))
 (define-char
@@ -16,11 +22,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x0325)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH RING BELOW")
       (=ucs		  . #x1E00)	; Ḁ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING RING BELOW")
+      (=ucs		  . #x0325)	; ̥
+      ))
     (=ucs		. #x1E01)	; ḁ
     ))
 (define-char
@@ -28,11 +40,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0042 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER B WITH DOT ABOVE")
       (=ucs		  . #x1E03)	; ḃ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER B")
+      (=ucs		  . #x0042)	; B
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E02)	; Ḃ
     ))
 (define-char
@@ -40,11 +58,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0062 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER B WITH DOT ABOVE")
       (=ucs		  . #x1E02)	; Ḃ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER B")
+      (=ucs		  . #x0062)	; b
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E03)	; ḃ
     ))
 (define-char
@@ -52,11 +76,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0042 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER B WITH DOT BELOW")
       (=ucs		  . #x1E05)	; ḅ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER B")
+      (=ucs		  . #x0042)	; B
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E04)	; Ḅ
     ))
 (define-char
@@ -64,11 +94,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0062 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER B WITH DOT BELOW")
       (=ucs		  . #x1E04)	; Ḅ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER B")
+      (=ucs		  . #x0062)	; b
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E05)	; ḅ
     ))
 (define-char
@@ -76,11 +112,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0042 #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER B WITH LINE BELOW")
       (=ucs		  . #x1E07)	; ḇ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER B")
+      (=ucs		  . #x0042)	; B
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E06)	; Ḇ
     ))
 (define-char
@@ -88,11 +130,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0062 #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER B WITH LINE BELOW")
       (=ucs		  . #x1E06)	; Ḇ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER B")
+      (=ucs		  . #x0062)	; b
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E07)	; ḇ
     ))
 (define-char
@@ -100,11 +148,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C7 #x0301)
     (->lowercase
      ((name . "LATIN SMALL LETTER C WITH CEDILLA AND ACUTE")
       (=ucs		  . #x1E09)	; ḉ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER C WITH CEDILLA")
+      (=ucs		  . #x00C7)	; Ç
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E08)	; Ḉ
     ))
 (define-char
@@ -112,11 +166,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E7 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE")
       (=ucs		  . #x1E08)	; Ḉ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER C WITH CEDILLA")
+      (=ucs		  . #x00E7)	; ç
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E09)	; ḉ
     ))
 (define-char
@@ -124,11 +184,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0044 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH DOT ABOVE")
       (=ucs		  . #x1E0B)	; ḋ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E0A)	; Ḋ
     ))
 (define-char
@@ -136,11 +202,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0064 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER D WITH DOT ABOVE")
       (=ucs		  . #x1E0A)	; Ḋ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E0B)	; ḋ
     ))
 (define-char
@@ -148,11 +220,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0044 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH DOT BELOW")
       (=ucs		  . #x1E0D)	; ḍ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E0C)	; Ḍ
     ))
 (define-char
@@ -160,11 +238,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0064 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER D WITH DOT BELOW")
       (=ucs		  . #x1E0C)	; Ḍ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E0D)	; ḍ
     ))
 (define-char
@@ -172,11 +256,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0044 #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH LINE BELOW")
       (=ucs		  . #x1E0F)	; ḏ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E0E)	; Ḏ
     ))
 (define-char
@@ -184,11 +274,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0064 #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER D WITH LINE BELOW")
       (=ucs		  . #x1E0E)	; Ḏ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E0F)	; ḏ
     ))
 (define-char
@@ -196,11 +292,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0044 #x0327)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH CEDILLA")
       (=ucs		  . #x1E11)	; ḑ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "COMBINING CEDILLA")
+      (=ucs		  . #x0327)	; ̧
+      ))
     (=ucs		. #x1E10)	; Ḑ
     ))
 (define-char
@@ -208,11 +310,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0064 #x0327)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER D WITH CEDILLA")
       (=ucs		  . #x1E10)	; Ḑ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "COMBINING CEDILLA")
+      (=ucs		  . #x0327)	; ̧
+      ))
     (=ucs		. #x1E11)	; ḑ
     ))
 (define-char
@@ -220,11 +328,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0044 #x032D)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E13)	; ḓ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER D")
+      (=ucs		  . #x0044)	; D
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E12)	; Ḓ
     ))
 (define-char
@@ -232,11 +346,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0064 #x032D)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E12)	; Ḓ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER D")
+      (=ucs		  . #x0064)	; d
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E13)	; ḓ
     ))
 (define-char
@@ -244,11 +364,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0112 #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH MACRON AND GRAVE")
       (=ucs		  . #x1E15)	; ḕ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH MACRON")
+      (=ucs		  . #x0112)	; Ē
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1E14)	; Ḕ
     ))
 (define-char
@@ -256,11 +382,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0113 #x0300)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH MACRON AND GRAVE")
       (=ucs		  . #x1E14)	; Ḕ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH MACRON")
+      (=ucs		  . #x0113)	; ē
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1E15)	; ḕ
     ))
 (define-char
@@ -268,11 +400,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0112 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH MACRON AND ACUTE")
       (=ucs		  . #x1E17)	; ḗ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH MACRON")
+      (=ucs		  . #x0112)	; Ē
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E16)	; Ḗ
     ))
 (define-char
@@ -280,11 +418,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0113 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH MACRON AND ACUTE")
       (=ucs		  . #x1E16)	; Ḗ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH MACRON")
+      (=ucs		  . #x0113)	; ē
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E17)	; ḗ
     ))
 (define-char
@@ -292,11 +436,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x032D)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E19)	; ḙ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E18)	; Ḙ
     ))
 (define-char
@@ -304,11 +454,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x032D)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E18)	; Ḙ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E19)	; ḙ
     ))
 (define-char
@@ -316,11 +472,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x0330)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH TILDE BELOW")
       (=ucs		  . #x1E1B)	; ḛ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING TILDE BELOW")
+      (=ucs		  . #x0330)	; Ì°
+      ))
     (=ucs		. #x1E1A)	; Ḛ
     ))
 (define-char
@@ -328,11 +490,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x0330)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH TILDE BELOW")
       (=ucs		  . #x1E1A)	; Ḛ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING TILDE BELOW")
+      (=ucs		  . #x0330)	; Ì°
+      ))
     (=ucs		. #x1E1B)	; ḛ
     ))
 (define-char
@@ -340,11 +508,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0228 #x0306)
     (->lowercase
      ((name . "LATIN SMALL LETTER E WITH CEDILLA AND BREVE")
       (=ucs		  . #x1E1D)	; ḝ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH CEDILLA")
+      (=ucs		  . #x0228)	; Ȩ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1E1C)	; Ḝ
     ))
 (define-char
@@ -352,11 +526,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0229 #x0306)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE")
       (=ucs		  . #x1E1C)	; Ḝ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH CEDILLA")
+      (=ucs		  . #x0229)	; È©
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1E1D)	; ḝ
     ))
 (define-char
@@ -364,11 +544,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0046 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER F WITH DOT ABOVE")
       (=ucs		  . #x1E1F)	; ḟ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER F")
+      (=ucs		  . #x0046)	; F
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E1E)	; Ḟ
     ))
 (define-char
@@ -376,11 +562,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0066 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER F WITH DOT ABOVE")
       (=ucs		  . #x1E1E)	; Ḟ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER F")
+      (=ucs		  . #x0066)	; f
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E1F)	; ḟ
     ))
 (define-char
@@ -388,11 +580,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0047 #x0304)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER G WITH MACRON")
       (=ucs		  . #x1E21)	; ḡ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER G")
+      (=ucs		  . #x0047)	; G
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1E20)	; Ḡ
     ))
 (define-char
@@ -400,11 +598,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0067 #x0304)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER G WITH MACRON")
       (=ucs		  . #x1E20)	; Ḡ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER G")
+      (=ucs		  . #x0067)	; g
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1E21)	; ḡ
     ))
 (define-char
@@ -412,11 +616,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0048 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER H WITH DOT ABOVE")
       (=ucs		  . #x1E23)	; ḣ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E22)	; Ḣ
     ))
 (define-char
@@ -424,11 +634,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER H WITH DOT ABOVE")
       (=ucs		  . #x1E22)	; Ḣ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E23)	; ḣ
     ))
 (define-char
@@ -436,11 +652,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0048 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER H WITH DOT BELOW")
       (=ucs		  . #x1E25)	; ḥ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E24)	; Ḥ
     ))
 (define-char
@@ -448,11 +670,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER H WITH DOT BELOW")
       (=ucs		  . #x1E24)	; Ḥ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E25)	; ḥ
     ))
 (define-char
@@ -460,11 +688,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0048 #x0308)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER H WITH DIAERESIS")
       (=ucs		  . #x1E27)	; ḧ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E26)	; Ḧ
     ))
 (define-char
@@ -472,11 +706,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x0308)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER H WITH DIAERESIS")
       (=ucs		  . #x1E26)	; Ḧ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E27)	; ḧ
     ))
 (define-char
@@ -484,11 +724,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0048 #x0327)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER H WITH CEDILLA")
       (=ucs		  . #x1E29)	; ḩ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      )
+     ((name		  . "COMBINING CEDILLA")
+      (=ucs		  . #x0327)	; ̧
+      ))
     (=ucs		. #x1E28)	; Ḩ
     ))
 (define-char
@@ -496,11 +742,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x0327)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER H WITH CEDILLA")
       (=ucs		  . #x1E28)	; Ḩ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING CEDILLA")
+      (=ucs		  . #x0327)	; ̧
+      ))
     (=ucs		. #x1E29)	; ḩ
     ))
 (define-char
@@ -508,11 +760,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0048 #x032E)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER H WITH BREVE BELOW")
       (=ucs		  . #x1E2B)	; ḫ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      )
+     ((name		  . "COMBINING BREVE BELOW")
+      (=ucs		  . #x032E)	; Ì®
+      ))
     (=ucs		. #x1E2A)	; Ḫ
     ))
 (define-char
@@ -520,11 +778,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x032E)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER H WITH BREVE BELOW")
       (=ucs		  . #x1E2A)	; Ḫ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING BREVE BELOW")
+      (=ucs		  . #x032E)	; Ì®
+      ))
     (=ucs		. #x1E2B)	; ḫ
     ))
 (define-char
@@ -532,11 +796,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0049 #x0330)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH TILDE BELOW")
       (=ucs		  . #x1E2D)	; ḭ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      )
+     ((name		  . "COMBINING TILDE BELOW")
+      (=ucs		  . #x0330)	; Ì°
+      ))
     (=ucs		. #x1E2C)	; Ḭ
     ))
 (define-char
@@ -544,11 +814,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0069 #x0330)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH TILDE BELOW")
       (=ucs		  . #x1E2C)	; Ḭ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      )
+     ((name		  . "COMBINING TILDE BELOW")
+      (=ucs		  . #x0330)	; Ì°
+      ))
     (=ucs		. #x1E2D)	; ḭ
     ))
 (define-char
@@ -556,11 +832,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00CF #x0301)
     (->lowercase
      ((name . "LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x1E2F)	; ḯ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I WITH DIAERESIS")
+      (=ucs		  . #x00CF)	; Ï
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E2E)	; Ḯ
     ))
 (define-char
@@ -568,11 +850,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00EF #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE")
       (=ucs		  . #x1E2E)	; Ḯ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I WITH DIAERESIS")
+      (=ucs		  . #x00EF)	; ï
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E2F)	; ḯ
     ))
 (define-char
@@ -580,26 +868,38 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004B #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
       (=ucs		  . #x1E31)	; ḱ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER K")
+      (=ucs		  . #x004B)	; K
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E30)	; Ḱ
     ))
 (define-char
-  '((->decomposition	#xFF2B #x0301)
-    (->lowercase
-     ((=jef-china3	  . #x85F2)	; &JC3-85F2;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
       (=ucs		  . #x1E30)	; Ḱ
       ))
+    (->lowercase
+     ((=jef-china3	  . #x85F2)	; &JC3-85F2;
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
       (=ucs		  . #x1E30)	; Ḱ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER K")
+      (=ucs		  . #xFF2B)	; Ｋ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85DC)	; &JC3-85DC;
     ))
 (define-char
@@ -607,26 +907,38 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006B #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER K WITH ACUTE")
       (=ucs		  . #x1E30)	; Ḱ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER K")
+      (=ucs		  . #x006B)	; k
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E31)	; ḱ
     ))
 (define-char
-  '((->decomposition	#xFF4B #x0301)
-    (->uppercase
-     ((=jef-china3	  . #x85DC)	; &JC3-85DC;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
       (=ucs		  . #x1E31)	; ḱ
       ))
+    (->uppercase
+     ((=jef-china3	  . #x85DC)	; &JC3-85DC;
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER K WITH ACUTE")
       (=ucs		  . #x1E31)	; ḱ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER K")
+      (=ucs		  . #xFF4B)	; ｋ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85F2)	; &JC3-85F2;
     ))
 (define-char
@@ -634,11 +946,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004B #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER K WITH DOT BELOW")
       (=ucs		  . #x1E33)	; ḳ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER K")
+      (=ucs		  . #x004B)	; K
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E32)	; Ḳ
     ))
 (define-char
@@ -646,11 +964,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006B #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER K WITH DOT BELOW")
       (=ucs		  . #x1E32)	; Ḳ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER K")
+      (=ucs		  . #x006B)	; k
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E33)	; ḳ
     ))
 (define-char
@@ -658,11 +982,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004B #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER K WITH LINE BELOW")
       (=ucs		  . #x1E35)	; ḵ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER K")
+      (=ucs		  . #x004B)	; K
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E34)	; Ḵ
     ))
 (define-char
@@ -670,11 +1000,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006B #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER K WITH LINE BELOW")
       (=ucs		  . #x1E34)	; Ḵ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER K")
+      (=ucs		  . #x006B)	; k
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E35)	; ḵ
     ))
 (define-char
@@ -682,11 +1018,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004C #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER L WITH DOT BELOW")
       (=ucs		  . #x1E37)	; ḷ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E36)	; Ḷ
     ))
 (define-char
@@ -694,11 +1036,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006C #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER L WITH DOT BELOW")
       (=ucs		  . #x1E36)	; Ḷ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E37)	; ḷ
     ))
 (define-char
@@ -706,11 +1054,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1E36 #x0304)
     (->lowercase
      ((name . "LATIN SMALL LETTER L WITH DOT BELOW AND MACRON")
       (=ucs		  . #x1E39)	; ḹ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER L WITH DOT BELOW")
+      (=ucs		  . #x1E36)	; Ḷ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1E38)	; Ḹ
     ))
 (define-char
@@ -718,11 +1072,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1E37 #x0304)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON")
       (=ucs		  . #x1E38)	; Ḹ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER L WITH DOT BELOW")
+      (=ucs		  . #x1E37)	; ḷ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1E39)	; ḹ
     ))
 (define-char
@@ -730,11 +1090,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004C #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER L WITH LINE BELOW")
       (=ucs		  . #x1E3B)	; ḻ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E3A)	; Ḻ
     ))
 (define-char
@@ -742,11 +1108,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006C #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER L WITH LINE BELOW")
       (=ucs		  . #x1E3A)	; Ḻ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E3B)	; ḻ
     ))
 (define-char
@@ -754,11 +1126,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004C #x032D)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E3D)	; ḽ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E3C)	; Ḽ
     ))
 (define-char
@@ -766,11 +1144,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006C #x032D)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E3C)	; Ḽ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E3D)	; ḽ
     ))
 (define-char
@@ -778,26 +1162,38 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004D #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E3E)	; Ḿ
     ))
 (define-char
-  '((->decomposition	#xFF2D #x0301)
-    (->lowercase
-     ((=jis-x0213-1-2000  . #x2873)	; &JX1-2873; [08-83]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
       ))
+    (->lowercase
+     ((=jis-x0213-1-2000  . #x2873)	; &JX1-2873; [08-83]
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER M")
+      (=ucs		  . #xFF2D)	; ï¼­
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0213-1-2000	. #x2872)	; &JX1-2872; [08-82]
     (=jef-china3	. #x85DE)	; &I-JC3-85DE;
     (=ucs@jis/fw	. #x1E3E)	; &JX1-2872;
@@ -807,26 +1203,38 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006D #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3E)	; Ḿ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER M")
+      (=ucs		  . #x006D)	; m
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E3F)	; ḿ
     ))
 (define-char
-  '((->decomposition	#xFF4D #x0301)
-    (->uppercase
-     ((=jis-x0213-1-2000  . #x2872)	; &JX1-2872; [08-82]
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
       ))
+    (->uppercase
+     ((=jis-x0213-1-2000  . #x2872)	; &JX1-2872; [08-82]
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER M WITH ACUTE")
       (=ucs		  . #x1E3F)	; ḿ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER M")
+      (=ucs		  . #xFF4D)	; ｍ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0213-1-2000	. #x2873)	; &JX1-2873; [08-83]
     (=jef-china3	. #x85F4)	; &I-JC3-85F4;
     (=ucs@jis/fw	. #x1E3F)	; &JX1-2873;
@@ -836,11 +1244,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004D #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER M WITH DOT ABOVE")
       (=ucs		  . #x1E41)	; ṁ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E40)	; Ṁ
     ))
 (define-char
@@ -848,11 +1262,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006D #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER M WITH DOT ABOVE")
       (=ucs		  . #x1E40)	; Ṁ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER M")
+      (=ucs		  . #x006D)	; m
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E41)	; ṁ
     ))
 (define-char
@@ -860,11 +1280,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004D #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER M WITH DOT BELOW")
       (=ucs		  . #x1E43)	; ṃ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E42)	; Ṃ
     ))
 (define-char
@@ -872,11 +1298,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006D #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER M WITH DOT BELOW")
       (=ucs		  . #x1E42)	; Ṃ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER M")
+      (=ucs		  . #x006D)	; m
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E43)	; ṃ
     ))
 (define-char
@@ -884,11 +1316,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004E #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH DOT ABOVE")
       (=ucs		  . #x1E45)	; ṅ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E44)	; Ṅ
     ))
 (define-char
@@ -896,11 +1334,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006E #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER N WITH DOT ABOVE")
       (=ucs		  . #x1E44)	; Ṅ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E45)	; ṅ
     ))
 (define-char
@@ -908,11 +1352,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004E #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH DOT BELOW")
       (=ucs		  . #x1E47)	; ṇ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E46)	; Ṇ
     ))
 (define-char
@@ -920,11 +1370,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006E #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER N WITH DOT BELOW")
       (=ucs		  . #x1E46)	; Ṇ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E47)	; ṇ
     ))
 (define-char
@@ -932,11 +1388,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004E #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH LINE BELOW")
       (=ucs		  . #x1E49)	; ṉ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E48)	; Ṉ
     ))
 (define-char
@@ -944,11 +1406,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006E #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER N WITH LINE BELOW")
       (=ucs		  . #x1E48)	; Ṉ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E49)	; ṉ
     ))
 (define-char
@@ -956,11 +1424,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004E #x032D)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E4B)	; ṋ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E4A)	; Ṋ
     ))
 (define-char
@@ -968,11 +1442,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006E #x032D)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E4A)	; Ṋ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER N")
+      (=ucs		  . #x006E)	; n
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E4B)	; ṋ
     ))
 (define-char
@@ -980,11 +1460,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D5 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH TILDE AND ACUTE")
       (=ucs		  . #x1E4D)	; ṍ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
+      (=ucs		  . #x00D5)	; Õ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E4C)	; Ṍ
     ))
 (define-char
@@ -992,11 +1478,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F5 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH TILDE AND ACUTE")
       (=ucs		  . #x1E4C)	; Ṍ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH TILDE")
+      (=ucs		  . #x00F5)	; õ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E4D)	; ṍ
     ))
 (define-char
@@ -1004,11 +1496,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D5 #x0308)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH TILDE AND DIAERESIS")
       (=ucs		  . #x1E4F)	; ṏ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH TILDE")
+      (=ucs		  . #x00D5)	; Õ
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E4E)	; Ṏ
     ))
 (define-char
@@ -1016,11 +1514,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F5 #x0308)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS")
       (=ucs		  . #x1E4E)	; Ṏ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH TILDE")
+      (=ucs		  . #x00F5)	; õ
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E4F)	; ṏ
     ))
 (define-char
@@ -1028,11 +1532,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x014C #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH MACRON AND GRAVE")
       (=ucs		  . #x1E51)	; ṑ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH MACRON")
+      (=ucs		  . #x014C)	; Ō
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1E50)	; Ṑ
     ))
 (define-char
@@ -1040,11 +1550,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x014D #x0300)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH MACRON AND GRAVE")
       (=ucs		  . #x1E50)	; Ṑ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH MACRON")
+      (=ucs		  . #x014D)	; ō
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1E51)	; ṑ
     ))
 (define-char
@@ -1052,11 +1568,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x014C #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH MACRON AND ACUTE")
       (=ucs		  . #x1E53)	; ṓ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH MACRON")
+      (=ucs		  . #x014C)	; Ō
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E52)	; Ṓ
     ))
 (define-char
@@ -1064,11 +1586,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x014D #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH MACRON AND ACUTE")
       (=ucs		  . #x1E52)	; Ṓ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH MACRON")
+      (=ucs		  . #x014D)	; ō
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E53)	; ṓ
     ))
 (define-char
@@ -1076,26 +1604,38 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0050 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
       (=ucs		  . #x1E55)	; ṕ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER P")
+      (=ucs		  . #x0050)	; P
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E54)	; Ṕ
     ))
 (define-char
-  '((->decomposition	#xFF30 #x0301)
-    (->lowercase
-     ((=jef-china3	  . #x85F7)	; &JC3-85F7;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
       (=ucs		  . #x1E54)	; Ṕ
       ))
+    (->lowercase
+     ((=jef-china3	  . #x85F7)	; &JC3-85F7;
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
       (=ucs		  . #x1E54)	; Ṕ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER P")
+      (=ucs		  . #xFF30)	; ï¼°
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85E1)	; &JC3-85E1;
     ))
 (define-char
@@ -1103,26 +1643,38 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0070 #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER P WITH ACUTE")
       (=ucs		  . #x1E54)	; Ṕ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER P")
+      (=ucs		  . #x0070)	; p
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E55)	; ṕ
     ))
 (define-char
-  '((->decomposition	#xFF50 #x0301)
-    (->uppercase
-     ((=jef-china3	  . #x85E1)	; &JC3-85E1;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
       (=ucs		  . #x1E55)	; ṕ
       ))
+    (->uppercase
+     ((=jef-china3	  . #x85E1)	; &JC3-85E1;
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER P WITH ACUTE")
       (=ucs		  . #x1E55)	; ṕ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER P")
+      (=ucs		  . #xFF50)	; ｐ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85F7)	; &JC3-85F7;
     ))
 (define-char
@@ -1130,11 +1682,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0050 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER P WITH DOT ABOVE")
       (=ucs		  . #x1E57)	; ṗ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER P")
+      (=ucs		  . #x0050)	; P
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E56)	; Ṗ
     ))
 (define-char
@@ -1142,11 +1700,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0070 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER P WITH DOT ABOVE")
       (=ucs		  . #x1E56)	; Ṗ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER P")
+      (=ucs		  . #x0070)	; p
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E57)	; ṗ
     ))
 (define-char
@@ -1154,11 +1718,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0052 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER R WITH DOT ABOVE")
       (=ucs		  . #x1E59)	; ṙ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E58)	; Ṙ
     ))
 (define-char
@@ -1166,11 +1736,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0072 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER R WITH DOT ABOVE")
       (=ucs		  . #x1E58)	; Ṙ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E59)	; ṙ
     ))
 (define-char
@@ -1178,11 +1754,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0052 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER R WITH DOT BELOW")
       (=ucs		  . #x1E5B)	; ṛ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E5A)	; Ṛ
     ))
 (define-char
@@ -1190,11 +1772,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0072 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER R WITH DOT BELOW")
       (=ucs		  . #x1E5A)	; Ṛ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E5B)	; ṛ
     ))
 (define-char
@@ -1202,11 +1790,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1E5A #x0304)
     (->lowercase
      ((name . "LATIN SMALL LETTER R WITH DOT BELOW AND MACRON")
       (=ucs		  . #x1E5D)	; ṝ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER R WITH DOT BELOW")
+      (=ucs		  . #x1E5A)	; Ṛ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1E5C)	; Ṝ
     ))
 (define-char
@@ -1214,11 +1808,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1E5B #x0304)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON")
       (=ucs		  . #x1E5C)	; Ṝ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER R WITH DOT BELOW")
+      (=ucs		  . #x1E5B)	; ṛ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1E5D)	; ṝ
     ))
 (define-char
@@ -1226,11 +1826,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0052 #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER R WITH LINE BELOW")
       (=ucs		  . #x1E5F)	; ṟ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E5E)	; Ṟ
     ))
 (define-char
@@ -1238,11 +1844,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0072 #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER R WITH LINE BELOW")
       (=ucs		  . #x1E5E)	; Ṟ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E5F)	; ṟ
     ))
 (define-char
@@ -1250,11 +1862,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0053 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER S WITH DOT ABOVE")
       (=ucs		  . #x1E61)	; ṡ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER S")
+      (=ucs		  . #x0053)	; S
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E60)	; á¹ 
     ))
 (define-char
@@ -1262,11 +1880,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0073 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT ABOVE")
       (=ucs		  . #x1E60)	; á¹ 
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER S")
+      (=ucs		  . #x0073)	; s
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E61)	; ṡ
     ))
 (define-char
@@ -1274,16 +1898,21 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0053 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER S WITH DOT BELOW")
       (=ucs		  . #x1E63)	; á¹£
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER S")
+      (=ucs		  . #x0053)	; S
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E62)	; á¹¢
     ))
 (define-char
-  '((->decomposition	#xFF33 #x0323)
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
       (=ucs		  . #x1E62)	; á¹¢
       ))
@@ -1291,6 +1920,13 @@
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
       (=ucs		  . #x1E62)	; á¹¢
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER S")
+      (=ucs		  . #xFF33)	; ï¼³
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=jef-china3	. #x8AC2)	; &JC3-8AC2;
     ))
 (define-char
@@ -1298,11 +1934,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0073 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
       (=ucs		  . #x1E62)	; á¹¢
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER S")
+      (=ucs		  . #x0073)	; s
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E63)	; á¹£
     ))
 (define-char
@@ -1310,11 +1952,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x015A #x0307)
     (->lowercase
      ((name . "LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE")
       (=ucs		  . #x1E65)	; á¹¥
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER S WITH ACUTE")
+      (=ucs		  . #x015A)	; Ś
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E64)	; Ṥ
     ))
 (define-char
@@ -1322,11 +1970,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x015B #x0307)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE")
       (=ucs		  . #x1E64)	; Ṥ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER S WITH ACUTE")
+      (=ucs		  . #x015B)	; ś
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E65)	; á¹¥
     ))
 (define-char
@@ -1334,11 +1988,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0160 #x0307)
     (->lowercase
      ((name . "LATIN SMALL LETTER S WITH CARON AND DOT ABOVE")
       (=ucs		  . #x1E67)	; ṧ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER S WITH CARON")
+      (=ucs		  . #x0160)	; Å 
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E66)	; Ṧ
     ))
 (define-char
@@ -1346,11 +2006,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0161 #x0307)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE")
       (=ucs		  . #x1E66)	; Ṧ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER S WITH CARON")
+      (=ucs		  . #x0161)	; Å¡
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E67)	; ṧ
     ))
 (define-char
@@ -1358,11 +2024,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1E62 #x0307)
     (->lowercase
      ((name . "LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE")
       (=ucs		  . #x1E69)	; ṩ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER S WITH DOT BELOW")
+      (=ucs		  . #x1E62)	; á¹¢
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E68)	; Ṩ
     ))
 (define-char
@@ -1370,11 +2042,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1E63 #x0307)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE")
       (=ucs		  . #x1E68)	; Ṩ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER S WITH DOT BELOW")
+      (=ucs		  . #x1E63)	; á¹£
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E69)	; ṩ
     ))
 (define-char
@@ -1382,11 +2060,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0054 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH DOT ABOVE")
       (=ucs		  . #x1E6B)	; ṫ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E6A)	; Ṫ
     ))
 (define-char
@@ -1394,11 +2078,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0074 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER T WITH DOT ABOVE")
       (=ucs		  . #x1E6A)	; Ṫ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E6B)	; ṫ
     ))
 (define-char
@@ -1406,11 +2096,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0054 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH DOT BELOW")
       (=ucs		  . #x1E6D)	; á¹­
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E6C)	; Ṭ
     ))
 (define-char
@@ -1418,11 +2114,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0074 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER T WITH DOT BELOW")
       (=ucs		  . #x1E6C)	; Ṭ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E6D)	; á¹­
     ))
 (define-char
@@ -1430,11 +2132,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0054 #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH LINE BELOW")
       (=ucs		  . #x1E6F)	; ṯ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E6E)	; á¹®
     ))
 (define-char
@@ -1442,11 +2150,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0074 #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER T WITH LINE BELOW")
       (=ucs		  . #x1E6E)	; á¹®
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E6F)	; ṯ
     ))
 (define-char
@@ -1454,11 +2168,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0054 #x032D)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E71)	; á¹±
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E70)	; á¹°
     ))
 (define-char
@@ -1466,11 +2186,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0074 #x032D)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E70)	; á¹°
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E71)	; á¹±
     ))
 (define-char
@@ -1478,11 +2204,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x0324)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH DIAERESIS BELOW")
       (=ucs		  . #x1E73)	; á¹³
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING DIAERESIS BELOW")
+      (=ucs		  . #x0324)	; ̤
+      ))
     (=ucs		. #x1E72)	; á¹²
     ))
 (define-char
@@ -1490,11 +2222,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x0324)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH DIAERESIS BELOW")
       (=ucs		  . #x1E72)	; á¹²
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING DIAERESIS BELOW")
+      (=ucs		  . #x0324)	; ̤
+      ))
     (=ucs		. #x1E73)	; á¹³
     ))
 (define-char
@@ -1502,11 +2240,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x0330)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH TILDE BELOW")
       (=ucs		  . #x1E75)	; á¹µ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING TILDE BELOW")
+      (=ucs		  . #x0330)	; Ì°
+      ))
     (=ucs		. #x1E74)	; á¹´
     ))
 (define-char
@@ -1514,11 +2258,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x0330)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH TILDE BELOW")
       (=ucs		  . #x1E74)	; á¹´
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING TILDE BELOW")
+      (=ucs		  . #x0330)	; Ì°
+      ))
     (=ucs		. #x1E75)	; á¹µ
     ))
 (define-char
@@ -1526,11 +2276,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x032D)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E77)	; á¹·
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E76)	; Ṷ
     ))
 (define-char
@@ -1538,11 +2294,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x032D)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW")
       (=ucs		  . #x1E76)	; Ṷ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT BELOW")
+      (=ucs		  . #x032D)	; Ì­
+      ))
     (=ucs		. #x1E77)	; á¹·
     ))
 (define-char
@@ -1550,11 +2312,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0168 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH TILDE AND ACUTE")
       (=ucs		  . #x1E79)	; á¹¹
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH TILDE")
+      (=ucs		  . #x0168)	; Ũ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E78)	; Ṹ
     ))
 (define-char
@@ -1562,11 +2330,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0169 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH TILDE AND ACUTE")
       (=ucs		  . #x1E78)	; Ṹ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH TILDE")
+      (=ucs		  . #x0169)	; Å©
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E79)	; á¹¹
     ))
 (define-char
@@ -1574,11 +2348,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x016A #x0308)
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH MACRON AND DIAERESIS")
       (=ucs		  . #x1E7B)	; á¹»
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH MACRON")
+      (=ucs		  . #x016A)	; Ū
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E7A)	; Ṻ
     ))
 (define-char
@@ -1586,11 +2366,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x016B #x0308)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS")
       (=ucs		  . #x1E7A)	; Ṻ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH MACRON")
+      (=ucs		  . #x016B)	; Å«
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E7B)	; á¹»
     ))
 (define-char
@@ -1598,11 +2384,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0056 #x0303)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER V WITH TILDE")
       (=ucs		  . #x1E7D)	; á¹½
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER V")
+      (=ucs		  . #x0056)	; V
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1E7C)	; á¹¼
     ))
 (define-char
@@ -1610,11 +2402,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0076 #x0303)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER V WITH TILDE")
       (=ucs		  . #x1E7C)	; á¹¼
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER V")
+      (=ucs		  . #x0076)	; v
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1E7D)	; á¹½
     ))
 (define-char
@@ -1622,11 +2420,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0056 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER V WITH DOT BELOW")
       (=ucs		  . #x1E7F)	; ṿ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER V")
+      (=ucs		  . #x0056)	; V
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E7E)	; á¹¾
     ))
 (define-char
@@ -1634,11 +2438,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0076 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER V WITH DOT BELOW")
       (=ucs		  . #x1E7E)	; á¹¾
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER V")
+      (=ucs		  . #x0076)	; v
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E7F)	; ṿ
     ))
 (define-char
@@ -1646,11 +2456,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0057 #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER W WITH GRAVE")
       (=ucs		  . #x1E81)	; ẁ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER W")
+      (=ucs		  . #x0057)	; W
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1E80)	; Ẁ
     ))
 (define-char
@@ -1658,11 +2474,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0077 #x0300)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER W WITH GRAVE")
       (=ucs		  . #x1E80)	; Ẁ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1E81)	; ẁ
     ))
 (define-char
@@ -1670,26 +2492,38 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0057 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
       (=ucs		  . #x1E83)	; ẃ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER W")
+      (=ucs		  . #x0057)	; W
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E82)	; Ẃ
     ))
 (define-char
-  '((->decomposition	#xFF37 #x0301)
-    (->lowercase
-     ((=jef-china3	  . #x85FE)	; &JC3-85FE;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
       (=ucs		  . #x1E82)	; Ẃ
       ))
+    (->lowercase
+     ((=jef-china3	  . #x85FE)	; &JC3-85FE;
+      ))
     (<-fullwidth
      ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
       (=ucs		  . #x1E82)	; Ẃ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER W")
+      (=ucs		  . #xFF37)	; ï¼·
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85E8)	; &JC3-85E8;
     ))
 (define-char
@@ -1697,26 +2531,38 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0077 #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER W WITH ACUTE")
       (=ucs		  . #x1E82)	; Ẃ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1E83)	; ẃ
     ))
 (define-char
-  '((->decomposition	#xFF57 #x0301)
-    (->uppercase
-     ((=jef-china3	  . #x85E8)	; &JC3-85E8;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
       (=ucs		  . #x1E83)	; ẃ
       ))
+    (->uppercase
+     ((=jef-china3	  . #x85E8)	; &JC3-85E8;
+      ))
     (<-fullwidth
      ((name		  . "LATIN SMALL LETTER W WITH ACUTE")
       (=ucs		  . #x1E83)	; ẃ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER W")
+      (=ucs		  . #xFF57)	; ｗ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x85FE)	; &JC3-85FE;
     ))
 (define-char
@@ -1724,11 +2570,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0057 #x0308)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER W WITH DIAERESIS")
       (=ucs		  . #x1E85)	; ẅ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER W")
+      (=ucs		  . #x0057)	; W
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E84)	; Ẅ
     ))
 (define-char
@@ -1736,11 +2588,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0077 #x0308)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER W WITH DIAERESIS")
       (=ucs		  . #x1E84)	; Ẅ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E85)	; ẅ
     ))
 (define-char
@@ -1748,11 +2606,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0057 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER W WITH DOT ABOVE")
       (=ucs		  . #x1E87)	; ẇ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER W")
+      (=ucs		  . #x0057)	; W
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E86)	; Ẇ
     ))
 (define-char
@@ -1760,11 +2624,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0077 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER W WITH DOT ABOVE")
       (=ucs		  . #x1E86)	; Ẇ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E87)	; ẇ
     ))
 (define-char
@@ -1772,11 +2642,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0057 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER W WITH DOT BELOW")
       (=ucs		  . #x1E89)	; ẉ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER W")
+      (=ucs		  . #x0057)	; W
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E88)	; Ẉ
     ))
 (define-char
@@ -1784,11 +2660,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0077 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER W WITH DOT BELOW")
       (=ucs		  . #x1E88)	; Ẉ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E89)	; ẉ
     ))
 (define-char
@@ -1796,11 +2678,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0058 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER X WITH DOT ABOVE")
       (=ucs		  . #x1E8B)	; ẋ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER X")
+      (=ucs		  . #x0058)	; X
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E8A)	; Ẋ
     ))
 (define-char
@@ -1808,11 +2696,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0078 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER X WITH DOT ABOVE")
       (=ucs		  . #x1E8A)	; Ẋ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER X")
+      (=ucs		  . #x0078)	; x
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E8B)	; ẋ
     ))
 (define-char
@@ -1820,11 +2714,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0058 #x0308)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER X WITH DIAERESIS")
       (=ucs		  . #x1E8D)	; ẍ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER X")
+      (=ucs		  . #x0058)	; X
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E8C)	; Ẍ
     ))
 (define-char
@@ -1832,11 +2732,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0078 #x0308)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER X WITH DIAERESIS")
       (=ucs		  . #x1E8C)	; Ẍ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER X")
+      (=ucs		  . #x0078)	; x
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E8D)	; ẍ
     ))
 (define-char
@@ -1844,11 +2750,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0059 #x0307)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH DOT ABOVE")
       (=ucs		  . #x1E8F)	; ẏ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E8E)	; Ẏ
     ))
 (define-char
@@ -1856,11 +2768,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH DOT ABOVE")
       (=ucs		  . #x1E8E)	; Ẏ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E8F)	; ẏ
     ))
 (define-char
@@ -1868,11 +2786,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x005A #x0302)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Z WITH CIRCUMFLEX")
       (=ucs		  . #x1E91)	; ẑ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1E90)	; Ẑ
     ))
 (define-char
@@ -1880,11 +2804,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x007A #x0302)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Z WITH CIRCUMFLEX")
       (=ucs		  . #x1E90)	; Ẑ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Z")
+      (=ucs		  . #x007A)	; z
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1E91)	; ẑ
     ))
 (define-char
@@ -1892,11 +2822,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x005A #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Z WITH DOT BELOW")
       (=ucs		  . #x1E93)	; ẓ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E92)	; Ẓ
     ))
 (define-char
@@ -1904,11 +2840,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x007A #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Z WITH DOT BELOW")
       (=ucs		  . #x1E92)	; Ẓ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Z")
+      (=ucs		  . #x007A)	; z
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1E93)	; ẓ
     ))
 (define-char
@@ -1916,11 +2858,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x005A #x0331)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Z WITH LINE BELOW")
       (=ucs		  . #x1E95)	; ẕ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E94)	; Ẕ
     ))
 (define-char
@@ -1928,11 +2876,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x007A #x0331)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Z WITH LINE BELOW")
       (=ucs		  . #x1E94)	; Ẕ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Z")
+      (=ucs		  . #x007A)	; z
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E95)	; ẕ
     ))
 (define-char
@@ -1940,7 +2894,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0068 #x0331)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      )
+     ((name		  . "COMBINING MACRON BELOW")
+      (=ucs		  . #x0331)	; ̱
+      ))
     (=ucs		. #x1E96)	; ẖ
     ))
 (define-char
@@ -1948,7 +2908,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0074 #x0308)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER T")
+      (=ucs		  . #x0074)	; t
+      )
+     ((name		  . "COMBINING DIAERESIS")
+      (=ucs		  . #x0308)	; ̈
+      ))
     (=ucs		. #x1E97)	; ẗ
     ))
 (define-char
@@ -1956,7 +2922,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0077 #x030A)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      )
+     ((name		  . "COMBINING RING ABOVE")
+      (=ucs		  . #x030A)	; ̊
+      ))
     (=ucs		. #x1E98)	; ẘ
     ))
 (define-char
@@ -1964,7 +2936,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x030A)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING RING ABOVE")
+      (=ucs		  . #x030A)	; ̊
+      ))
     (=ucs		. #x1E99)	; ẙ
     ))
 (define-char
@@ -1972,7 +2950,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0061 #x02BE)
+    (=decomposition
+     compat
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "MODIFIER LETTER RIGHT HALF RING")
+      (=ucs		  . #x02BE)	; ʾ
+      ))
     (=ucs		. #x1E9A)	; ẚ
     ))
 (define-char
@@ -1980,11 +2965,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x017F #x0307)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER S WITH DOT ABOVE")
       (=ucs		  . #x1E60)	; á¹ 
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER LONG S")
+      (=ucs		  . #x017F)	; Å¿
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
+      ))
     (=ucs		. #x1E9B)	; ẛ
     ))
 (define-char
@@ -1992,11 +2983,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH DOT BELOW")
       (=ucs		  . #x1EA1)	; ạ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EA0)	; Ạ
     (latin-viscii	. #x80)	; &I-MULE-VIET-U-55;
     (latin-viscii-upper . #xD5)	; &I-MULE-VIET-U-55;
@@ -2006,11 +3003,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH DOT BELOW")
       (=ucs		  . #x1EA0)	; Ạ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EA1)	; ạ
     (latin-tcvn5712	. #xB9)	; &I-VSCII2-39;
     (latin-viscii	. #xD5)	; &I-MULE-VIET-L-55;
@@ -2021,11 +3024,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0041 #x0309)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH HOOK ABOVE")
       (=ucs		  . #x1EA3)	; ả
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A")
+      (=ucs		  . #x0041)	; A
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EA2)	; Ả
     (latin-viscii	. #xC4)	; &I-MULE-VIET-U-64;
     (latin-viscii-upper . #xE4)	; &I-MULE-VIET-U-64;
@@ -2035,11 +3044,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0061 #x0309)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER A WITH HOOK ABOVE")
       (=ucs		  . #x1EA2)	; Ả
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EA3)	; ả
     (latin-tcvn5712	. #xB6)	; &I-VSCII2-36;
     (latin-viscii	. #xE4)	; &I-MULE-VIET-L-64;
@@ -2050,28 +3065,41 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C2 #x0301)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA5)	; ấ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00C2)	; Â
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EA4)	; Ấ
     (latin-tcvn5712	. #xC4)	; &I-VSCII2-44;
     (latin-viscii	. #x84)	; &I-MULE-VIET-U-24;
     (latin-viscii-upper . #xA4)	; &I-MULE-VIET-U-24;
     ))
 (define-char
-  '((->lowercase
-     ((=jef-china3	  . #x86AA)	; &JC3-86AA;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA4)	; Ấ
       ))
+    (->lowercase
+     ((=jef-china3	  . #x86AA)	; &JC3-86AA;
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA4)	; Ấ
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
+      (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x86A7)	; &JC3-86A7;
     ))
 (define-char
@@ -2079,28 +3107,41 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E2 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA4)	; Ấ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00E2)	; â
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EA5)	; ấ
     (latin-tcvn5712	. #xCA)	; &I-VSCII2-4A;
     (latin-viscii	. #xA4)	; &I-MULE-VIET-L-24;
     (latin-viscii-lower . #xA4)	; &I-MULE-VIET-L-24;
     ))
 (define-char
-  '((->uppercase
-     ((=jef-china3	  . #x86A7)	; &JC3-86A7;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA5)	; ấ
       ))
+    (->uppercase
+     ((=jef-china3	  . #x86A7)	; &JC3-86A7;
+      ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EA5)	; ấ
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
+      (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x86AA)	; &JC3-86AA;
     ))
 (define-char
@@ -2108,28 +3149,41 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C2 #x0300)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA7)	; ầ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00C2)	; Â
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EA6)	; Ầ
     (latin-tcvn5712	. #xC1)	; &I-VSCII2-41;
     (latin-viscii	. #x85)	; &I-MULE-VIET-U-25;
     (latin-viscii-upper . #xA5)	; &I-MULE-VIET-U-25;
     ))
 (define-char
-  '((->lowercase
-     ((=jef-china3	  . #x85B4)	; &JC3-85B4;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA6)	; Ầ
       ))
+    (->lowercase
+     ((=jef-china3	  . #x85B4)	; &JC3-85B4;
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA6)	; Ầ
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2A24)	; &JX1-2939; [10-04]
+      (=jis-x0213-1-2000  . #x2939)	; &I-JX1-2939; [09-25]
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85B1)	; &JC3-85B1;
     ))
 (define-char
@@ -2137,28 +3191,41 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E2 #x0300)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA6)	; Ầ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00E2)	; â
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EA7)	; ầ
     (latin-tcvn5712	. #xC7)	; &I-VSCII2-47;
     (latin-viscii	. #xA5)	; &I-MULE-VIET-L-25;
     (latin-viscii-lower . #xA5)	; &I-MULE-VIET-L-25;
     ))
 (define-char
-  '((->uppercase
-     ((=jef-china3	  . #x85B1)	; &JC3-85B1;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA7)	; ầ
       ))
+    (->uppercase
+     ((=jef-china3	  . #x85B1)	; &JC3-85B1;
+      ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EA7)	; ầ
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2B24)	; &JX1-2958; [11-04]
+      (=jis-x0213-1-2000  . #x2958)	; &I-JX1-2958; [09-56]
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85B4)	; &JC3-85B4;
     ))
 (define-char
@@ -2166,11 +3233,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C2 #x0309)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EA9)	; ẩ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00C2)	; Â
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EA8)	; Ẩ
     (latin-tcvn5712	. #xC2)	; &I-VSCII2-42;
     (latin-viscii	. #x86)	; &I-MULE-VIET-U-26;
@@ -2181,11 +3254,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E2 #x0309)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EA8)	; Ẩ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00E2)	; â
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EA9)	; ẩ
     (latin-tcvn5712	. #xC8)	; &I-VSCII2-48;
     (latin-viscii	. #xA6)	; &I-MULE-VIET-L-26;
@@ -2196,11 +3275,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C2 #x0303)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EAB)	; ẫ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00C2)	; Â
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EAA)	; Ẫ
     (latin-tcvn5712	. #xC3)	; &I-VSCII2-43;
     (latin-viscii	. #x06)	; &I-MULE-VIET-U-67;
@@ -2211,11 +3296,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00E2 #x0303)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EAA)	; Ẫ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH CIRCUMFLEX")
+      (=ucs		  . #x00E2)	; â
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EAB)	; ẫ
     (latin-tcvn5712	. #xC9)	; &I-VSCII2-49;
     (latin-viscii	. #xE7)	; &I-MULE-VIET-L-67;
@@ -2226,11 +3317,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1EA0 #x0302)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EAD)	; ậ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH DOT BELOW")
+      (=ucs		  . #x1EA0)	; Ạ
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1EAC)	; Ậ
     (latin-viscii	. #x87)	; &I-MULE-VIET-U-27;
     (latin-viscii-upper . #xA7)	; &I-MULE-VIET-U-27;
@@ -2240,11 +3337,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1EA1 #x0302)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EAC)	; Ậ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH DOT BELOW")
+      (=ucs		  . #x1EA1)	; ạ
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1EAD)	; ậ
     (latin-tcvn5712	. #xCB)	; &I-VSCII2-4B;
     (latin-viscii	. #xA7)	; &I-MULE-VIET-L-27;
@@ -2255,11 +3358,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0102 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH BREVE AND ACUTE")
       (=ucs		  . #x1EAF)	; ắ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
+      (=ucs		  . #x0102)	; Ă
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EAE)	; Ắ
     (latin-tcvn5712	. #xC0)	; &I-VSCII2-40;
     (latin-viscii	. #x81)	; &I-MULE-VIET-U-21;
@@ -2270,11 +3379,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0103 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND ACUTE")
       (=ucs		  . #x1EAE)	; Ắ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH BREVE")
+      (=ucs		  . #x0103)	; ă
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EAF)	; ắ
     (latin-tcvn5712	. #xBE)	; &I-VSCII2-3E;
     (latin-viscii	. #xA1)	; &I-MULE-VIET-L-21;
@@ -2285,11 +3400,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0102 #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH BREVE AND GRAVE")
       (=ucs		  . #x1EB1)	; ằ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
+      (=ucs		  . #x0102)	; Ă
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EB0)	; Ằ
     (latin-tcvn5712	. #xAF)	; &I-VSCII2-2F;
     (latin-viscii	. #x82)	; &I-MULE-VIET-U-22;
@@ -2300,11 +3421,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0103 #x0300)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND GRAVE")
       (=ucs		  . #x1EB0)	; Ằ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH BREVE")
+      (=ucs		  . #x0103)	; ă
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EB1)	; ằ
     (latin-tcvn5712	. #xBB)	; &I-VSCII2-3B;
     (latin-viscii	. #xA2)	; &I-MULE-VIET-L-22;
@@ -2315,11 +3442,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0102 #x0309)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE")
       (=ucs		  . #x1EB3)	; ẳ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
+      (=ucs		  . #x0102)	; Ă
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EB2)	; Ẳ
     (latin-tcvn5712	. #xBA)	; &I-VSCII2-3A;
     (latin-viscii	. #x02)	; &I-MULE-VIET-U-46;
@@ -2330,11 +3463,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0103 #x0309)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE")
       (=ucs		  . #x1EB2)	; Ẳ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH BREVE")
+      (=ucs		  . #x0103)	; ă
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EB3)	; ẳ
     (latin-tcvn5712	. #xBC)	; &I-VSCII2-3C;
     (latin-viscii	. #xC6)	; &I-MULE-VIET-L-46;
@@ -2345,11 +3484,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0102 #x0303)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER A WITH BREVE AND TILDE")
       (=ucs		  . #x1EB5)	; ẵ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH BREVE")
+      (=ucs		  . #x0102)	; Ă
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EB4)	; Ẵ
     (latin-tcvn5712	. #xBF)	; &I-VSCII2-3F;
     (latin-viscii	. #x05)	; &I-MULE-VIET-U-47;
@@ -2360,11 +3505,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0103 #x0303)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND TILDE")
       (=ucs		  . #x1EB4)	; Ẵ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH BREVE")
+      (=ucs		  . #x0103)	; ă
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EB5)	; ẵ
     (latin-tcvn5712	. #xBD)	; &I-VSCII2-3D;
     (latin-viscii	. #xC7)	; &I-MULE-VIET-L-47;
@@ -2375,11 +3526,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1EA0 #x0306)
     (->lowercase
      ((name . "LATIN SMALL LETTER A WITH BREVE AND DOT BELOW")
       (=ucs		  . #x1EB7)	; ặ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER A WITH DOT BELOW")
+      (=ucs		  . #x1EA0)	; Ạ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1EB6)	; Ặ
     (latin-viscii	. #x83)	; &I-MULE-VIET-U-23;
     (latin-viscii-upper . #xA3)	; &I-MULE-VIET-U-23;
@@ -2389,11 +3546,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1EA1 #x0306)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW")
       (=ucs		  . #x1EB6)	; Ặ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER A WITH DOT BELOW")
+      (=ucs		  . #x1EA1)	; ạ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1EB7)	; ặ
     (latin-tcvn5712	. #xC6)	; &I-VSCII2-46;
     (latin-viscii	. #xA3)	; &I-MULE-VIET-L-23;
@@ -2404,11 +3567,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH DOT BELOW")
       (=ucs		  . #x1EB9)	; ẹ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EB8)	; Ẹ
     (latin-viscii	. #x89)	; &I-MULE-VIET-U-29;
     (latin-viscii-upper . #xA9)	; &I-MULE-VIET-U-29;
@@ -2418,11 +3587,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH DOT BELOW")
       (=ucs		  . #x1EB8)	; Ẹ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EB9)	; ẹ
     (latin-tcvn5712	. #xD1)	; &I-VSCII2-51;
     (latin-viscii	. #xA9)	; &I-MULE-VIET-L-29;
@@ -2433,11 +3608,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x0309)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH HOOK ABOVE")
       (=ucs		  . #x1EBB)	; ẻ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EBA)	; Ẻ
     (latin-viscii	. #xCB)	; &I-MULE-VIET-U-6B;
     (latin-viscii-upper . #xEB)	; &I-MULE-VIET-U-6B;
@@ -2447,11 +3628,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x0309)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH HOOK ABOVE")
       (=ucs		  . #x1EBA)	; Ẻ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EBB)	; ẻ
     (latin-tcvn5712	. #xCE)	; &I-VSCII2-4E;
     (latin-viscii	. #xEB)	; &I-MULE-VIET-L-6B;
@@ -2462,11 +3649,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0045 #x0303)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER E WITH TILDE")
       (=ucs		  . #x1EBD)	; ẽ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EBC)	; Ẽ
     (latin-viscii	. #x88)	; &I-MULE-VIET-U-28;
     (latin-viscii-upper . #xA8)	; &I-MULE-VIET-U-28;
@@ -2476,11 +3669,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0065 #x0303)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER E WITH TILDE")
       (=ucs		  . #x1EBC)	; Ẽ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EBD)	; ẽ
     (latin-tcvn5712	. #xCF)	; &I-VSCII2-4F;
     (latin-viscii	. #xA8)	; &I-MULE-VIET-L-28;
@@ -2491,28 +3690,41 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00CA #x0301)
     (->lowercase
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBF)	; ế
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00CA)	; Ê
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EBE)	; Ế
     (latin-tcvn5712	. #xDA)	; &I-VSCII2-5A;
     (latin-viscii	. #x8A)	; &I-MULE-VIET-U-2A;
     (latin-viscii-upper . #xAA)	; &I-MULE-VIET-U-2A;
     ))
 (define-char
-  '((->lowercase
-     ((=jef-china3	  . #x86AB)	; &JC3-86AB;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBE)	; Ế
       ))
+    (->lowercase
+     ((=jef-china3	  . #x86AB)	; &JC3-86AB;
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBE)	; Ế
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
+      (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x86A8)	; &JC3-86A8;
     ))
 (define-char
@@ -2520,28 +3732,42 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00EA #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBE)	; Ế
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00EA)	; ê
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EBF)	; ế
     (latin-tcvn5712	. #xD5)	; &I-VSCII2-55;
     (latin-viscii	. #xAA)	; &I-MULE-VIET-L-2A;
     (latin-viscii-lower . #xAA)	; &I-MULE-VIET-L-2A;
     ))
 (define-char
-  '((->uppercase
-     ((=jef-china3	  . #x86A8)	; &JC3-86A8;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBF)	; ế
       ))
+    (->uppercase
+     ((=jef-china3	  . #x86A8)	; &JC3-86A8;
+      ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1EBF)	; ế
       ))
+    (=decomposition
+     ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
+      (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
+      (=jis-x0213-1-2000  . #x2960)	; &I-JX1-2960; [09-64]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x86AB)	; &JC3-86AB;
     ))
 (define-char
@@ -2549,28 +3775,41 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00CA #x0300)
     (->lowercase
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC1)	; ề
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00CA)	; Ê
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EC0)	; Ề
     (latin-tcvn5712	. #xC5)	; &I-VSCII2-45;
     (latin-viscii	. #x8B)	; &I-MULE-VIET-U-2B;
     (latin-viscii-upper . #xAB)	; &I-MULE-VIET-U-2B;
     ))
 (define-char
-  '((->lowercase
-     ((=jef-china3	  . #x85B5)	; &JC3-85B5;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC0)	; Ề
       ))
+    (->lowercase
+     ((=jef-china3	  . #x85B5)	; &JC3-85B5;
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC0)	; Ề
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2A34)	; &JX1-2941; [10-20]
+      (=jis-x0213-1-2000  . #x2941)	; &I-JX1-2941; [09-33]
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85B2)	; &JC3-85B2;
     ))
 (define-char
@@ -2578,28 +3817,42 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00EA #x0300)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC0)	; Ề
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00EA)	; ê
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EC1)	; ề
     (latin-tcvn5712	. #xD2)	; &I-VSCII2-52;
     (latin-viscii	. #xAB)	; &I-MULE-VIET-L-2B;
     (latin-viscii-lower . #xAB)	; &I-MULE-VIET-L-2B;
     ))
 (define-char
-  '((->uppercase
-     ((=jef-china3	  . #x85B2)	; &JC3-85B2;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC1)	; ề
       ))
+    (->uppercase
+     ((=jef-china3	  . #x85B2)	; &JC3-85B2;
+      ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1EC1)	; ề
       ))
+    (=decomposition
+     ((=gb2312		  . #x283A)	; &JX1-2960; [08-26]
+      (=jis-x0212	  . #x2B34)	; &I-JSP-2B34; [11-20]
+      (=jis-x0213-1-2000  . #x2960)	; &I-JX1-2960; [09-64]
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85B5)	; &JC3-85B5;
     ))
 (define-char
@@ -2607,11 +3860,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00CA #x0309)
     (->lowercase
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EC3)	; ể
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00CA)	; Ê
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EC2)	; Ể
     (latin-tcvn5712	. #xCD)	; &I-VSCII2-4D;
     (latin-viscii	. #x8C)	; &I-MULE-VIET-U-2C;
@@ -2622,11 +3881,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00EA #x0309)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1EC2)	; Ể
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00EA)	; ê
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EC3)	; ể
     (latin-tcvn5712	. #xD3)	; &I-VSCII2-53;
     (latin-viscii	. #xAC)	; &I-MULE-VIET-L-2C;
@@ -2637,11 +3902,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00CA #x0303)
     (->lowercase
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EC5)	; ễ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00CA)	; Ê
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EC4)	; Ễ
     (latin-tcvn5712	. #xD9)	; &I-VSCII2-59;
     (latin-viscii	. #x8D)	; &I-MULE-VIET-U-2D;
@@ -2652,11 +3923,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00EA #x0303)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1EC4)	; Ễ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH CIRCUMFLEX")
+      (=ucs		  . #x00EA)	; ê
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EC5)	; ễ
     (latin-tcvn5712	. #xD4)	; &I-VSCII2-54;
     (latin-viscii	. #xAD)	; &I-MULE-VIET-L-2D;
@@ -2667,11 +3944,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1EB8 #x0302)
     (->lowercase
      ((name . "LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EC7)	; ệ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER E WITH DOT BELOW")
+      (=ucs		  . #x1EB8)	; Ẹ
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1EC6)	; Ệ
     (latin-viscii	. #x8E)	; &I-MULE-VIET-U-2E;
     (latin-viscii-upper . #xAE)	; &I-MULE-VIET-U-2E;
@@ -2681,11 +3964,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1EB9 #x0302)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1EC6)	; Ệ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER E WITH DOT BELOW")
+      (=ucs		  . #x1EB9)	; ẹ
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1EC7)	; ệ
     (latin-tcvn5712	. #xD6)	; &I-VSCII2-56;
     (latin-viscii	. #xAE)	; &I-MULE-VIET-L-2E;
@@ -2696,11 +3985,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0049 #x0309)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH HOOK ABOVE")
       (=ucs		  . #x1EC9)	; ỉ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EC8)	; Ỉ
     (latin-viscii	. #x9B)	; &I-MULE-VIET-U-6F;
     (latin-viscii-upper . #xEF)	; &I-MULE-VIET-U-6F;
@@ -2710,11 +4005,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0069 #x0309)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH HOOK ABOVE")
       (=ucs		  . #x1EC8)	; Ỉ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EC9)	; ỉ
     (latin-tcvn5712	. #xD8)	; &I-VSCII2-58;
     (latin-viscii	. #xEF)	; &I-MULE-VIET-L-6F;
@@ -2725,11 +4026,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0049 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER I WITH DOT BELOW")
       (=ucs		  . #x1ECB)	; ị
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1ECA)	; Ị
     (latin-viscii	. #x98)	; &I-MULE-VIET-U-38;
     (latin-viscii-upper . #xB8)	; &I-MULE-VIET-U-38;
@@ -2739,11 +4046,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0069 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER I WITH DOT BELOW")
       (=ucs		  . #x1ECA)	; Ị
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1ECB)	; ị
     (latin-tcvn5712	. #xDE)	; &I-VSCII2-5E;
     (latin-viscii	. #xB8)	; &I-MULE-VIET-L-38;
@@ -2754,11 +4067,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH DOT BELOW")
       (=ucs		  . #x1ECD)	; ọ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1ECC)	; Ọ
     (latin-viscii	. #x9A)	; &I-MULE-VIET-U-77;
     (latin-viscii-upper . #xF7)	; &I-MULE-VIET-U-77;
@@ -2768,11 +4087,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH DOT BELOW")
       (=ucs		  . #x1ECC)	; Ọ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1ECD)	; ọ
     (latin-tcvn5712	. #xE4)	; &I-VSCII2-64;
     (latin-viscii	. #xF7)	; &I-MULE-VIET-L-77;
@@ -2783,11 +4108,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004F #x0309)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH HOOK ABOVE")
       (=ucs		  . #x1ECF)	; ỏ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O")
+      (=ucs		  . #x004F)	; O
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1ECE)	; Ỏ
     (latin-viscii	. #x99)	; &I-MULE-VIET-U-76;
     (latin-viscii-upper . #xF6)	; &I-MULE-VIET-U-76;
@@ -2797,11 +4128,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x006F #x0309)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH HOOK ABOVE")
       (=ucs		  . #x1ECE)	; Ỏ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1ECF)	; ỏ
     (latin-tcvn5712	. #xE1)	; &I-VSCII2-61;
     (latin-viscii	. #xF6)	; &I-MULE-VIET-L-76;
@@ -2812,28 +4149,41 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D4 #x0301)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED1)	; ố
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00D4)	; Ô
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1ED0)	; Ố
     (latin-tcvn5712	. #xFF)	; &I-VSCII2-7F;
     (latin-viscii	. #x8F)	; &I-MULE-VIET-U-2F;
     (latin-viscii-upper . #xAF)	; &I-MULE-VIET-U-2F;
     ))
 (define-char
-  '((->lowercase
-     ((=jef-china3	  . #x86AC)	; &JC3-86AC;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED0)	; Ố
       ))
+    (->lowercase
+     ((=jef-china3	  . #x86AC)	; &JC3-86AC;
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED0)	; Ố
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
+      (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x86A9)	; &JC3-86A9;
     ))
 (define-char
@@ -2841,28 +4191,41 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F4 #x0301)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED0)	; Ố
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00F4)	; ô
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1ED1)	; ố
     (latin-tcvn5712	. #xE8)	; &I-VSCII2-68;
     (latin-viscii	. #xAF)	; &I-MULE-VIET-L-2F;
     (latin-viscii-lower . #xAF)	; &I-MULE-VIET-L-2F;
     ))
 (define-char
-  '((->uppercase
-     ((=jef-china3	  . #x86A9)	; &JC3-86A9;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED1)	; ố
       ))
+    (->uppercase
+     ((=jef-china3	  . #x86A9)	; &JC3-86A9;
+      ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE")
       (=ucs		  . #x1ED1)	; ố
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
+      (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jef-china3	. #x86AC)	; &JC3-86AC;
     ))
 (define-char
@@ -2870,28 +4233,41 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D4 #x0300)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED3)	; ồ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00D4)	; Ô
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1ED2)	; Ồ
     (latin-tcvn5712	. #xDB)	; &I-VSCII2-5B;
     (latin-viscii	. #x90)	; &I-MULE-VIET-U-30;
     (latin-viscii-upper . #xB0)	; &I-MULE-VIET-U-30;
     ))
 (define-char
-  '((->lowercase
-     ((=jef-china3	  . #x85B6)	; &JC3-85B6;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED2)	; Ồ
       ))
+    (->lowercase
+     ((=jef-china3	  . #x85B6)	; &JC3-85B6;
+      ))
     (<-fullwidth
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED2)	; Ồ
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2A54)	; &JX1-294B; [10-52]
+      (=jis-x0213-1-2000  . #x294B)	; &I-JX1-294B; [09-43]
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85B3)	; &JC3-85B3;
     ))
 (define-char
@@ -2899,28 +4275,41 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F4 #x0300)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED2)	; Ồ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00F4)	; ô
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1ED3)	; ồ
     (latin-tcvn5712	. #xE5)	; &I-VSCII2-65;
     (latin-viscii	. #xB0)	; &I-MULE-VIET-L-30;
     (latin-viscii-lower . #xB0)	; &I-MULE-VIET-L-30;
     ))
 (define-char
-  '((->uppercase
-     ((=jef-china3	  . #x85B3)	; &JC3-85B3;
-      ))
-    (<-denotational
+  '((<-denotational
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED3)	; ồ
       ))
+    (->uppercase
+     ((=jef-china3	  . #x85B3)	; &JC3-85B3;
+      ))
     (<-fullwidth
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE")
       (=ucs		  . #x1ED3)	; ồ
       ))
+    (=decomposition
+     ((=jis-x0212	  . #x2B54)	; &JX1-296A; [11-52]
+      (=jis-x0213-1-2000  . #x296A)	; &I-JX1-296A; [09-74]
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85B6)	; &JC3-85B6;
     ))
 (define-char
@@ -2928,11 +4317,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D4 #x0309)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1ED5)	; ổ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00D4)	; Ô
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1ED4)	; Ổ
     (latin-tcvn5712	. #xE0)	; &I-VSCII2-60;
     (latin-viscii	. #x91)	; &I-MULE-VIET-U-31;
@@ -2943,11 +4338,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F4 #x0309)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE")
       (=ucs		  . #x1ED4)	; Ổ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00F4)	; ô
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1ED5)	; ổ
     (latin-tcvn5712	. #xE6)	; &I-VSCII2-66;
     (latin-viscii	. #xB1)	; &I-MULE-VIET-L-31;
@@ -2958,11 +4359,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00D4 #x0303)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1ED7)	; ỗ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00D4)	; Ô
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1ED6)	; Ỗ
     (latin-tcvn5712	. #xF0)	; &I-VSCII2-70;
     (latin-viscii	. #x92)	; &I-MULE-VIET-U-32;
@@ -2973,11 +4380,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00F4 #x0303)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE")
       (=ucs		  . #x1ED6)	; Ỗ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH CIRCUMFLEX")
+      (=ucs		  . #x00F4)	; ô
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1ED7)	; ỗ
     (latin-tcvn5712	. #xE7)	; &I-VSCII2-67;
     (latin-viscii	. #xB2)	; &I-MULE-VIET-L-32;
@@ -2988,11 +4401,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1ECC #x0302)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1ED9)	; ộ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH DOT BELOW")
+      (=ucs		  . #x1ECC)	; Ọ
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1ED8)	; Ộ
     (latin-viscii	. #x93)	; &I-MULE-VIET-U-35;
     (latin-viscii-upper . #xB5)	; &I-MULE-VIET-U-35;
@@ -3002,11 +4421,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1ECD #x0302)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW")
       (=ucs		  . #x1ED8)	; Ộ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH DOT BELOW")
+      (=ucs		  . #x1ECD)	; ọ
+      )
+     ((name		  . "COMBINING CIRCUMFLEX ACCENT")
+      (=ucs		  . #x0302)	; ̂
+      ))
     (=ucs		. #x1ED9)	; ộ
     (latin-tcvn5712	. #xE9)	; &I-VSCII2-69;
     (latin-viscii	. #xB5)	; &I-MULE-VIET-L-35;
@@ -3017,11 +4442,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A0 #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH HORN AND ACUTE")
       (=ucs		  . #x1EDB)	; ớ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
+      (=ucs		  . #x01A0)	; Æ 
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EDA)	; Ớ
     (latin-viscii	. #x95)	; &I-MULE-VIET-U-3E;
     (latin-viscii-upper . #xBE)	; &I-MULE-VIET-U-3E;
@@ -3031,11 +4462,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A1 #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN AND ACUTE")
       (=ucs		  . #x1EDA)	; Ớ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH HORN")
+      (=ucs		  . #x01A1)	; Æ¡
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EDB)	; ớ
     (latin-tcvn5712	. #xED)	; &I-VSCII2-6D;
     (latin-viscii	. #xBE)	; &I-MULE-VIET-L-3E;
@@ -3046,11 +4483,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A0 #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH HORN AND GRAVE")
       (=ucs		  . #x1EDD)	; ờ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
+      (=ucs		  . #x01A0)	; Æ 
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EDC)	; Ờ
     (latin-viscii	. #x96)	; &I-MULE-VIET-U-36;
     (latin-viscii-upper . #xB6)	; &I-MULE-VIET-U-36;
@@ -3060,11 +4503,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A1 #x0300)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN AND GRAVE")
       (=ucs		  . #x1EDC)	; Ờ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH HORN")
+      (=ucs		  . #x01A1)	; Æ¡
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EDD)	; ờ
     (latin-tcvn5712	. #xEA)	; &I-VSCII2-6A;
     (latin-viscii	. #xB6)	; &I-MULE-VIET-L-36;
@@ -3075,11 +4524,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A0 #x0309)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EDF)	; ở
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
+      (=ucs		  . #x01A0)	; Æ 
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EDE)	; Ở
     (latin-viscii	. #x97)	; &I-MULE-VIET-U-37;
     (latin-viscii-upper . #xB7)	; &I-MULE-VIET-U-37;
@@ -3089,11 +4544,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A1 #x0309)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EDE)	; Ở
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH HORN")
+      (=ucs		  . #x01A1)	; Æ¡
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EDF)	; ở
     (latin-tcvn5712	. #xEB)	; &I-VSCII2-6B;
     (latin-viscii	. #xB7)	; &I-MULE-VIET-L-37;
@@ -3104,11 +4565,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A0 #x0303)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER O WITH HORN AND TILDE")
       (=ucs		  . #x1EE1)	; ỡ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
+      (=ucs		  . #x01A0)	; Æ 
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EE0)	; á» 
     (latin-viscii	. #xB3)	; &I-MULE-VIET-U-5E;
     (latin-viscii-upper . #xDE)	; &I-MULE-VIET-U-5E;
@@ -3118,11 +4585,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A1 #x0303)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER O WITH HORN AND TILDE")
       (=ucs		  . #x1EE0)	; á» 
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH HORN")
+      (=ucs		  . #x01A1)	; Æ¡
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EE1)	; ỡ
     (latin-tcvn5712	. #xEC)	; &I-VSCII2-6C;
     (latin-viscii	. #xDE)	; &I-MULE-VIET-L-5E;
@@ -3133,11 +4606,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A0 #x0323)
     (->lowercase
      ((name . "LATIN SMALL LETTER O WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EE3)	; ợ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER O WITH HORN")
+      (=ucs		  . #x01A0)	; Æ 
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EE2)	; Ợ
     (latin-viscii	. #x94)	; &I-MULE-VIET-U-7E;
     (latin-viscii-upper . #xFE)	; &I-MULE-VIET-U-7E;
@@ -3147,11 +4626,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01A1 #x0323)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EE2)	; Ợ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER O WITH HORN")
+      (=ucs		  . #x01A1)	; Æ¡
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EE3)	; ợ
     (latin-tcvn5712	. #xEE)	; &I-VSCII2-6E;
     (latin-viscii	. #xFE)	; &I-MULE-VIET-L-7E;
@@ -3162,11 +4647,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH DOT BELOW")
       (=ucs		  . #x1EE5)	; ụ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EE4)	; Ụ
     (latin-viscii	. #x9E)	; &I-MULE-VIET-U-78;
     (latin-viscii-upper . #xF8)	; &I-MULE-VIET-U-78;
@@ -3176,11 +4667,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH DOT BELOW")
       (=ucs		  . #x1EE4)	; Ụ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EE5)	; ụ
     (latin-tcvn5712	. #xF4)	; &I-VSCII2-74;
     (latin-viscii	. #xF8)	; &I-MULE-VIET-L-78;
@@ -3191,11 +4688,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0055 #x0309)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH HOOK ABOVE")
       (=ucs		  . #x1EE7)	; ủ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U")
+      (=ucs		  . #x0055)	; U
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EE6)	; Ủ
     (latin-viscii	. #x9C)	; &I-MULE-VIET-U-7C;
     (latin-viscii-upper . #xFC)	; &I-MULE-VIET-U-7C;
@@ -3205,11 +4708,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0075 #x0309)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH HOOK ABOVE")
       (=ucs		  . #x1EE6)	; Ủ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EE7)	; ủ
     (latin-tcvn5712	. #xF1)	; &I-VSCII2-71;
     (latin-viscii	. #xFC)	; &I-MULE-VIET-L-7C;
@@ -3220,11 +4729,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01AF #x0301)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH HORN AND ACUTE")
       (=ucs		  . #x1EE9)	; ứ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
+      (=ucs		  . #x01AF)	; Ư
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EE8)	; Ứ
     (latin-viscii	. #xBA)	; &I-MULE-VIET-U-51;
     (latin-viscii-upper . #xD1)	; &I-MULE-VIET-U-51;
@@ -3234,11 +4749,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01B0 #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN AND ACUTE")
       (=ucs		  . #x1EE8)	; Ứ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH HORN")
+      (=ucs		  . #x01B0)	; Æ°
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1EE9)	; ứ
     (latin-tcvn5712	. #xF8)	; &I-VSCII2-78;
     (latin-viscii	. #xD1)	; &I-MULE-VIET-L-51;
@@ -3249,11 +4770,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01AF #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH HORN AND GRAVE")
       (=ucs		  . #x1EEB)	; ừ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
+      (=ucs		  . #x01AF)	; Ư
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EEA)	; Ừ
     (latin-viscii	. #xBB)	; &I-MULE-VIET-U-57;
     (latin-viscii-upper . #xD7)	; &I-MULE-VIET-U-57;
@@ -3263,11 +4790,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01B0 #x0300)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN AND GRAVE")
       (=ucs		  . #x1EEA)	; Ừ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH HORN")
+      (=ucs		  . #x01B0)	; Æ°
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EEB)	; ừ
     (latin-tcvn5712	. #xF5)	; &I-VSCII2-75;
     (latin-viscii	. #xD7)	; &I-MULE-VIET-L-57;
@@ -3278,11 +4811,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01AF #x0309)
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EED)	; á»­
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
+      (=ucs		  . #x01AF)	; Ư
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EEC)	; Ử
     (latin-viscii	. #xBC)	; &I-MULE-VIET-U-58;
     (latin-viscii-upper . #xD8)	; &I-MULE-VIET-U-58;
@@ -3292,11 +4831,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01B0 #x0309)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE")
       (=ucs		  . #x1EEC)	; Ử
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH HORN")
+      (=ucs		  . #x01B0)	; Æ°
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EED)	; á»­
     (latin-tcvn5712	. #xF6)	; &I-VSCII2-76;
     (latin-viscii	. #xD8)	; &I-MULE-VIET-L-58;
@@ -3307,11 +4852,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01AF #x0303)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER U WITH HORN AND TILDE")
       (=ucs		  . #x1EEF)	; ữ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
+      (=ucs		  . #x01AF)	; Ư
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EEE)	; á»®
     (latin-viscii	. #xFF)	; &I-MULE-VIET-U-66;
     (latin-viscii-upper . #xE6)	; &I-MULE-VIET-U-66;
@@ -3321,11 +4872,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01B0 #x0303)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER U WITH HORN AND TILDE")
       (=ucs		  . #x1EEE)	; á»®
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH HORN")
+      (=ucs		  . #x01B0)	; Æ°
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EEF)	; ữ
     (latin-tcvn5712	. #xF7)	; &I-VSCII2-77;
     (latin-viscii	. #xE6)	; &I-MULE-VIET-L-66;
@@ -3336,11 +4893,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01AF #x0323)
     (->lowercase
      ((name . "LATIN SMALL LETTER U WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EF1)	; á»±
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER U WITH HORN")
+      (=ucs		  . #x01AF)	; Ư
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EF0)	; á»°
     (latin-viscii	. #xB9)	; &I-MULE-VIET-U-71;
     (latin-viscii-upper . #xF1)	; &I-MULE-VIET-U-71;
@@ -3350,11 +4913,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x01B0 #x0323)
     (->uppercase
      ((name . "LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW")
       (=ucs		  . #x1EF0)	; á»°
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER U WITH HORN")
+      (=ucs		  . #x01B0)	; Æ°
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EF1)	; á»±
     (latin-tcvn5712	. #xF9)	; &I-VSCII2-79;
     (latin-viscii	. #xF1)	; &I-MULE-VIET-L-71;
@@ -3365,18 +4934,23 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0059 #x0300)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF3)	; ỳ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EF2)	; Ỳ
     (latin-viscii	. #x9F)	; &I-MULE-VIET-U-4F;
     (latin-viscii-upper . #xCF)	; &I-MULE-VIET-U-4F;
     ))
 (define-char
-  '((->decomposition	#xFF39 #x0300)
-    (<-denotational
+  '((<-denotational
      ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF2)	; Ỳ
       ))
@@ -3384,6 +4958,13 @@
      ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF2)	; Ỳ
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER Y")
+      (=ucs		  . #xFF39)	; ï¼¹
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jef-china3	. #x85C0)	; &JC3-85C0;
     ))
 (define-char
@@ -3391,11 +4972,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x0300)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH GRAVE")
       (=ucs		  . #x1EF2)	; Ỳ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1EF3)	; ỳ
     (latin-tcvn5712	. #xFA)	; &I-VSCII2-7A;
     (latin-viscii	. #xCF)	; &I-MULE-VIET-L-4F;
@@ -3406,11 +4993,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0059 #x0323)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH DOT BELOW")
       (=ucs		  . #x1EF5)	; ỵ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EF4)	; á»´
     (latin-viscii	. #x1E)	; &I-MULE-VIET-U-5C;
     (latin-viscii-upper . #xDC)	; &I-MULE-VIET-U-5C;
@@ -3420,11 +5013,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x0323)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH DOT BELOW")
       (=ucs		  . #x1EF4)	; á»´
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING DOT BELOW")
+      (=ucs		  . #x0323)	; ̣
+      ))
     (=ucs		. #x1EF5)	; ỵ
     (latin-tcvn5712	. #xFE)	; &I-VSCII2-7E;
     (latin-viscii	. #xDC)	; &I-MULE-VIET-L-5C;
@@ -3435,11 +5034,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0059 #x0309)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH HOOK ABOVE")
       (=ucs		  . #x1EF7)	; á»·
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EF6)	; Ỷ
     (latin-viscii	. #x14)	; &I-MULE-VIET-U-56;
     (latin-viscii-upper . #xD6)	; &I-MULE-VIET-U-56;
@@ -3449,11 +5054,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x0309)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH HOOK ABOVE")
       (=ucs		  . #x1EF6)	; Ỷ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING HOOK ABOVE")
+      (=ucs		  . #x0309)	; ̉
+      ))
     (=ucs		. #x1EF7)	; á»·
     (latin-tcvn5712	. #xFB)	; &I-VSCII2-7B;
     (latin-viscii	. #xD6)	; &I-MULE-VIET-L-56;
@@ -3464,11 +5075,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0059 #x0303)
     (->lowercase
      ((name		  . "LATIN SMALL LETTER Y WITH TILDE")
       (=ucs		  . #x1EF9)	; ỹ
       ))
+    (=decomposition
+     ((name		  . "LATIN CAPITAL LETTER Y")
+      (=ucs		  . #x0059)	; Y
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EF8)	; Ỹ
     (latin-viscii	. #x19)	; &I-MULE-VIET-U-5B;
     (latin-viscii-upper . #xDB)	; &I-MULE-VIET-U-5B;
@@ -3478,11 +5095,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0079 #x0303)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER Y WITH TILDE")
       (=ucs		  . #x1EF8)	; Ỹ
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x1EF9)	; ỹ
     (latin-tcvn5712	. #xFC)	; &I-VSCII2-7C;
     (latin-viscii	. #xDB)	; &I-MULE-VIET-L-5B;
diff --git a/lisp/utf-2000/u01F00-Greek-Extended.el b/lisp/utf-2000/u01F00-Greek-Extended.el
index 7a184d7..aa13757 100644
--- a/lisp/utf-2000/u01F00-Greek-Extended.el
+++ b/lisp/utf-2000/u01F00-Greek-Extended.el
@@ -4,11 +4,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0313)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
       (=ucs		  . #x1F08)	; Ἀ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F00)	; ἀ
     ))
 (define-char
@@ -16,11 +22,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
       (=ucs		  . #x1F09)	; Ἁ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F01)	; ἁ
     ))
 (define-char
@@ -28,11 +40,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA")
       (=ucs		  . #x1F0A)	; Ἂ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F02)	; ἂ
     ))
 (define-char
@@ -40,11 +58,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA")
       (=ucs		  . #x1F0B)	; Ἃ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F03)	; ἃ
     ))
 (define-char
@@ -52,11 +76,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA")
       (=ucs		  . #x1F0C)	; Ἄ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F04)	; ἄ
     ))
 (define-char
@@ -64,11 +94,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA")
       (=ucs		  . #x1F0D)	; Ἅ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F05)	; ἅ
     ))
 (define-char
@@ -76,11 +112,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F0E)	; Ἆ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F06)	; ἆ
     ))
 (define-char
@@ -88,11 +130,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F0F)	; Ἇ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F07)	; ἇ
     ))
 (define-char
@@ -100,11 +148,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0313)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
       (=ucs		  . #x1F00)	; ἀ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F08)	; Ἀ
     ))
 (define-char
@@ -112,11 +166,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
       (=ucs		  . #x1F01)	; ἁ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F09)	; Ἁ
     ))
 (define-char
@@ -124,11 +184,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA")
       (=ucs		  . #x1F02)	; ἂ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F0A)	; Ἂ
     ))
 (define-char
@@ -136,11 +202,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA")
       (=ucs		  . #x1F03)	; ἃ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F0B)	; Ἃ
     ))
 (define-char
@@ -148,11 +220,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA")
       (=ucs		  . #x1F04)	; ἄ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F0C)	; Ἄ
     ))
 (define-char
@@ -160,11 +238,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA")
       (=ucs		  . #x1F05)	; ἅ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F0D)	; Ἅ
     ))
 (define-char
@@ -172,11 +256,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F06)	; ἆ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F0E)	; Ἆ
     ))
 (define-char
@@ -184,11 +274,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F07)	; ἇ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F0F)	; Ἇ
     ))
 (define-char
@@ -196,11 +292,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B5 #x0313)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH PSILI")
       (=ucs		  . #x1F18)	; Ἐ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F10)	; ἐ
     ))
 (define-char
@@ -208,11 +310,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B5 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH DASIA")
       (=ucs		  . #x1F19)	; Ἑ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F11)	; ἑ
     ))
 (define-char
@@ -220,11 +328,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F10 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA")
       (=ucs		  . #x1F1A)	; Ἒ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F10)	; ἐ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F12)	; ἒ
     ))
 (define-char
@@ -232,11 +346,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F11 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F1B)	; Ἓ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F11)	; ἑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F13)	; ἓ
     ))
 (define-char
@@ -244,11 +364,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F10 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA")
       (=ucs		  . #x1F1C)	; Ἔ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F10)	; ἐ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F14)	; ἔ
     ))
 (define-char
@@ -256,11 +382,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F11 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F1D)	; Ἕ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F11)	; ἑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F15)	; ἕ
     ))
 (define-char
@@ -268,11 +400,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0395 #x0313)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH PSILI")
       (=ucs		  . #x1F10)	; ἐ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F18)	; Ἐ
     ))
 (define-char
@@ -280,11 +418,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0395 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH DASIA")
       (=ucs		  . #x1F11)	; ἑ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F19)	; Ἑ
     ))
 (define-char
@@ -292,11 +436,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F18 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA")
       (=ucs		  . #x1F12)	; ἒ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F18)	; Ἐ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F1A)	; Ἒ
     ))
 (define-char
@@ -304,11 +454,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F19 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F13)	; ἓ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F19)	; Ἑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F1B)	; Ἓ
     ))
 (define-char
@@ -316,11 +472,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F18 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA")
       (=ucs		  . #x1F14)	; ἔ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F18)	; Ἐ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F1C)	; Ἔ
     ))
 (define-char
@@ -328,11 +490,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F19 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F15)	; ἕ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F19)	; Ἑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F1D)	; Ἕ
     ))
 (define-char
@@ -340,11 +508,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0313)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
       (=ucs		  . #x1F28)	; Ἠ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F20)	; á¼ 
     ))
 (define-char
@@ -352,11 +526,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
       (=ucs		  . #x1F29)	; Ἡ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F21)	; ἡ
     ))
 (define-char
@@ -364,11 +544,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA")
       (=ucs		  . #x1F2A)	; Ἢ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F22)	; á¼¢
     ))
 (define-char
@@ -376,11 +562,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA")
       (=ucs		  . #x1F2B)	; Ἣ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F23)	; á¼£
     ))
 (define-char
@@ -388,11 +580,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA")
       (=ucs		  . #x1F2C)	; Ἤ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F24)	; ἤ
     ))
 (define-char
@@ -400,11 +598,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA")
       (=ucs		  . #x1F2D)	; á¼­
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F25)	; á¼¥
     ))
 (define-char
@@ -412,11 +616,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F2E)	; á¼®
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F26)	; ἦ
     ))
 (define-char
@@ -424,11 +634,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F2F)	; Ἧ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F27)	; ἧ
     ))
 (define-char
@@ -436,11 +652,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0313)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
       (=ucs		  . #x1F20)	; á¼ 
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F28)	; Ἠ
     ))
 (define-char
@@ -448,11 +670,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
       (=ucs		  . #x1F21)	; ἡ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F29)	; Ἡ
     ))
 (define-char
@@ -460,11 +688,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA")
       (=ucs		  . #x1F22)	; á¼¢
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F2A)	; Ἢ
     ))
 (define-char
@@ -472,11 +706,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA")
       (=ucs		  . #x1F23)	; á¼£
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F2B)	; Ἣ
     ))
 (define-char
@@ -484,11 +724,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0301)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA")
       (=ucs		  . #x1F24)	; ἤ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F2C)	; Ἤ
     ))
 (define-char
@@ -496,11 +742,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0301)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA")
       (=ucs		  . #x1F25)	; á¼¥
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F2D)	; á¼­
     ))
 (define-char
@@ -508,11 +760,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F26)	; ἦ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F2E)	; á¼®
     ))
 (define-char
@@ -520,11 +778,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F27)	; ἧ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F2F)	; Ἧ
     ))
 (define-char
@@ -532,11 +796,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0313)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
       (=ucs		  . #x1F38)	; Ἰ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F30)	; á¼°
     ))
 (define-char
@@ -544,11 +814,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
       (=ucs		  . #x1F39)	; á¼¹
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F31)	; á¼±
     ))
 (define-char
@@ -556,11 +832,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F30 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA")
       (=ucs		  . #x1F3A)	; Ἲ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F30)	; á¼°
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F32)	; á¼²
     ))
 (define-char
@@ -568,11 +850,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F31 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA")
       (=ucs		  . #x1F3B)	; á¼»
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F31)	; á¼±
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F33)	; á¼³
     ))
 (define-char
@@ -580,11 +868,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F30 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA")
       (=ucs		  . #x1F3C)	; á¼¼
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F30)	; á¼°
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F34)	; á¼´
     ))
 (define-char
@@ -592,11 +886,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F31 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA")
       (=ucs		  . #x1F3D)	; á¼½
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F31)	; á¼±
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F35)	; á¼µ
     ))
 (define-char
@@ -604,11 +904,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F30 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F3E)	; á¼¾
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F30)	; á¼°
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F36)	; ἶ
     ))
 (define-char
@@ -616,11 +922,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F31 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F3F)	; Ἷ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F31)	; á¼±
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F37)	; á¼·
     ))
 (define-char
@@ -628,11 +940,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0313)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
       (=ucs		  . #x1F30)	; á¼°
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F38)	; Ἰ
     ))
 (define-char
@@ -640,11 +958,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
       (=ucs		  . #x1F31)	; á¼±
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F39)	; á¼¹
     ))
 (define-char
@@ -652,11 +976,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F38 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH PSILI AND VARIA")
       (=ucs		  . #x1F32)	; á¼²
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F38)	; Ἰ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F3A)	; Ἲ
     ))
 (define-char
@@ -664,11 +994,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F39 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH DASIA AND VARIA")
       (=ucs		  . #x1F33)	; á¼³
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F39)	; á¼¹
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F3B)	; á¼»
     ))
 (define-char
@@ -676,11 +1012,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F38 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH PSILI AND OXIA")
       (=ucs		  . #x1F34)	; á¼´
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F38)	; Ἰ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F3C)	; á¼¼
     ))
 (define-char
@@ -688,11 +1030,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F39 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH DASIA AND OXIA")
       (=ucs		  . #x1F35)	; á¼µ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F39)	; á¼¹
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F3D)	; á¼½
     ))
 (define-char
@@ -700,11 +1048,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F38 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F36)	; ἶ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F38)	; Ἰ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F3E)	; á¼¾
     ))
 (define-char
@@ -712,11 +1066,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F39 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F37)	; á¼·
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F39)	; á¼¹
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F3F)	; Ἷ
     ))
 (define-char
@@ -724,11 +1084,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03BF #x0313)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH PSILI")
       (=ucs		  . #x1F48)	; Ὀ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F40)	; ὀ
     ))
 (define-char
@@ -736,11 +1102,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03BF #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH DASIA")
       (=ucs		  . #x1F49)	; Ὁ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F41)	; ὁ
     ))
 (define-char
@@ -748,11 +1120,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F40 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA")
       (=ucs		  . #x1F4A)	; Ὂ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F40)	; ὀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F42)	; ὂ
     ))
 (define-char
@@ -760,11 +1138,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F41 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA")
       (=ucs		  . #x1F4B)	; Ὃ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F41)	; ὁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F43)	; ὃ
     ))
 (define-char
@@ -772,11 +1156,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F40 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA")
       (=ucs		  . #x1F4C)	; Ὄ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F40)	; ὀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F44)	; ὄ
     ))
 (define-char
@@ -784,11 +1174,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F41 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA")
       (=ucs		  . #x1F4D)	; Ὅ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F41)	; ὁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F45)	; ὅ
     ))
 (define-char
@@ -796,11 +1192,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x039F #x0313)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH PSILI")
       (=ucs		  . #x1F40)	; ὀ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F48)	; Ὀ
     ))
 (define-char
@@ -808,11 +1210,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x039F #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH DASIA")
       (=ucs		  . #x1F41)	; ὁ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F49)	; Ὁ
     ))
 (define-char
@@ -820,11 +1228,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F48 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA")
       (=ucs		  . #x1F42)	; ὂ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F48)	; Ὀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F4A)	; Ὂ
     ))
 (define-char
@@ -832,11 +1246,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F49 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA")
       (=ucs		  . #x1F43)	; ὃ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F49)	; Ὁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F4B)	; Ὃ
     ))
 (define-char
@@ -844,11 +1264,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F48 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA")
       (=ucs		  . #x1F44)	; ὄ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F48)	; Ὀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F4C)	; Ὄ
     ))
 (define-char
@@ -856,11 +1282,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F49 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA")
       (=ucs		  . #x1F45)	; ὅ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F49)	; Ὁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F4D)	; Ὅ
     ))
 (define-char
@@ -868,7 +1300,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F50)	; ὐ
     ))
 (define-char
@@ -876,11 +1314,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
       (=ucs		  . #x1F59)	; Ὑ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F51)	; ὑ
     ))
 (define-char
@@ -888,7 +1332,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F50 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH PSILI")
+      (=ucs		  . #x1F50)	; ὐ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F52)	; ὒ
     ))
 (define-char
@@ -896,11 +1346,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F51 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F5B)	; Ὓ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F51)	; ὑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F53)	; ὓ
     ))
 (define-char
@@ -908,7 +1364,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F50 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH PSILI")
+      (=ucs		  . #x1F50)	; ὐ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F54)	; ὔ
     ))
 (define-char
@@ -916,11 +1378,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F51 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F5D)	; Ὕ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F51)	; ὑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F55)	; ὕ
     ))
 (define-char
@@ -928,7 +1396,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F50 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH PSILI")
+      (=ucs		  . #x1F50)	; ὐ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F56)	; ὖ
     ))
 (define-char
@@ -936,11 +1410,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F51 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F5F)	; Ὗ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F51)	; ὑ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F57)	; ὗ
     ))
 (define-char
@@ -948,11 +1428,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
       (=ucs		  . #x1F51)	; ὑ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F59)	; Ὑ
     ))
 (define-char
@@ -960,11 +1446,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F59 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F53)	; ὓ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F59)	; Ὑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F5B)	; Ὓ
     ))
 (define-char
@@ -972,11 +1464,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F59 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F55)	; ὕ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F59)	; Ὑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F5D)	; Ὕ
     ))
 (define-char
@@ -984,11 +1482,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F59 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F57)	; ὗ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F59)	; Ὑ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F5F)	; Ὗ
     ))
 (define-char
@@ -996,11 +1500,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0313)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
       (=ucs		  . #x1F68)	; Ὠ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F60)	; á½ 
     ))
 (define-char
@@ -1008,11 +1518,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
       (=ucs		  . #x1F69)	; Ὡ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F61)	; ὡ
     ))
 (define-char
@@ -1020,11 +1536,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA")
       (=ucs		  . #x1F6A)	; Ὢ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F62)	; á½¢
     ))
 (define-char
@@ -1032,11 +1554,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0300)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA")
       (=ucs		  . #x1F6B)	; Ὣ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F63)	; á½£
     ))
 (define-char
@@ -1044,11 +1572,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA")
       (=ucs		  . #x1F6C)	; Ὤ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F64)	; ὤ
     ))
 (define-char
@@ -1056,11 +1590,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0301)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA")
       (=ucs		  . #x1F6D)	; á½­
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F65)	; á½¥
     ))
 (define-char
@@ -1068,11 +1608,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F6E)	; á½®
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F66)	; ὦ
     ))
 (define-char
@@ -1080,11 +1626,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0342)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F6F)	; Ὧ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F67)	; ὧ
     ))
 (define-char
@@ -1092,11 +1644,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0313)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
       (=ucs		  . #x1F60)	; á½ 
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1F68)	; Ὠ
     ))
 (define-char
@@ -1104,11 +1662,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
       (=ucs		  . #x1F61)	; ὡ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1F69)	; Ὡ
     ))
 (define-char
@@ -1116,11 +1680,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA")
       (=ucs		  . #x1F62)	; á½¢
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F6A)	; Ὢ
     ))
 (define-char
@@ -1128,11 +1698,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0300)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA")
       (=ucs		  . #x1F63)	; á½£
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F6B)	; Ὣ
     ))
 (define-char
@@ -1140,11 +1716,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA")
       (=ucs		  . #x1F64)	; ὤ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F6C)	; Ὤ
     ))
 (define-char
@@ -1152,11 +1734,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0301)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA")
       (=ucs		  . #x1F65)	; á½¥
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1F6D)	; á½­
     ))
 (define-char
@@ -1164,11 +1752,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F66)	; ὦ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F6E)	; á½®
     ))
 (define-char
@@ -1176,11 +1770,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0342)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F67)	; ὧ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1F6F)	; Ὧ
     ))
 (define-char
@@ -1188,11 +1788,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH VARIA")
       (=ucs		  . #x1FBA)	; Ὰ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F70)	; á½°
     ))
 (define-char
@@ -1201,7 +1807,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0251 #x0300)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER ALPHA")
+      (=ucs		  . #x0251)	; ɑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jis-x0213-1-2000	. #x2B46)	; &JX1-2B46; [11-38]
     (=ucs@jis		. #x1F70)	; &JX1-2B46;
     ))
@@ -1210,11 +1822,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AC)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH OXIA")
       (=ucs		  . #x1FBB)	; á¾»
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x03AC)	; ά
+      ))
     (=ucs		. #x1F71)	; á½±
     ))
 (define-char
@@ -1223,7 +1838,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0251 #x0301)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER ALPHA")
+      (=ucs		  . #x0251)	; ɑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0213-1-2000	. #x2B47)	; &JX1-2B47; [11-39]
     (=ucs@jis		. #x1F71)	; &JX1-2B47;
     ))
@@ -1232,11 +1853,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B5 #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH VARIA")
       (=ucs		  . #x1FC8)	; Ὲ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F72)	; á½²
     ))
 (define-char
@@ -1245,10 +1872,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x025B #x0300)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER OPEN E WITH GRAVE")
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER OPEN E")
+      (=ucs		  . #x025B)	; ɛ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=jis-x0213-1-2000	. #x2B50)	; &JX1-2B50; [11-48]
     (=ucs@jis		. #x1F72)	; &JX1-2B50;
     ))
@@ -1257,11 +1890,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AD)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH OXIA")
       (=ucs		  . #x1FC9)	; Έ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x03AD)	; έ
+      ))
     (=ucs		. #x1F73)	; á½³
     ))
 (define-char
@@ -1270,10 +1906,16 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x025B #x0301)
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER OPEN E WITH ACUTE")
       ))
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER OPEN E")
+      (=ucs		  . #x025B)	; ɛ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=jis-x0213-1-2000	. #x2B51)	; &JX1-2B51; [11-49]
     (=ucs@jis		. #x1F73)	; &JX1-2B51;
     ))
@@ -1282,11 +1924,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH VARIA")
       (=ucs		  . #x1FCA)	; Ὴ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F74)	; á½´
     ))
 (define-char
@@ -1294,11 +1942,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AE)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH OXIA")
       (=ucs		  . #x1FCB)	; Ή
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
+      (=ucs		  . #x03AE)	; ή
+      ))
     (=ucs		. #x1F75)	; á½µ
     ))
 (define-char
@@ -1306,11 +1957,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH VARIA")
       (=ucs		  . #x1FDA)	; Ὶ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F76)	; ὶ
     ))
 (define-char
@@ -1318,11 +1975,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AF)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH OXIA")
       (=ucs		  . #x1FDB)	; Ί
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x03AF)	; ί
+      ))
     (=ucs		. #x1F77)	; á½·
     ))
 (define-char
@@ -1330,11 +1990,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03BF #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH VARIA")
       (=ucs		  . #x1FF8)	; Ὸ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F78)	; ὸ
     ))
 (define-char
@@ -1342,11 +2008,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CC)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH OXIA")
       (=ucs		  . #x1FF9)	; Ό
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x03CC)	; ό
+      ))
     (=ucs		. #x1F79)	; á½¹
     ))
 (define-char
@@ -1354,11 +2023,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH VARIA")
       (=ucs		  . #x1FEA)	; Ὺ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F7A)	; ὺ
     ))
 (define-char
@@ -1366,11 +2041,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CD)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH OXIA")
       (=ucs		  . #x1FEB)	; á¿«
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x03CD)	; ύ
+      ))
     (=ucs		. #x1F7B)	; á½»
     ))
 (define-char
@@ -1378,11 +2056,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0300)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH VARIA")
       (=ucs		  . #x1FFA)	; Ὼ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1F7C)	; á½¼
     ))
 (define-char
@@ -1390,11 +2074,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CE)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH OXIA")
       (=ucs		  . #x1FFB)	; á¿»
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x03CE)	; ώ
+      ))
     (=ucs		. #x1F7D)	; á½½
     ))
 (define-char
@@ -1402,11 +2089,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F88)	; ᾈ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F80)	; ᾀ
     ))
 (define-char
@@ -1414,11 +2107,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F89)	; ᾉ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F81)	; ᾁ
     ))
 (define-char
@@ -1426,11 +2125,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F02 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8A)	; ᾊ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F02)	; ἂ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F82)	; ᾂ
     ))
 (define-char
@@ -1438,11 +2143,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F03 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8B)	; ᾋ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F03)	; ἃ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F83)	; ᾃ
     ))
 (define-char
@@ -1450,11 +2161,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F04 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8C)	; ᾌ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F04)	; ἄ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F84)	; ᾄ
     ))
 (define-char
@@ -1462,11 +2179,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F05 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8D)	; ᾍ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F05)	; ἅ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F85)	; ᾅ
     ))
 (define-char
@@ -1474,11 +2197,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F06 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8E)	; ᾎ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F06)	; ἆ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F86)	; ᾆ
     ))
 (define-char
@@ -1486,11 +2215,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F07 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8F)	; ᾏ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F07)	; ἇ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F87)	; ᾇ
     ))
 (define-char
@@ -1498,11 +2233,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F80)	; ᾀ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F88)	; ᾈ
     ))
 (define-char
@@ -1510,11 +2251,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F81)	; ᾁ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F89)	; ᾉ
     ))
 (define-char
@@ -1522,11 +2269,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0A #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F82)	; ᾂ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F0A)	; Ἂ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F8A)	; ᾊ
     ))
 (define-char
@@ -1534,11 +2287,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0B #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F83)	; ᾃ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F0B)	; Ἃ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F8B)	; ᾋ
     ))
 (define-char
@@ -1546,11 +2305,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0C #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F84)	; ᾄ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F0C)	; Ἄ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F8C)	; ᾌ
     ))
 (define-char
@@ -1558,11 +2323,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0D #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F85)	; ᾅ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F0D)	; Ἅ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F8D)	; ᾍ
     ))
 (define-char
@@ -1570,11 +2341,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0E #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F86)	; ᾆ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F0E)	; Ἆ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F8E)	; ᾎ
     ))
 (define-char
@@ -1582,11 +2359,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0F #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F87)	; ᾇ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F0F)	; Ἇ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F8F)	; ᾏ
     ))
 (define-char
@@ -1594,11 +2377,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F98)	; ᾘ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F90)	; ᾐ
     ))
 (define-char
@@ -1606,11 +2395,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F99)	; ᾙ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F91)	; ᾑ
     ))
 (define-char
@@ -1618,11 +2413,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F22 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9A)	; ᾚ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F22)	; á¼¢
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F92)	; ᾒ
     ))
 (define-char
@@ -1630,11 +2431,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F23 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9B)	; ᾛ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F23)	; á¼£
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F93)	; ᾓ
     ))
 (define-char
@@ -1642,11 +2449,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F24 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9C)	; ᾜ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F24)	; ἤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F94)	; ᾔ
     ))
 (define-char
@@ -1654,11 +2467,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F25 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9D)	; ᾝ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F25)	; á¼¥
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F95)	; ᾕ
     ))
 (define-char
@@ -1666,11 +2485,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F26 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9E)	; ᾞ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F26)	; ἦ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F96)	; ᾖ
     ))
 (define-char
@@ -1678,11 +2503,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F27 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9F)	; ᾟ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F27)	; ἧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F97)	; ᾗ
     ))
 (define-char
@@ -1690,11 +2521,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F90)	; ᾐ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F98)	; ᾘ
     ))
 (define-char
@@ -1702,11 +2539,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F91)	; ᾑ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F99)	; ᾙ
     ))
 (define-char
@@ -1714,11 +2557,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2A #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F92)	; ᾒ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F2A)	; Ἢ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F9A)	; ᾚ
     ))
 (define-char
@@ -1726,11 +2575,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2B #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F93)	; ᾓ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F2B)	; Ἣ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F9B)	; ᾛ
     ))
 (define-char
@@ -1738,11 +2593,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2C #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F94)	; ᾔ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F2C)	; Ἤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F9C)	; ᾜ
     ))
 (define-char
@@ -1750,11 +2611,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2D #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F95)	; ᾕ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F2D)	; á¼­
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F9D)	; ᾝ
     ))
 (define-char
@@ -1762,11 +2629,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2E #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F96)	; ᾖ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F2E)	; á¼®
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F9E)	; ᾞ
     ))
 (define-char
@@ -1774,11 +2647,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2F #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F97)	; ᾗ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F2F)	; Ἧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1F9F)	; ᾟ
     ))
 (define-char
@@ -1786,11 +2665,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI")
       (=ucs		  . #x1FA8)	; ᾨ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA0)	; á¾ 
     ))
 (define-char
@@ -1798,11 +2683,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FA9)	; ᾩ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA1)	; ᾡ
     ))
 (define-char
@@ -1810,11 +2701,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F62 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAA)	; ᾪ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F62)	; á½¢
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA2)	; á¾¢
     ))
 (define-char
@@ -1822,11 +2719,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F63 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAB)	; ᾫ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F63)	; á½£
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA3)	; á¾£
     ))
 (define-char
@@ -1834,11 +2737,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F64 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAC)	; ᾬ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F64)	; ὤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA4)	; ᾤ
     ))
 (define-char
@@ -1846,11 +2755,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F65 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAD)	; á¾­
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F65)	; á½¥
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA5)	; á¾¥
     ))
 (define-char
@@ -1858,11 +2773,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F66 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAE)	; á¾®
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F66)	; ὦ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA6)	; ᾦ
     ))
 (define-char
@@ -1870,11 +2791,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F67 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAF)	; ᾯ
       ))
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F67)	; ὧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA7)	; ᾧ
     ))
 (define-char
@@ -1882,11 +2809,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA0)	; á¾ 
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA8)	; ᾨ
     ))
 (define-char
@@ -1894,11 +2827,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA1)	; ᾡ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FA9)	; ᾩ
     ))
 (define-char
@@ -1906,11 +2845,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6A #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA2)	; á¾¢
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F6A)	; Ὢ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FAA)	; ᾪ
     ))
 (define-char
@@ -1918,11 +2863,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6B #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA3)	; á¾£
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F6B)	; Ὣ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FAB)	; ᾫ
     ))
 (define-char
@@ -1930,11 +2881,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6C #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA4)	; ᾤ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F6C)	; Ὤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FAC)	; ᾬ
     ))
 (define-char
@@ -1942,11 +2899,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6D #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA5)	; á¾¥
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F6D)	; á½­
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FAD)	; á¾­
     ))
 (define-char
@@ -1954,11 +2917,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6E #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA6)	; ᾦ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F6E)	; á½®
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FAE)	; á¾®
     ))
 (define-char
@@ -1966,11 +2935,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6F #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA7)	; ᾧ
       ))
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F6F)	; Ὧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FAF)	; ᾯ
     ))
 (define-char
@@ -1978,11 +2953,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0306)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH VRACHY")
       (=ucs		  . #x1FB8)	; Ᾰ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1FB0)	; á¾°
     ))
 (define-char
@@ -1990,11 +2971,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0304)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH MACRON")
       (=ucs		  . #x1FB9)	; á¾¹
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1FB1)	; á¾±
     ))
 (define-char
@@ -2002,7 +2989,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F70 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH VARIA")
+      (=ucs		  . #x1F70)	; á½°
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FB2)	; á¾²
     ))
 (define-char
@@ -2010,11 +3003,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI")
       (=ucs		  . #x1FBC)	; á¾¼
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FB3)	; á¾³
     ))
 (define-char
@@ -2022,7 +3021,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AC #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x03AC)	; ά
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FB4)	; á¾´
     ))
 (define-char
@@ -2030,7 +3035,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FB6)	; ᾶ
     ))
 (define-char
@@ -2038,7 +3049,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1FB6 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PERISPOMENI")
+      (=ucs		  . #x1FB6)	; ᾶ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FB7)	; á¾·
     ))
 (define-char
@@ -2046,11 +3063,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0306)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH VRACHY")
       (=ucs		  . #x1FB0)	; á¾°
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1FB8)	; Ᾰ
     ))
 (define-char
@@ -2058,11 +3081,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0304)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH MACRON")
       (=ucs		  . #x1FB1)	; á¾±
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1FB9)	; á¾¹
     ))
 (define-char
@@ -2070,11 +3099,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH VARIA")
       (=ucs		  . #x1F70)	; á½°
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FBA)	; Ὰ
     ))
 (define-char
@@ -2082,11 +3117,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0386)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH OXIA")
       (=ucs		  . #x1F71)	; á½±
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x0386)	; Ά
+      ))
     (=ucs		. #x1FBB)	; á¾»
     ))
 (define-char
@@ -2094,11 +3132,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI")
       (=ucs		  . #x1FB3)	; á¾³
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FBC)	; á¾¼
     ))
 (define-char
@@ -2106,7 +3150,14 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0313)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1FBD)	; á¾½
     ))
 (define-char
@@ -2114,11 +3165,14 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA")
       (=ucs		  . #x0399)	; Ι
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      ))
     (=ucs		. #x1FBE)	; á¾¾
     ))
 (define-char
@@ -2126,7 +3180,14 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0313)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1FBF)	; ᾿
     ))
 (define-char
@@ -2134,7 +3195,14 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0342)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FC0)	; ῀
     ))
 (define-char
@@ -2142,7 +3210,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x00A8 #x0342)
+    (=decomposition
+     ((name		  . "DIAERESIS")
+      (=ucs		  . #x00A8)	; ¨
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FC1)	; ῁
     ))
 (define-char
@@ -2150,7 +3224,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F74 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH VARIA")
+      (=ucs		  . #x1F74)	; á½´
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FC2)	; ῂ
     ))
 (define-char
@@ -2158,11 +3238,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI")
       (=ucs		  . #x1FCC)	; ῌ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FC3)	; ῃ
     ))
 (define-char
@@ -2170,7 +3256,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AE #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
+      (=ucs		  . #x03AE)	; ή
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FC4)	; ῄ
     ))
 (define-char
@@ -2178,7 +3270,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FC6)	; ῆ
     ))
 (define-char
@@ -2186,7 +3284,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1FC6 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PERISPOMENI")
+      (=ucs		  . #x1FC6)	; ῆ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FC7)	; ῇ
     ))
 (define-char
@@ -2194,11 +3298,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0395 #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH VARIA")
       (=ucs		  . #x1F72)	; á½²
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FC8)	; Ὲ
     ))
 (define-char
@@ -2206,11 +3316,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0388)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH OXIA")
       (=ucs		  . #x1F73)	; á½³
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x0388)	; Έ
+      ))
     (=ucs		. #x1FC9)	; Έ
     ))
 (define-char
@@ -2218,11 +3331,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH VARIA")
       (=ucs		  . #x1F74)	; á½´
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FCA)	; Ὴ
     ))
 (define-char
@@ -2230,11 +3349,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0389)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH OXIA")
       (=ucs		  . #x1F75)	; á½µ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
+      (=ucs		  . #x0389)	; Ή
+      ))
     (=ucs		. #x1FCB)	; Ή
     ))
 (define-char
@@ -2242,11 +3364,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0345)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI")
       (=ucs		  . #x1FC3)	; ῃ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FCC)	; ῌ
     ))
 (define-char
@@ -2254,7 +3382,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x1FBF #x0300)
+    (=decomposition
+     ((name		  . "GREEK PSILI")
+      (=ucs		  . #x1FBF)	; ᾿
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FCD)	; ῍
     ))
 (define-char
@@ -2262,7 +3396,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x1FBF #x0301)
+    (=decomposition
+     ((name		  . "GREEK PSILI")
+      (=ucs		  . #x1FBF)	; ᾿
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1FCE)	; ῎
     ))
 (define-char
@@ -2270,7 +3410,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x1FBF #x0342)
+    (=decomposition
+     ((name		  . "GREEK PSILI")
+      (=ucs		  . #x1FBF)	; ᾿
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FCF)	; ῏
     ))
 (define-char
@@ -2278,11 +3424,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0306)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH VRACHY")
       (=ucs		  . #x1FD8)	; Ῐ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1FD0)	; ῐ
     ))
 (define-char
@@ -2290,11 +3442,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0304)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH MACRON")
       (=ucs		  . #x1FD9)	; Ῑ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1FD1)	; ῑ
     ))
 (define-char
@@ -2302,7 +3460,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CA #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DIALYTIKA")
+      (=ucs		  . #x03CA)	; ϊ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FD2)	; ῒ
     ))
 (define-char
@@ -2310,7 +3474,10 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0390)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS")
+      (=ucs		  . #x0390)	; ΐ
+      ))
     (=ucs		. #x1FD3)	; ΐ
     ))
 (define-char
@@ -2318,7 +3485,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FD6)	; ῖ
     ))
 (define-char
@@ -2326,7 +3499,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CA #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DIALYTIKA")
+      (=ucs		  . #x03CA)	; ϊ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FD7)	; ῗ
     ))
 (define-char
@@ -2334,11 +3513,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0306)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH VRACHY")
       (=ucs		  . #x1FD0)	; ῐ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1FD8)	; Ῐ
     ))
 (define-char
@@ -2346,11 +3531,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0304)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH MACRON")
       (=ucs		  . #x1FD1)	; ῑ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1FD9)	; Ῑ
     ))
 (define-char
@@ -2358,11 +3549,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH VARIA")
       (=ucs		  . #x1F76)	; ὶ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FDA)	; Ὶ
     ))
 (define-char
@@ -2370,11 +3567,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038A)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH OXIA")
       (=ucs		  . #x1F77)	; á½·
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x038A)	; Ί
+      ))
     (=ucs		. #x1FDB)	; Ί
     ))
 (define-char
@@ -2382,7 +3582,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x1FFE #x0300)
+    (=decomposition
+     ((name		  . "GREEK DASIA")
+      (=ucs		  . #x1FFE)	; ῾
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FDD)	; ῝
     ))
 (define-char
@@ -2390,7 +3596,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x1FFE #x0301)
+    (=decomposition
+     ((name		  . "GREEK DASIA")
+      (=ucs		  . #x1FFE)	; ῾
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs		. #x1FDE)	; ῞
     ))
 (define-char
@@ -2398,7 +3610,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x1FFE #x0342)
+    (=decomposition
+     ((name		  . "GREEK DASIA")
+      (=ucs		  . #x1FFE)	; ῾
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FDF)	; ῟
     ))
 (define-char
@@ -2406,11 +3624,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0306)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH VRACHY")
       (=ucs		  . #x1FE8)	; Ῠ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1FE0)	; á¿ 
     ))
 (define-char
@@ -2418,11 +3642,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0304)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH MACRON")
       (=ucs		  . #x1FE9)	; á¿©
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1FE1)	; á¿¡
     ))
 (define-char
@@ -2430,7 +3660,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CB #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA")
+      (=ucs		  . #x03CB)	; ϋ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FE2)	; á¿¢
     ))
 (define-char
@@ -2438,7 +3674,10 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B0)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS")
+      (=ucs		  . #x03B0)	; ΰ
+      ))
     (=ucs		. #x1FE3)	; á¿£
     ))
 (define-char
@@ -2446,7 +3685,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C1 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER RHO")
+      (=ucs		  . #x03C1)	; ρ
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
     (=ucs		. #x1FE4)	; ῤ
     ))
 (define-char
@@ -2454,11 +3699,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C1 #x0314)
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER RHO WITH DASIA")
       (=ucs		  . #x1FEC)	; Ῥ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER RHO")
+      (=ucs		  . #x03C1)	; ρ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1FE5)	; á¿¥
     ))
 (define-char
@@ -2466,7 +3717,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FE6)	; ῦ
     ))
 (define-char
@@ -2474,7 +3731,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CB #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA")
+      (=ucs		  . #x03CB)	; ϋ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FE7)	; ῧ
     ))
 (define-char
@@ -2482,11 +3745,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0306)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH VRACHY")
       (=ucs		  . #x1FE0)	; á¿ 
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
     (=ucs		. #x1FE8)	; Ῠ
     ))
 (define-char
@@ -2494,11 +3763,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0304)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH MACRON")
       (=ucs		  . #x1FE1)	; á¿¡
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
     (=ucs		. #x1FE9)	; á¿©
     ))
 (define-char
@@ -2506,11 +3781,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH VARIA")
       (=ucs		  . #x1F7A)	; ὺ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FEA)	; Ὺ
     ))
 (define-char
@@ -2518,11 +3799,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038E)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH OXIA")
       (=ucs		  . #x1F7B)	; á½»
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x038E)	; Ύ
+      ))
     (=ucs		. #x1FEB)	; á¿«
     ))
 (define-char
@@ -2530,11 +3814,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A1 #x0314)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER RHO WITH DASIA")
       (=ucs		  . #x1FE5)	; á¿¥
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER RHO")
+      (=ucs		  . #x03A1)	; Ρ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1FEC)	; Ῥ
     ))
 (define-char
@@ -2542,7 +3832,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x00A8 #x0300)
+    (=decomposition
+     ((name		  . "DIAERESIS")
+      (=ucs		  . #x00A8)	; ¨
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FED)	; á¿­
     ))
 (define-char
@@ -2550,7 +3846,10 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x0385)
+    (=decomposition
+     ((name		  . "GREEK DIALYTIKA TONOS")
+      (=ucs		  . #x0385)	; ΅
+      ))
     (=ucs		. #x1FEE)	; á¿®
     ))
 (define-char
@@ -2558,7 +3857,10 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x0060)
+    (=decomposition
+     ((name		  . "GRAVE ACCENT")
+      (=ucs		  . #x0060)	; `
+      ))
     (=ucs		. #x1FEF)	; `
     ))
 (define-char
@@ -2566,7 +3868,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F7C #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH VARIA")
+      (=ucs		  . #x1F7C)	; á½¼
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FF2)	; ῲ
     ))
 (define-char
@@ -2574,11 +3882,17 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0345)
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI")
       (=ucs		  . #x1FFC)	; ῼ
       ))
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FF3)	; ῳ
     ))
 (define-char
@@ -2586,7 +3900,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CE #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x03CE)	; ώ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FF4)	; á¿´
     ))
 (define-char
@@ -2594,7 +3914,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
     (=ucs		. #x1FF6)	; ῶ
     ))
 (define-char
@@ -2602,7 +3928,13 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1FF6 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PERISPOMENI")
+      (=ucs		  . #x1FF6)	; ῶ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FF7)	; á¿·
     ))
 (define-char
@@ -2610,11 +3942,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x039F #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH VARIA")
       (=ucs		  . #x1F78)	; ὸ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FF8)	; Ὸ
     ))
 (define-char
@@ -2622,11 +3960,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038C)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH OXIA")
       (=ucs		  . #x1F79)	; á½¹
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x038C)	; Ό
+      ))
     (=ucs		. #x1FF9)	; Ό
     ))
 (define-char
@@ -2634,11 +3975,17 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0300)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH VARIA")
       (=ucs		  . #x1F7C)	; á½¼
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs		. #x1FFA)	; Ὼ
     ))
 (define-char
@@ -2646,11 +3993,14 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038F)
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH OXIA")
       (=ucs		  . #x1F7D)	; á½½
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x038F)	; Ώ
+      ))
     (=ucs		. #x1FFB)	; á¿»
     ))
 (define-char
@@ -2658,11 +4008,17 @@
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0345)
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI")
       (=ucs		  . #x1FF3)	; ῳ
       ))
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
     (=ucs		. #x1FFC)	; ῼ
     ))
 (define-char
@@ -2670,7 +4026,10 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x00B4)
+    (=decomposition
+     ((name		  . "ACUTE ACCENT")
+      (=ucs		  . #x00B4)	; ´
+      ))
     (=ucs		. #x1FFD)	; ´
     ))
 (define-char
@@ -2678,6 +4037,13 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0314)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
     (=ucs		. #x1FFE)	; ῾
     ))
diff --git a/lisp/utf-2000/u02000-General-Punctuation.el b/lisp/utf-2000/u02000-General-Punctuation.el
index 735ed24..7da6694 100644
--- a/lisp/utf-2000/u02000-General-Punctuation.el
+++ b/lisp/utf-2000/u02000-General-Punctuation.el
@@ -4,7 +4,10 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	#x2002)
+    (=decomposition
+     ((name		  . "EN SPACE")
+      (=ucs		  . #x2002)	;  
+      ))
     (=ucs		. #x2000)	;  
     ))
 (define-char
@@ -12,7 +15,10 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	#x2003)
+    (=decomposition
+     ((name		  . "EM SPACE")
+      (=ucs		  . #x2003)	;  
+      ))
     (=ucs		. #x2001)	;  
     ))
 (define-char
@@ -20,7 +26,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2002)	;  
     ))
 (define-char
@@ -28,7 +38,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2003)	;  
     (=cns11643-1	. #x256D)	; &I-C1-256D; [05-77]
     ))
@@ -37,7 +51,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2004)	;  
     ))
 (define-char
@@ -45,7 +63,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2005)	;  
     ))
 (define-char
@@ -53,7 +75,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2006)	;  
     ))
 (define-char
@@ -61,7 +87,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	noBreak #x0020)
+    (=decomposition
+     noBreak
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2007)	;  
     ))
 (define-char
@@ -69,7 +99,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2008)	;  
     ))
 (define-char
@@ -77,7 +111,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x2009)	;  
     ))
 (define-char
@@ -85,7 +123,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	compat #x0020)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x200A)	;  
     ))
 (define-char
@@ -147,7 +189,11 @@
     (general-category	punctuation dash) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	noBreak #x2010)
+    (=decomposition
+     noBreak
+     ((name		  . "HYPHEN")
+      (=ucs		  . #x2010)	; ‐
+      ))
     (=ucs		. #x2011)	; ‑
     ))
 (define-char
@@ -253,7 +299,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0333)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING DOUBLE LOW LINE")
+      (=ucs		  . #x0333)	; ̳
+      ))
     (=ucs		. #x2017)	; ‗
     (hebrew-iso8859-8	. #xDF)	; &I-HEBREW-5F;
     ))
@@ -468,7 +521,11 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x002E)
+    (=decomposition
+     compat
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      ))
     (=ucs		. #x2024)	; ․
     ))
 (define-char
@@ -476,7 +533,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x002E #x002E)
+    (=decomposition
+     compat
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      )
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      ))
     (=ucs		. #x2025)	; ‥
     ))
 (define-char
@@ -502,7 +566,17 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x002E #x002E #x002E)
+    (=decomposition
+     compat
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      )
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      )
+     ((name		  . "FULL STOP")
+      (=ucs		  . #x002E)	; .
+      ))
     (=ucs		. #x2026)	; …
     ))
 (define-char
@@ -600,7 +674,11 @@
     (general-category	separator space) ; Normative Category
     (bidi-category	. "WS")
     (mirrored		. nil)
-    (->decomposition	noBreak #x0020)
+    (=decomposition
+     noBreak
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      ))
     (=ucs		. #x202F)	;  
     ))
 (define-char
@@ -666,7 +744,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (->decomposition	compat #x2032 #x2032)
+    (=decomposition
+     compat
+     ((name		  . "PRIME")
+      (=ucs		  . #x2032)	; ′
+      )
+     ((name		  . "PRIME")
+      (=ucs		  . #x2032)	; ′
+      ))
     (=ucs		. #x2033)	; ″
     ))
 (define-char
@@ -690,7 +775,17 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ET")
     (mirrored		. nil)
-    (->decomposition	compat #x2032 #x2032 #x2032)
+    (=decomposition
+     compat
+     ((name		  . "PRIME")
+      (=ucs		  . #x2032)	; ′
+      )
+     ((name		  . "PRIME")
+      (=ucs		  . #x2032)	; ′
+      )
+     ((name		  . "PRIME")
+      (=ucs		  . #x2032)	; ′
+      ))
     (=ucs		. #x2034)	; ‴
     ))
 (define-char
@@ -719,7 +814,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x2035 #x2035)
+    (=decomposition
+     compat
+     ((name		  . "REVERSED PRIME")
+      (=ucs		  . #x2035)	; ‵
+      )
+     ((name		  . "REVERSED PRIME")
+      (=ucs		  . #x2035)	; ‵
+      ))
     (=ucs		. #x2036)	; ‶
     ))
 (define-char
@@ -727,7 +829,17 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x2035 #x2035 #x2035)
+    (=decomposition
+     compat
+     ((name		  . "REVERSED PRIME")
+      (=ucs		  . #x2035)	; ‵
+      )
+     ((name		  . "REVERSED PRIME")
+      (=ucs		  . #x2035)	; ‵
+      )
+     ((name		  . "REVERSED PRIME")
+      (=ucs		  . #x2035)	; ‵
+      ))
     (=ucs		. #x2037)	; ‷
     ))
 (define-char
@@ -783,7 +895,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0021 #x0021)
+    (=decomposition
+     compat
+     ((name		  . "EXCLAMATION MARK")
+      (=ucs		  . #x0021)	; !
+      )
+     ((name		  . "EXCLAMATION MARK")
+      (=ucs		  . #x0021)	; !
+      ))
     (=ucs		. #x203C)	; ‼
     ))
 (define-char
@@ -810,7 +929,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0305)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING OVERLINE")
+      (=ucs		  . #x0305)	; ̅
+      ))
     (=ucs		. #x203E)	; ‾
     (latin-jisx0201	. #x7E)	; &I-LATINJ-7E;
     (hebrew-iso8859-8	. #xAF)	; &I-HEBREW-2F;
@@ -924,7 +1050,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x003F #x0021)
+    (=decomposition
+     compat
+     ((name		  . "QUESTION MARK")
+      (=ucs		  . #x003F)	; ?
+      )
+     ((name		  . "EXCLAMATION MARK")
+      (=ucs		  . #x0021)	; !
+      ))
     (=ucs		. #x2048)	; ⁈
     ))
 (define-char
@@ -932,7 +1065,6 @@
      ((name		  . "QUESTION EXCLAMATION MARK")
       (=ucs		  . #x2048)	; ⁈
       ))
-    (->decomposition	compat #xFF1F #xFF01)
     (<-fullwidth
      ((name		  . "QUESTION EXCLAMATION MARK")
       (=ucs		  . #x2048)	; ⁈
@@ -945,7 +1077,14 @@
     (general-category	punctuation other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0021 #x003F)
+    (=decomposition
+     compat
+     ((name		  . "EXCLAMATION MARK")
+      (=ucs		  . #x0021)	; !
+      )
+     ((name		  . "QUESTION MARK")
+      (=ucs		  . #x003F)	; ?
+      ))
     (=ucs		. #x2049)	; ⁉
     ))
 (define-char
diff --git a/lisp/utf-2000/u02190-Arrows.el b/lisp/utf-2000/u02190-Arrows.el
index f1894c0..2400feb 100644
--- a/lisp/utf-2000/u02190-Arrows.el
+++ b/lisp/utf-2000/u02190-Arrows.el
@@ -256,7 +256,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x2190 #x0338)
+    (=decomposition
+     ((name		  . "LEFTWARDS ARROW")
+      (=ucs		  . #x2190)	; ←
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x219A)	; ↚
     ))
 (define-char
@@ -264,7 +270,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x2192 #x0338)
+    (=decomposition
+     ((name		  . "RIGHTWARDS ARROW")
+      (=ucs		  . #x2192)	; →
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x219B)	; ↛
     ))
 (define-char
@@ -398,7 +410,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x2194 #x0338)
+    (=decomposition
+     ((name		  . "LEFT RIGHT ARROW")
+      (=ucs		  . #x2194)	; ↔
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x21AE)	; ↮
     ))
 (define-char
@@ -652,7 +670,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x21D0 #x0338)
+    (=decomposition
+     ((name		  . "LEFTWARDS DOUBLE ARROW")
+      (=ucs		  . #x21D0)	; ⇐
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x21CD)	; ⇍
     ))
 (define-char
@@ -660,7 +684,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x21D4 #x0338)
+    (=decomposition
+     ((name		  . "LEFT RIGHT DOUBLE ARROW")
+      (=ucs		  . #x21D4)	; ⇔
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x21CE)	; ⇎
     ))
 (define-char
@@ -668,7 +698,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x21D2 #x0338)
+    (=decomposition
+     ((name		  . "RIGHTWARDS DOUBLE ARROW")
+      (=ucs		  . #x21D2)	; ⇒
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x21CF)	; ⇏
     ))
 (define-char
diff --git a/lisp/utf-2000/u02200-Mathematical-Operators.el b/lisp/utf-2000/u02200-Mathematical-Operators.el
index 05820ca..6d67aff 100644
--- a/lisp/utf-2000/u02200-Mathematical-Operators.el
+++ b/lisp/utf-2000/u02200-Mathematical-Operators.el
@@ -80,7 +80,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2203 #x0338)
+    (=decomposition
+     ((name		  . "THERE EXISTS")
+      (=ucs		  . #x2203)	; ∃
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2204)	; ∄
     ))
 (define-char
@@ -162,7 +168,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2208 #x0338)
+    (=decomposition
+     ((name		  . "ELEMENT OF")
+      (=ucs		  . #x2208)	; ∈
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2209)	; ∉
     ))
 (define-char
@@ -212,7 +224,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x220B #x0338)
+    (=decomposition
+     ((name		  . "CONTAINS AS MEMBER")
+      (=ucs		  . #x220B)	; ∋
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x220C)	; ∌
     ))
 (define-char
@@ -556,7 +574,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2223 #x0338)
+    (=decomposition
+     ((name		  . "DIVIDES")
+      (=ucs		  . #x2223)	; ∣
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2224)	; ∤
     ))
 (define-char
@@ -589,7 +613,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2225 #x0338)
+    (=decomposition
+     ((name		  . "PARALLEL TO")
+      (=ucs		  . #x2225)	; ∥
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2226)	; ∦
     ))
 (define-char
@@ -746,7 +776,14 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	compat #x222B #x222B)
+    (=decomposition
+     compat
+     ((name		  . "INTEGRAL")
+      (=ucs		  . #x222B)	; ∫
+      )
+     ((name		  . "INTEGRAL")
+      (=ucs		  . #x222B)	; ∫
+      ))
     (=ucs		. #x222C)	; ∬
     ))
 (define-char
@@ -770,7 +807,17 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	compat #x222B #x222B #x222B)
+    (=decomposition
+     compat
+     ((name		  . "INTEGRAL")
+      (=ucs		  . #x222B)	; ∫
+      )
+     ((name		  . "INTEGRAL")
+      (=ucs		  . #x222B)	; ∫
+      )
+     ((name		  . "INTEGRAL")
+      (=ucs		  . #x222B)	; ∫
+      ))
     (=ucs		. #x222D)	; ∭
     ))
 (define-char
@@ -805,7 +852,14 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	compat #x222E #x222E)
+    (=decomposition
+     compat
+     ((name		  . "CONTOUR INTEGRAL")
+      (=ucs		  . #x222E)	; ∮
+      )
+     ((name		  . "CONTOUR INTEGRAL")
+      (=ucs		  . #x222E)	; ∮
+      ))
     (=ucs		. #x222F)	; ∯
     ))
 (define-char
@@ -813,7 +867,17 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	compat #x222E #x222E #x222E)
+    (=decomposition
+     compat
+     ((name		  . "CONTOUR INTEGRAL")
+      (=ucs		  . #x222E)	; ∮
+      )
+     ((name		  . "CONTOUR INTEGRAL")
+      (=ucs		  . #x222E)	; ∮
+      )
+     ((name		  . "CONTOUR INTEGRAL")
+      (=ucs		  . #x222E)	; ∮
+      ))
     (=ucs		. #x2230)	; ∰
     ))
 (define-char
@@ -1033,7 +1097,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x223C #x0338)
+    (=decomposition
+     ((name		  . "TILDE OPERATOR")
+      (=ucs		  . #x223C)	; ∼
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2241)	; ≁
     ))
 (define-char
@@ -1067,7 +1137,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2243 #x0338)
+    (=decomposition
+     ((name		  . "ASYMPTOTICALLY EQUAL TO")
+      (=ucs		  . #x2243)	; ≃
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2244)	; ≄
     ))
 (define-char
@@ -1101,7 +1177,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2245 #x0338)
+    (=decomposition
+     ((name		  . "APPROXIMATELY EQUAL TO")
+      (=ucs		  . #x2245)	; ≅
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2247)	; ≇
     ))
 (define-char
@@ -1130,7 +1212,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2248 #x0338)
+    (=decomposition
+     ((name		  . "ALMOST EQUAL TO")
+      (=ucs		  . #x2248)	; ≈
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2249)	; ≉
     ))
 (define-char
@@ -1323,7 +1411,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x003D #x0338)
+    (=decomposition
+     ((name		  . "EQUALS SIGN")
+      (=ucs		  . #x003D)	; =
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2260)	; ≠
     ))
 (define-char
@@ -1331,11 +1425,17 @@
      ((name		  . "NOT EQUAL TO")
       (=ucs		  . #x2260)	; ≠
       ))
-    (->decomposition	#xFF1D #x0338)
     (<-fullwidth
      ((name		  . "NOT EQUAL TO")
       (=ucs		  . #x2260)	; ≠
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH EQUALS SIGN")
+      (=ucs		  . #xFF1D)	; ＝
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=jis-x0208		. #x2162)	; &J90-2162; [01-66]
     (=gb2312		. #x2159)	; &I-G0-2159; [01-57]
     (=ks-x1001		. #x2141)	; &I-K0-2141; [01-33]
@@ -1380,7 +1480,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2261 #x0338)
+    (=decomposition
+     ((name		  . "IDENTICAL TO")
+      (=ucs		  . #x2261)	; ≡
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2262)	; ≢
     ))
 (define-char
@@ -1388,11 +1494,19 @@
      ((name		  . "NOT IDENTICAL TO")
       (=ucs		  . #x2262)	; ≢
       ))
-    (->decomposition	#xEC41B7 #x0338)
     (<-fullwidth
      ((name		  . "NOT IDENTICAL TO")
       (=ucs		  . #x2262)	; ≢
       ))
+    (=decomposition
+     ((=gb2312		  . #x2154)	; &J90-2261; [01-52]
+      (=jis-x0208@1983	  . #x2261)	; &I-J83-2261; [02-65]
+      (=ks-x1001	  . #x2155)	; &I-K0-2155; [01-53]
+      (=cns11643-1	  . #x223E)	; &I-C1-223E; [02-30]
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=jis-x0213-1-2000	. #x226B)	; &JX1-226B; [02-75]
     (=ucs@jis		. #x2262)	; &JX1-226B;
     ))
@@ -1563,7 +1677,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x224D #x0338)
+    (=decomposition
+     ((name		  . "EQUIVALENT TO")
+      (=ucs		  . #x224D)	; ≍
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x226D)	; ≭
     ))
 (define-char
@@ -1571,7 +1691,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x003C #x0338)
+    (=decomposition
+     ((name		  . "LESS-THAN SIGN")
+      (=ucs		  . #x003C)	; <
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x226E)	; ≮
     ))
 (define-char
@@ -1579,11 +1705,17 @@
      ((name		  . "NOT LESS-THAN")
       (=ucs		  . #x226E)	; ≮
       ))
-    (->decomposition	#xFF1C #x0338)
     (<-fullwidth
      ((name		  . "NOT LESS-THAN")
       (=ucs		  . #x226E)	; ≮
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH LESS-THAN SIGN")
+      (=ucs		  . #xFF1C)	; ＜
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=gb2312		. #x215A)	; &G0-215A; [01-58]
     (=ucs@gb		. #x226E)	; &G0-215A;
     ))
@@ -1592,7 +1724,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x003E #x0338)
+    (=decomposition
+     ((name		  . "GREATER-THAN SIGN")
+      (=ucs		  . #x003E)	; >
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x226F)	; ≯
     ))
 (define-char
@@ -1600,11 +1738,17 @@
      ((name		  . "NOT GREATER-THAN")
       (=ucs		  . #x226F)	; ≯
       ))
-    (->decomposition	#xFF1E #x0338)
     (<-fullwidth
      ((name		  . "NOT GREATER-THAN")
       (=ucs		  . #x226F)	; ≯
       ))
+    (=decomposition
+     ((name		  . "FULLWIDTH GREATER-THAN SIGN")
+      (=ucs		  . #xFF1E)	; ＞
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=gb2312		. #x215B)	; &G0-215B; [01-59]
     (=ucs@gb		. #x226F)	; &G0-215B;
     ))
@@ -1613,7 +1757,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2264 #x0338)
+    (=decomposition
+     ((name		  . "LESS-THAN OR EQUAL TO")
+      (=ucs		  . #x2264)	; ≤
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2270)	; ≰
     ))
 (define-char
@@ -1621,7 +1771,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2265 #x0338)
+    (=decomposition
+     ((name		  . "GREATER-THAN OR EQUAL TO")
+      (=ucs		  . #x2265)	; ≥
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2271)	; ≱
     ))
 (define-char
@@ -1643,7 +1799,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2272 #x0338)
+    (=decomposition
+     ((name		  . "LESS-THAN OR EQUIVALENT TO")
+      (=ucs		  . #x2272)	; ≲
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2274)	; ≴
     ))
 (define-char
@@ -1651,7 +1813,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2273 #x0338)
+    (=decomposition
+     ((name		  . "GREATER-THAN OR EQUIVALENT TO")
+      (=ucs		  . #x2273)	; ≳
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2275)	; ≵
     ))
 (define-char
@@ -1697,7 +1865,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2276 #x0338)
+    (=decomposition
+     ((name		  . "LESS-THAN OR GREATER-THAN")
+      (=ucs		  . #x2276)	; ≶
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2278)	; ≸
     ))
 (define-char
@@ -1705,7 +1879,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2277 #x0338)
+    (=decomposition
+     ((name		  . "GREATER-THAN OR LESS-THAN")
+      (=ucs		  . #x2277)	; ≷
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2279)	; ≹
     ))
 (define-char
@@ -1755,7 +1935,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x227A #x0338)
+    (=decomposition
+     ((name		  . "PRECEDES")
+      (=ucs		  . #x227A)	; ≺
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2280)	; ⊀
     ))
 (define-char
@@ -1763,7 +1949,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x227B #x0338)
+    (=decomposition
+     ((name		  . "SUCCEEDS")
+      (=ucs		  . #x227B)	; ≻
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2281)	; ⊁
     ))
 (define-char
@@ -1817,7 +2009,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2282 #x0338)
+    (=decomposition
+     ((name		  . "SUBSET OF")
+      (=ucs		  . #x2282)	; ⊂
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2284)	; ⊄
     ))
 (define-char
@@ -1837,7 +2035,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2283 #x0338)
+    (=decomposition
+     ((name		  . "SUPERSET OF")
+      (=ucs		  . #x2283)	; ⊃
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2285)	; ⊅
     ))
 (define-char
@@ -1903,7 +2107,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2286 #x0338)
+    (=decomposition
+     ((name		  . "SUBSET OF OR EQUAL TO")
+      (=ucs		  . #x2286)	; ⊆
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2288)	; ⊈
     ))
 (define-char
@@ -1911,7 +2121,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2287 #x0338)
+    (=decomposition
+     ((name		  . "SUPERSET OF OR EQUAL TO")
+      (=ucs		  . #x2287)	; ⊇
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x2289)	; ⊉
     ))
 (define-char
@@ -2260,7 +2476,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22A2 #x0338)
+    (=decomposition
+     ((name		  . "RIGHT TACK")
+      (=ucs		  . #x22A2)	; ⊢
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22AC)	; ⊬
     ))
 (define-char
@@ -2268,7 +2490,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22A8 #x0338)
+    (=decomposition
+     ((name		  . "TRUE")
+      (=ucs		  . #x22A8)	; ⊨
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22AD)	; ⊭
     ))
 (define-char
@@ -2276,7 +2504,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22A9 #x0338)
+    (=decomposition
+     ((name		  . "FORCES")
+      (=ucs		  . #x22A9)	; ⊩
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22AE)	; ⊮
     ))
 (define-char
@@ -2284,7 +2518,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22AB #x0338)
+    (=decomposition
+     ((name		  . "DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE")
+      (=ucs		  . #x22AB)	; ⊫
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22AF)	; ⊯
     ))
 (define-char
@@ -2668,7 +2908,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x227C #x0338)
+    (=decomposition
+     ((name		  . "PRECEDES OR EQUAL TO")
+      (=ucs		  . #x227C)	; ≼
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22E0)	; ⋠
     ))
 (define-char
@@ -2676,7 +2922,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x227D #x0338)
+    (=decomposition
+     ((name		  . "SUCCEEDS OR EQUAL TO")
+      (=ucs		  . #x227D)	; ≽
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22E1)	; ⋡
     ))
 (define-char
@@ -2684,7 +2936,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2291 #x0338)
+    (=decomposition
+     ((name		  . "SQUARE IMAGE OF OR EQUAL TO")
+      (=ucs		  . #x2291)	; ⊑
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22E2)	; ⋢
     ))
 (define-char
@@ -2692,7 +2950,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x2292 #x0338)
+    (=decomposition
+     ((name		  . "SQUARE ORIGINAL OF OR EQUAL TO")
+      (=ucs		  . #x2292)	; ⊒
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22E3)	; ⋣
     ))
 (define-char
@@ -2742,7 +3006,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22B2 #x0338)
+    (=decomposition
+     ((name		  . "NORMAL SUBGROUP OF")
+      (=ucs		  . #x22B2)	; ⊲
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22EA)	; ⋪
     ))
 (define-char
@@ -2750,7 +3020,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22B3 #x0338)
+    (=decomposition
+     ((name		  . "CONTAINS AS NORMAL SUBGROUP")
+      (=ucs		  . #x22B3)	; ⊳
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22EB)	; ⋫
     ))
 (define-char
@@ -2758,7 +3034,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22B4 #x0338)
+    (=decomposition
+     ((name		  . "NORMAL SUBGROUP OF OR EQUAL TO")
+      (=ucs		  . #x22B4)	; ⊴
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22EC)	; ⋬
     ))
 (define-char
@@ -2766,7 +3048,13 @@
     (general-category	symbol math) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. t)
-    (->decomposition	#x22B5 #x0338)
+    (=decomposition
+     ((name		  . "CONTAINS AS NORMAL SUBGROUP OR EQUAL TO")
+      (=ucs		  . #x22B5)	; ⊵
+      )
+     ((name		  . "COMBINING LONG SOLIDUS OVERLAY")
+      (=ucs		  . #x0338)	; ̸
+      ))
     (=ucs		. #x22ED)	; ⋭
     ))
 (define-char
diff --git a/lisp/utf-2000/u03040-Hiragana.el b/lisp/utf-2000/u03040-Hiragana.el
index cc6d129..1d9010b 100644
--- a/lisp/utf-2000/u03040-Hiragana.el
+++ b/lisp/utf-2000/u03040-Hiragana.el
@@ -130,7 +130,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x304B #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER KA")
+      (=ucs		  . #x304B)	; か
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x304C)	; が
     (=jis-x0208		. #x242C)	; &I-J90-242C; [04-12]
     (=gb2312		. #x242C)	; &I-G0-242C; [04-12]
@@ -153,7 +159,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x304D #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER KI")
+      (=ucs		  . #x304D)	; き
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x304E)	; ぎ
     (=jis-x0208		. #x242E)	; &I-J90-242E; [04-14]
     (=gb2312		. #x242E)	; &I-G0-242E; [04-14]
@@ -176,7 +188,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x304F #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER KU")
+      (=ucs		  . #x304F)	; く
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3050)	; ぐ
     (=jis-x0208		. #x2430)	; &I-J90-2430; [04-16]
     (=gb2312		. #x2430)	; &I-G0-2430; [04-16]
@@ -199,7 +217,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3051 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER KE")
+      (=ucs		  . #x3051)	; け
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3052)	; げ
     (=jis-x0208		. #x2432)	; &I-J90-2432; [04-18]
     (=gb2312		. #x2432)	; &I-G0-2432; [04-18]
@@ -222,7 +246,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3053 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER KO")
+      (=ucs		  . #x3053)	; こ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3054)	; ご
     (=jis-x0208		. #x2434)	; &I-J90-2434; [04-20]
     (=gb2312		. #x2434)	; &I-G0-2434; [04-20]
@@ -245,7 +275,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3055 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER SA")
+      (=ucs		  . #x3055)	; さ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3056)	; ざ
     (=jis-x0208		. #x2436)	; &I-J90-2436; [04-22]
     (=gb2312		. #x2436)	; &I-G0-2436; [04-22]
@@ -268,7 +304,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3057 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER SI")
+      (=ucs		  . #x3057)	; し
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3058)	; じ
     (=jis-x0208		. #x2438)	; &I-J90-2438; [04-24]
     (=gb2312		. #x2438)	; &I-G0-2438; [04-24]
@@ -291,7 +333,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3059 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER SU")
+      (=ucs		  . #x3059)	; す
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x305A)	; ず
     (=jis-x0208		. #x243A)	; &I-J90-243A; [04-26]
     (=gb2312		. #x243A)	; &I-G0-243A; [04-26]
@@ -314,7 +362,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x305B #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER SE")
+      (=ucs		  . #x305B)	; せ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x305C)	; ぜ
     (=jis-x0208		. #x243C)	; &I-J90-243C; [04-28]
     (=gb2312		. #x243C)	; &I-G0-243C; [04-28]
@@ -337,7 +391,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x305D #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER SO")
+      (=ucs		  . #x305D)	; そ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x305E)	; ぞ
     (=jis-x0208		. #x243E)	; &I-J90-243E; [04-30]
     (=gb2312		. #x243E)	; &I-G0-243E; [04-30]
@@ -360,7 +420,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x305F #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER TA")
+      (=ucs		  . #x305F)	; た
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3060)	; だ
     (=jis-x0208		. #x2440)	; &I-J90-2440; [04-32]
     (=gb2312		. #x2440)	; &I-G0-2440; [04-32]
@@ -383,7 +449,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3061 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER TI")
+      (=ucs		  . #x3061)	; ち
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3062)	; ぢ
     (=jis-x0208		. #x2442)	; &I-J90-2442; [04-34]
     (=gb2312		. #x2442)	; &I-G0-2442; [04-34]
@@ -418,7 +490,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3064 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER TU")
+      (=ucs		  . #x3064)	; つ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3065)	; づ
     (=jis-x0208		. #x2445)	; &I-J90-2445; [04-37]
     (=gb2312		. #x2445)	; &I-G0-2445; [04-37]
@@ -441,7 +519,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3066 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER TE")
+      (=ucs		  . #x3066)	; て
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3067)	; で
     (=jis-x0208		. #x2447)	; &I-J90-2447; [04-39]
     (=gb2312		. #x2447)	; &I-G0-2447; [04-39]
@@ -464,7 +548,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3068 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER TO")
+      (=ucs		  . #x3068)	; と
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3069)	; ど
     (=jis-x0208		. #x2449)	; &I-J90-2449; [04-41]
     (=gb2312		. #x2449)	; &I-G0-2449; [04-41]
@@ -542,7 +632,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x306F #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HA")
+      (=ucs		  . #x306F)	; は
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3070)	; ば
     (=jis-x0208		. #x2450)	; &I-J90-2450; [04-48]
     (=gb2312		. #x2450)	; &I-G0-2450; [04-48]
@@ -554,7 +650,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x306F #x309A)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HA")
+      (=ucs		  . #x306F)	; は
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x3071)	; ぱ
     (=jis-x0208		. #x2451)	; &I-J90-2451; [04-49]
     (=gb2312		. #x2451)	; &I-G0-2451; [04-49]
@@ -577,7 +679,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3072 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HI")
+      (=ucs		  . #x3072)	; ひ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3073)	; び
     (=jis-x0208		. #x2453)	; &I-J90-2453; [04-51]
     (=gb2312		. #x2453)	; &I-G0-2453; [04-51]
@@ -589,7 +697,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3072 #x309A)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HI")
+      (=ucs		  . #x3072)	; ひ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x3074)	; ぴ
     (=jis-x0208		. #x2454)	; &I-J90-2454; [04-52]
     (=gb2312		. #x2454)	; &I-G0-2454; [04-52]
@@ -612,7 +726,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3075 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HU")
+      (=ucs		  . #x3075)	; ふ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3076)	; ぶ
     (=jis-x0208		. #x2456)	; &I-J90-2456; [04-54]
     (=gb2312		. #x2456)	; &I-G0-2456; [04-54]
@@ -624,7 +744,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3075 #x309A)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HU")
+      (=ucs		  . #x3075)	; ふ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x3077)	; ぷ
     (=jis-x0208		. #x2457)	; &I-J90-2457; [04-55]
     (=gb2312		. #x2457)	; &I-G0-2457; [04-55]
@@ -647,7 +773,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3078 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HE")
+      (=ucs		  . #x3078)	; へ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3079)	; べ
     (=jis-x0208		. #x2459)	; &I-J90-2459; [04-57]
     (=gb2312		. #x2459)	; &I-G0-2459; [04-57]
@@ -659,7 +791,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3078 #x309A)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HE")
+      (=ucs		  . #x3078)	; へ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x307A)	; ぺ
     (=jis-x0208		. #x245A)	; &I-J90-245A; [04-58]
     (=gb2312		. #x245A)	; &I-G0-245A; [04-58]
@@ -682,7 +820,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x307B #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HO")
+      (=ucs		  . #x307B)	; ほ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x307C)	; ぼ
     (=jis-x0208		. #x245C)	; &I-J90-245C; [04-60]
     (=gb2312		. #x245C)	; &I-G0-245C; [04-60]
@@ -694,7 +838,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x307B #x309A)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER HO")
+      (=ucs		  . #x307B)	; ほ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x307D)	; ぽ
     (=jis-x0208		. #x245D)	; &I-J90-245D; [04-61]
     (=gb2312		. #x245D)	; &I-G0-245D; [04-61]
@@ -952,7 +1102,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x3046 #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA LETTER U")
+      (=ucs		  . #x3046)	; う
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x3094)	; ゔ
     (=jis-x0213-1-2000	. #x2474)	; &I-JX1-2474; [04-84]
     (=jef-china3	. #x78C5)	; &I-JC3-78C5;
@@ -986,7 +1142,14 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x3099)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x309B)	; ゛
     (=jis-x0208		. #x212B)	; &I-J90-212B; [01-11]
     ))
@@ -995,7 +1158,14 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x309A)
+    (=decomposition
+     compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x309C)	; ゜
     (=jis-x0208		. #x212C)	; &I-J90-212C; [01-12]
     ))
@@ -1013,7 +1183,13 @@
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x309D #x3099)
+    (=decomposition
+     ((name		  . "HIRAGANA ITERATION MARK")
+      (=ucs		  . #x309D)	; ゝ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x309E)	; ゞ
     (=jis-x0208		. #x2136)	; &I-J90-2136; [01-22]
     (=big5-eten		. #xC6DD)	; &B-C6DD;
diff --git a/lisp/utf-2000/u030A0-Katakana.el b/lisp/utf-2000/u030A0-Katakana.el
index 2b2a039..cf2a42c 100644
--- a/lisp/utf-2000/u030A0-Katakana.el
+++ b/lisp/utf-2000/u030A0-Katakana.el
@@ -135,7 +135,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30AB #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER KA")
+      (=ucs		  . #x30AB)	; カ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30AC)	; ガ
     (=jis-x0208		. #x252C)	; &I-J90-252C; [05-12]
     (=gb2312		. #x252C)	; &I-G0-252C; [05-12]
@@ -158,7 +164,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30AD #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER KI")
+      (=ucs		  . #x30AD)	; キ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30AE)	; ギ
     (=jis-x0208		. #x252E)	; &I-J90-252E; [05-14]
     (=gb2312		. #x252E)	; &I-G0-252E; [05-14]
@@ -181,7 +193,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30AF #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER KU")
+      (=ucs		  . #x30AF)	; ク
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30B0)	; グ
     (=jis-x0208		. #x2530)	; &I-J90-2530; [05-16]
     (=gb2312		. #x2530)	; &I-G0-2530; [05-16]
@@ -204,7 +222,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30B1 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER KE")
+      (=ucs		  . #x30B1)	; ケ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30B2)	; ゲ
     (=jis-x0208		. #x2532)	; &I-J90-2532; [05-18]
     (=gb2312		. #x2532)	; &I-G0-2532; [05-18]
@@ -227,7 +251,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30B3 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER KO")
+      (=ucs		  . #x30B3)	; コ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30B4)	; ゴ
     (=jis-x0208		. #x2534)	; &I-J90-2534; [05-20]
     (=gb2312		. #x2534)	; &I-G0-2534; [05-20]
@@ -250,7 +280,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30B5 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER SA")
+      (=ucs		  . #x30B5)	; サ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30B6)	; ザ
     (=jis-x0208		. #x2536)	; &I-J90-2536; [05-22]
     (=gb2312		. #x2536)	; &I-G0-2536; [05-22]
@@ -273,7 +309,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30B7 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER SI")
+      (=ucs		  . #x30B7)	; シ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30B8)	; ジ
     (=jis-x0208		. #x2538)	; &I-J90-2538; [05-24]
     (=gb2312		. #x2538)	; &I-G0-2538; [05-24]
@@ -296,7 +338,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30B9 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER SU")
+      (=ucs		  . #x30B9)	; ス
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30BA)	; ズ
     (=jis-x0208		. #x253A)	; &I-J90-253A; [05-26]
     (=gb2312		. #x253A)	; &I-G0-253A; [05-26]
@@ -319,7 +367,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30BB #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER SE")
+      (=ucs		  . #x30BB)	; セ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30BC)	; ゼ
     (=jis-x0208		. #x253C)	; &I-J90-253C; [05-28]
     (=gb2312		. #x253C)	; &I-G0-253C; [05-28]
@@ -342,7 +396,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30BD #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER SO")
+      (=ucs		  . #x30BD)	; ソ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30BE)	; ゾ
     (=jis-x0208		. #x253E)	; &I-J90-253E; [05-30]
     (=gb2312		. #x253E)	; &I-G0-253E; [05-30]
@@ -365,7 +425,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30BF #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER TA")
+      (=ucs		  . #x30BF)	; タ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30C0)	; ダ
     (=jis-x0208		. #x2540)	; &I-J90-2540; [05-32]
     (=gb2312		. #x2540)	; &I-G0-2540; [05-32]
@@ -388,7 +454,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30C1 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER TI")
+      (=ucs		  . #x30C1)	; チ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30C2)	; ヂ
     (=jis-x0208		. #x2542)	; &I-J90-2542; [05-34]
     (=gb2312		. #x2542)	; &I-G0-2542; [05-34]
@@ -423,7 +495,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30C4 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER TU")
+      (=ucs		  . #x30C4)	; ツ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30C5)	; ヅ
     (=jis-x0208		. #x2545)	; &I-J90-2545; [05-37]
     (=gb2312		. #x2545)	; &I-G0-2545; [05-37]
@@ -446,7 +524,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30C6 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER TE")
+      (=ucs		  . #x30C6)	; テ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30C7)	; デ
     (=jis-x0208		. #x2547)	; &I-J90-2547; [05-39]
     (=gb2312		. #x2547)	; &I-G0-2547; [05-39]
@@ -469,7 +553,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30C8 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER TO")
+      (=ucs		  . #x30C8)	; ト
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30C9)	; ド
     (=jis-x0208		. #x2549)	; &I-J90-2549; [05-41]
     (=gb2312		. #x2549)	; &I-G0-2549; [05-41]
@@ -547,7 +637,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30CF #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HA")
+      (=ucs		  . #x30CF)	; ハ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30D0)	; バ
     (=jis-x0208		. #x2550)	; &I-J90-2550; [05-48]
     (=gb2312		. #x2550)	; &I-G0-2550; [05-48]
@@ -559,7 +655,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30CF #x309A)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HA")
+      (=ucs		  . #x30CF)	; ハ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x30D1)	; パ
     (=jis-x0208		. #x2551)	; &I-J90-2551; [05-49]
     (=gb2312		. #x2551)	; &I-G0-2551; [05-49]
@@ -582,7 +684,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30D2 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HI")
+      (=ucs		  . #x30D2)	; ヒ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30D3)	; ビ
     (=jis-x0208		. #x2553)	; &I-J90-2553; [05-51]
     (=gb2312		. #x2553)	; &I-G0-2553; [05-51]
@@ -594,7 +702,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30D2 #x309A)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HI")
+      (=ucs		  . #x30D2)	; ヒ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x30D4)	; ピ
     (=jis-x0208		. #x2554)	; &I-J90-2554; [05-52]
     (=gb2312		. #x2554)	; &I-G0-2554; [05-52]
@@ -617,7 +731,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30D5 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HU")
+      (=ucs		  . #x30D5)	; フ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30D6)	; ブ
     (=jis-x0208		. #x2556)	; &I-J90-2556; [05-54]
     (=gb2312		. #x2556)	; &I-G0-2556; [05-54]
@@ -629,7 +749,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30D5 #x309A)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HU")
+      (=ucs		  . #x30D5)	; フ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x30D7)	; プ
     (=jis-x0208		. #x2557)	; &I-J90-2557; [05-55]
     (=gb2312		. #x2557)	; &I-G0-2557; [05-55]
@@ -652,7 +778,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30D8 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HE")
+      (=ucs		  . #x30D8)	; ヘ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30D9)	; ベ
     (=jis-x0208		. #x2559)	; &I-J90-2559; [05-57]
     (=gb2312		. #x2559)	; &I-G0-2559; [05-57]
@@ -664,7 +796,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30D8 #x309A)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HE")
+      (=ucs		  . #x30D8)	; ヘ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x30DA)	; ペ
     (=jis-x0208		. #x255A)	; &I-J90-255A; [05-58]
     (=gb2312		. #x255A)	; &I-G0-255A; [05-58]
@@ -687,7 +825,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30DB #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HO")
+      (=ucs		  . #x30DB)	; ホ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30DC)	; ボ
     (=jis-x0208		. #x255C)	; &I-J90-255C; [05-60]
     (=gb2312		. #x255C)	; &I-G0-255C; [05-60]
@@ -699,7 +843,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30DB #x309A)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER HO")
+      (=ucs		  . #x30DB)	; ホ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK")
+      (=ucs		  . #x309A)	; ゚
+      ))
     (=ucs		. #x30DD)	; ポ
     (=jis-x0208		. #x255D)	; &I-J90-255D; [05-61]
     (=gb2312		. #x255D)	; &I-G0-255D; [05-61]
@@ -957,7 +1107,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30A6 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER U")
+      (=ucs		  . #x30A6)	; ウ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30F4)	; ヴ
     (=jis-x0208		. #x2574)	; &I-J90-2574; [05-84]
     (=gb2312		. #x2574)	; &I-G0-2574; [05-84]
@@ -993,7 +1149,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30EF #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER WA")
+      (=ucs		  . #x30EF)	; ワ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30F7)	; ヷ
     (=jis-x0213-1-2000	. #x2772)	; &I-JX1-2772; [07-82]
     ))
@@ -1002,7 +1164,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30F0 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER WI")
+      (=ucs		  . #x30F0)	; ヰ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30F8)	; ヸ
     (=jis-x0213-1-2000	. #x2773)	; &I-JX1-2773; [07-83]
     ))
@@ -1011,7 +1179,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30F1 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER WE")
+      (=ucs		  . #x30F1)	; ヱ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30F9)	; ヹ
     (=jis-x0213-1-2000	. #x2774)	; &I-JX1-2774; [07-84]
     ))
@@ -1020,7 +1194,13 @@
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30F2 #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA LETTER WO")
+      (=ucs		  . #x30F2)	; ヲ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30FA)	; ヺ
     (=jis-x0213-1-2000	. #x2775)	; &I-JX1-2775; [07-85]
     ))
@@ -1056,7 +1236,13 @@
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x30FD #x3099)
+    (=decomposition
+     ((name		  . "KATAKANA ITERATION MARK")
+      (=ucs		  . #x30FD)	; ヽ
+      )
+     ((name . "COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK")
+      (=ucs		  . #x3099)	; ゙
+      ))
     (=ucs		. #x30FE)	; ヾ
     (=jis-x0208		. #x2134)	; &I-J90-2134; [01-20]
     (=big5-eten		. #xC6DB)	; &B-C6DB;