X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Futf-2000%2Fu01F00-Greek-Extended.el;h=9306640a083b3c942edcacc87cb0c5cec75a77da;hb=bdbfb7b230afb509927c4d0bde596fde7451899a;hp=7a184d7ca2a828467a4900023599df19968721a0;hpb=ed79ca47b430a917433a5f779c37c2f7c8ee11ba;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/utf-2000/u01F00-Greek-Extended.el b/lisp/utf-2000/u01F00-Greek-Extended.el
index 7a184d7..9306640 100644
--- a/lisp/utf-2000/u01F00-Greek-Extended.el
+++ b/lisp/utf-2000/u01F00-Greek-Extended.el
@@ -4,871 +4,1309 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F00)	; ἀ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
       (=ucs		  . #x1F08)	; Ἀ
       ))
-    (=ucs		. #x1F00)	; ἀ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH DASIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F01)	; ἁ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
       (=ucs		  . #x1F09)	; Ἁ
       ))
-    (=ucs		. #x1F01)	; ἁ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F02)	; ἂ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA")
       (=ucs		  . #x1F0A)	; Ἂ
       ))
-    (=ucs		. #x1F02)	; ἂ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F03)	; ἃ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA")
       (=ucs		  . #x1F0B)	; Ἃ
       ))
-    (=ucs		. #x1F03)	; ἃ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F04)	; ἄ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA")
       (=ucs		  . #x1F0C)	; Ἄ
       ))
-    (=ucs		. #x1F04)	; ἄ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F05)	; ἅ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA")
       (=ucs		  . #x1F0D)	; Ἅ
       ))
-    (=ucs		. #x1F05)	; ἅ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F06)	; ἆ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F0E)	; Ἆ
       ))
-    (=ucs		. #x1F06)	; ἆ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F07)	; ἇ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F0F)	; Ἇ
       ))
-    (=ucs		. #x1F07)	; ἇ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA WITH PSILI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0313)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F08)	; Ἀ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
       (=ucs		  . #x1F00)	; ἀ
       ))
-    (=ucs		. #x1F08)	; Ἀ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F09)	; Ἁ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
       (=ucs		  . #x1F01)	; ἁ
       ))
-    (=ucs		. #x1F09)	; Ἁ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F0A)	; Ἂ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA")
       (=ucs		  . #x1F02)	; ἂ
       ))
-    (=ucs		. #x1F0A)	; Ἂ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F0B)	; Ἃ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA")
       (=ucs		  . #x1F03)	; ἃ
       ))
-    (=ucs		. #x1F0B)	; Ἃ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F0C)	; Ἄ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA")
       (=ucs		  . #x1F04)	; ἄ
       ))
-    (=ucs		. #x1F0C)	; Ἄ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F0D)	; Ἅ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA")
       (=ucs		  . #x1F05)	; ἅ
       ))
-    (=ucs		. #x1F0D)	; Ἅ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F0E)	; Ἆ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F06)	; ἆ
       ))
-    (=ucs		. #x1F0E)	; Ἆ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F0F)	; Ἇ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F07)	; ἇ
       ))
-    (=ucs		. #x1F0F)	; Ἇ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER EPSILON WITH PSILI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B5 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F10)	; ἐ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH PSILI")
       (=ucs		  . #x1F18)	; Ἐ
       ))
-    (=ucs		. #x1F10)	; ἐ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER EPSILON WITH DASIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B5 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F11)	; ἑ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH DASIA")
       (=ucs		  . #x1F19)	; Ἑ
       ))
-    (=ucs		. #x1F11)	; ἑ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F10 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F10)	; ἐ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F12)	; ἒ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA")
       (=ucs		  . #x1F1A)	; Ἒ
       ))
-    (=ucs		. #x1F12)	; ἒ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F11 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F11)	; ἑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F13)	; ἓ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F1B)	; Ἓ
       ))
-    (=ucs		. #x1F13)	; ἓ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F10 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F10)	; ἐ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F14)	; ἔ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA")
       (=ucs		  . #x1F1C)	; Ἔ
       ))
-    (=ucs		. #x1F14)	; ἔ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F11 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F11)	; ἑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F15)	; ἕ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F1D)	; Ἕ
       ))
-    (=ucs		. #x1F15)	; ἕ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER EPSILON WITH PSILI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0395 #x0313)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F18)	; Ἐ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH PSILI")
       (=ucs		  . #x1F10)	; ἐ
       ))
-    (=ucs		. #x1F18)	; Ἐ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER EPSILON WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0395 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F19)	; Ἑ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH DASIA")
       (=ucs		  . #x1F11)	; ἑ
       ))
-    (=ucs		. #x1F19)	; Ἑ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F18 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F18)	; Ἐ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F1A)	; Ἒ
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA")
       (=ucs		  . #x1F12)	; ἒ
       ))
-    (=ucs		. #x1F1A)	; Ἒ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F19 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F19)	; Ἑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F1B)	; Ἓ
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F13)	; ἓ
       ))
-    (=ucs		. #x1F1B)	; Ἓ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F18 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH PSILI")
+      (=ucs		  . #x1F18)	; Ἐ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F1C)	; Ἔ
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA")
       (=ucs		  . #x1F14)	; ἔ
       ))
-    (=ucs		. #x1F1C)	; Ἔ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F19 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH DASIA")
+      (=ucs		  . #x1F19)	; Ἑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F1D)	; Ἕ
     (->lowercase
      ((name . "GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F15)	; ἕ
       ))
-    (=ucs		. #x1F1D)	; Ἕ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH PSILI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F20)	; á¼ 
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
       (=ucs		  . #x1F28)	; Ἠ
       ))
-    (=ucs		. #x1F20)	; á¼ 
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH DASIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F21)	; ἡ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
       (=ucs		  . #x1F29)	; Ἡ
       ))
-    (=ucs		. #x1F21)	; ἡ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH PSILI AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F22)	; á¼¢
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA")
       (=ucs		  . #x1F2A)	; Ἢ
       ))
-    (=ucs		. #x1F22)	; á¼¢
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH DASIA AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F23)	; á¼£
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA")
       (=ucs		  . #x1F2B)	; Ἣ
       ))
-    (=ucs		. #x1F23)	; á¼£
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH PSILI AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F24)	; ἤ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA")
       (=ucs		  . #x1F2C)	; Ἤ
       ))
-    (=ucs		. #x1F24)	; ἤ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH DASIA AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F25)	; á¼¥
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA")
       (=ucs		  . #x1F2D)	; á¼­
       ))
-    (=ucs		. #x1F25)	; á¼¥
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F26)	; ἦ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F2E)	; á¼®
       ))
-    (=ucs		. #x1F26)	; ἦ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F27)	; ἧ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F2F)	; Ἧ
       ))
-    (=ucs		. #x1F27)	; ἧ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH PSILI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0313)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F28)	; Ἠ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
       (=ucs		  . #x1F20)	; á¼ 
       ))
-    (=ucs		. #x1F28)	; Ἠ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F29)	; Ἡ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
       (=ucs		  . #x1F21)	; ἡ
       ))
-    (=ucs		. #x1F29)	; Ἡ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F2A)	; Ἢ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA")
       (=ucs		  . #x1F22)	; á¼¢
       ))
-    (=ucs		. #x1F2A)	; Ἢ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F2B)	; Ἣ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA")
       (=ucs		  . #x1F23)	; á¼£
       ))
-    (=ucs		. #x1F2B)	; Ἣ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F2C)	; Ἤ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA")
       (=ucs		  . #x1F24)	; ἤ
       ))
-    (=ucs		. #x1F2C)	; Ἤ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F2D)	; á¼­
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA")
       (=ucs		  . #x1F25)	; á¼¥
       ))
-    (=ucs		. #x1F2D)	; á¼­
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F2E)	; á¼®
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F26)	; ἦ
       ))
-    (=ucs		. #x1F2E)	; á¼®
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F2F)	; Ἧ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F27)	; ἧ
       ))
-    (=ucs		. #x1F2F)	; Ἧ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH PSILI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F30)	; á¼°
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
       (=ucs		  . #x1F38)	; Ἰ
       ))
-    (=ucs		. #x1F30)	; á¼°
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH DASIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F31)	; á¼±
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
       (=ucs		  . #x1F39)	; á¼¹
       ))
-    (=ucs		. #x1F31)	; á¼±
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH PSILI AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F30 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F30)	; á¼°
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F32)	; á¼²
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA")
       (=ucs		  . #x1F3A)	; Ἲ
       ))
-    (=ucs		. #x1F32)	; á¼²
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH DASIA AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F31 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F31)	; á¼±
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F33)	; á¼³
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA")
       (=ucs		  . #x1F3B)	; á¼»
       ))
-    (=ucs		. #x1F33)	; á¼³
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH PSILI AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F30 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F30)	; á¼°
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F34)	; á¼´
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA")
       (=ucs		  . #x1F3C)	; á¼¼
       ))
-    (=ucs		. #x1F34)	; á¼´
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH DASIA AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F31 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F31)	; á¼±
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F35)	; á¼µ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA")
       (=ucs		  . #x1F3D)	; á¼½
       ))
-    (=ucs		. #x1F35)	; á¼µ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F30 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F30)	; á¼°
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F36)	; ἶ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F3E)	; á¼¾
       ))
-    (=ucs		. #x1F36)	; ἶ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F31 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F31)	; á¼±
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F37)	; á¼·
     (->uppercase
      ((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F3F)	; Ἷ
       ))
-    (=ucs		. #x1F37)	; á¼·
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER IOTA WITH PSILI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0313)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F38)	; Ἰ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH PSILI")
       (=ucs		  . #x1F30)	; á¼°
       ))
-    (=ucs		. #x1F38)	; Ἰ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER IOTA WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F39)	; á¼¹
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH DASIA")
       (=ucs		  . #x1F31)	; á¼±
       ))
-    (=ucs		. #x1F39)	; á¼¹
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F38 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F38)	; Ἰ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F3A)	; Ἲ
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH PSILI AND VARIA")
       (=ucs		  . #x1F32)	; á¼²
       ))
-    (=ucs		. #x1F3A)	; Ἲ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F39 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F39)	; á¼¹
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F3B)	; á¼»
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH DASIA AND VARIA")
       (=ucs		  . #x1F33)	; á¼³
       ))
-    (=ucs		. #x1F3B)	; á¼»
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F38 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F38)	; Ἰ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F3C)	; á¼¼
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH PSILI AND OXIA")
       (=ucs		  . #x1F34)	; á¼´
       ))
-    (=ucs		. #x1F3C)	; á¼¼
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F39 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F39)	; á¼¹
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F3D)	; á¼½
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH DASIA AND OXIA")
       (=ucs		  . #x1F35)	; á¼µ
       ))
-    (=ucs		. #x1F3D)	; á¼½
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F38 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH PSILI")
+      (=ucs		  . #x1F38)	; Ἰ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F3E)	; á¼¾
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F36)	; ἶ
       ))
-    (=ucs		. #x1F3E)	; á¼¾
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F39 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH DASIA")
+      (=ucs		  . #x1F39)	; á¼¹
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F3F)	; Ἷ
     (->lowercase
      ((name . "GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F37)	; á¼·
       ))
-    (=ucs		. #x1F3F)	; Ἷ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMICRON WITH PSILI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03BF #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F40)	; ὀ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH PSILI")
       (=ucs		  . #x1F48)	; Ὀ
       ))
-    (=ucs		. #x1F40)	; ὀ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMICRON WITH DASIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03BF #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F41)	; ὁ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH DASIA")
       (=ucs		  . #x1F49)	; Ὁ
       ))
-    (=ucs		. #x1F41)	; ὁ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F40 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F40)	; ὀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F42)	; ὂ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA")
       (=ucs		  . #x1F4A)	; Ὂ
       ))
-    (=ucs		. #x1F42)	; ὂ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F41 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F41)	; ὁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F43)	; ὃ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA")
       (=ucs		  . #x1F4B)	; Ὃ
       ))
-    (=ucs		. #x1F43)	; ὃ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F40 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F40)	; ὀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F44)	; ὄ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA")
       (=ucs		  . #x1F4C)	; Ὄ
       ))
-    (=ucs		. #x1F44)	; ὄ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F41 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F41)	; ὁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F45)	; ὅ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA")
       (=ucs		  . #x1F4D)	; Ὅ
       ))
-    (=ucs		. #x1F45)	; ὅ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMICRON WITH PSILI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x039F #x0313)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F48)	; Ὀ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH PSILI")
       (=ucs		  . #x1F40)	; ὀ
       ))
-    (=ucs		. #x1F48)	; Ὀ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMICRON WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x039F #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F49)	; Ὁ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH DASIA")
       (=ucs		  . #x1F41)	; ὁ
       ))
-    (=ucs		. #x1F49)	; Ὁ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F48 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F48)	; Ὀ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F4A)	; Ὂ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA")
       (=ucs		  . #x1F42)	; ὂ
       ))
-    (=ucs		. #x1F4A)	; Ὂ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F49 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F49)	; Ὁ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F4B)	; Ὃ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA")
       (=ucs		  . #x1F43)	; ὃ
       ))
-    (=ucs		. #x1F4B)	; Ὃ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F48 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH PSILI")
+      (=ucs		  . #x1F48)	; Ὀ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F4C)	; Ὄ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA")
       (=ucs		  . #x1F44)	; ὄ
       ))
-    (=ucs		. #x1F4C)	; Ὄ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F49 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH DASIA")
+      (=ucs		  . #x1F49)	; Ὁ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F4D)	; Ὅ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA")
       (=ucs		  . #x1F45)	; ὅ
       ))
-    (=ucs		. #x1F4D)	; Ὅ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER UPSILON WITH PSILI")
     (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,19 +1314,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F51)	; ὑ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
       (=ucs		  . #x1F59)	; Ὑ
       ))
-    (=ucs		. #x1F51)	; ὑ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA")
     (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,19 +1346,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F51 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F51)	; ὑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F53)	; ὓ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F5B)	; Ὓ
       ))
-    (=ucs		. #x1F53)	; ὓ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA")
     (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,19 +1378,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F51 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F51)	; ὑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F55)	; ὕ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F5D)	; Ὕ
       ))
-    (=ucs		. #x1F55)	; ὕ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI")
     (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,264 +1410,396 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F51 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F51)	; ὑ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F57)	; ὗ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F5F)	; Ὗ
       ))
-    (=ucs		. #x1F57)	; ὗ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER UPSILON WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F59)	; Ὑ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH DASIA")
       (=ucs		  . #x1F51)	; ὑ
       ))
-    (=ucs		. #x1F59)	; Ὑ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F59 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F59)	; Ὑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F5B)	; Ὓ
     (->lowercase
      ((name . "GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA")
       (=ucs		  . #x1F53)	; ὓ
       ))
-    (=ucs		. #x1F5B)	; Ὓ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F59 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F59)	; Ὑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F5D)	; Ὕ
     (->lowercase
      ((name . "GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA")
       (=ucs		  . #x1F55)	; ὕ
       ))
-    (=ucs		. #x1F5D)	; Ὕ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F59 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH DASIA")
+      (=ucs		  . #x1F59)	; Ὑ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F5F)	; Ὗ
     (->lowercase
      ((name . "GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F57)	; ὗ
       ))
-    (=ucs		. #x1F5F)	; Ὗ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMEGA WITH PSILI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0313)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F60)	; á½ 
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
       (=ucs		  . #x1F68)	; Ὠ
       ))
-    (=ucs		. #x1F60)	; á½ 
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMEGA WITH DASIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F61)	; ὡ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
       (=ucs		  . #x1F69)	; Ὡ
       ))
-    (=ucs		. #x1F61)	; ὡ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F62)	; á½¢
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA")
       (=ucs		  . #x1F6A)	; Ὢ
       ))
-    (=ucs		. #x1F62)	; á½¢
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F63)	; á½£
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA")
       (=ucs		  . #x1F6B)	; Ὣ
       ))
-    (=ucs		. #x1F63)	; á½£
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F64)	; ὤ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA")
       (=ucs		  . #x1F6C)	; Ὤ
       ))
-    (=ucs		. #x1F64)	; ὤ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0301)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F65)	; á½¥
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA")
       (=ucs		  . #x1F6D)	; á½­
       ))
-    (=ucs		. #x1F65)	; á½¥
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F66)	; ὦ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F6E)	; á½®
       ))
-    (=ucs		. #x1F66)	; ὦ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0342)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F67)	; ὧ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F6F)	; Ὧ
       ))
-    (=ucs		. #x1F67)	; ὧ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMEGA WITH PSILI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0313)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING COMMA ABOVE")
+      (=ucs		  . #x0313)	; ̓
+      ))
+    (=ucs		. #x1F68)	; Ὠ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
       (=ucs		  . #x1F60)	; á½ 
       ))
-    (=ucs		. #x1F68)	; Ὠ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMEGA WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1F69)	; Ὡ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
       (=ucs		  . #x1F61)	; ὡ
       ))
-    (=ucs		. #x1F69)	; Ὡ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F6A)	; Ὢ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA")
       (=ucs		  . #x1F62)	; á½¢
       ))
-    (=ucs		. #x1F6A)	; Ὢ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F6B)	; Ὣ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA")
       (=ucs		  . #x1F63)	; á½£
       ))
-    (=ucs		. #x1F6B)	; Ὣ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F6C)	; Ὤ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA")
       (=ucs		  . #x1F64)	; ὤ
       ))
-    (=ucs		. #x1F6C)	; Ὤ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0301)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs		. #x1F6D)	; á½­
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA")
       (=ucs		  . #x1F65)	; á½¥
       ))
-    (=ucs		. #x1F6D)	; á½­
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F6E)	; á½®
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI")
       (=ucs		  . #x1F66)	; ὦ
       ))
-    (=ucs		. #x1F6E)	; á½®
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0342)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING GREEK PERISPOMENI")
+      (=ucs		  . #x0342)	; ͂
+      ))
+    (=ucs		. #x1F6F)	; Ὧ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI")
       (=ucs		  . #x1F67)	; ὧ
       ))
-    (=ucs		. #x1F6F)	; Ὧ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F70)	; á½°
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH VARIA")
       (=ucs		  . #x1FBA)	; Ὰ
       ))
-    (=ucs		. #x1F70)	; á½°
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER ALPHA WITH GRAVE")
@@ -1201,21 +1807,30 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0251 #x0300)
-    (=jis-x0213-1-2000	. #x2B46)	; &JX1-2B46; [11-38]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER ALPHA")
+      (=ucs		  . #x0251)	; ɑ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
     (=ucs@jis		. #x1F70)	; &JX1-2B46;
+    (=jis-x0213-1	. #x2B46)	; &JX1-2B46; [11-38]
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AC)
+    (=ucs		. #x1F71)	; á½±
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x03AC)	; ά
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH OXIA")
       (=ucs		  . #x1FBB)	; á¾»
       ))
-    (=ucs		. #x1F71)	; á½±
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER ALPHA WITH ACUTE")
@@ -1223,21 +1838,33 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0251 #x0301)
-    (=jis-x0213-1-2000	. #x2B47)	; &JX1-2B47; [11-39]
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER ALPHA")
+      (=ucs		  . #x0251)	; ɑ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
     (=ucs@jis		. #x1F71)	; &JX1-2B47;
+    (=jis-x0213-1	. #x2B47)	; &JX1-2B47; [11-39]
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER EPSILON WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B5 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER EPSILON")
+      (=ucs		  . #x03B5)	; ε
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F72)	; á½²
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH VARIA")
       (=ucs		  . #x1FC8)	; Ὲ
       ))
-    (=ucs		. #x1F72)	; á½²
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER OPEN E WITH GRAVE")
@@ -1245,24 +1872,33 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x025B #x0300)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER OPEN E")
+      (=ucs		  . #x025B)	; ɛ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs@jis		. #x1F72)	; &JX1-2B50;
+    (=jis-x0213-1	. #x2B50)	; &JX1-2B50; [11-48]
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER OPEN E WITH GRAVE")
       ))
-    (=jis-x0213-1-2000	. #x2B50)	; &JX1-2B50; [11-48]
-    (=ucs@jis		. #x1F72)	; &JX1-2B50;
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER EPSILON WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AD)
+    (=ucs		. #x1F73)	; á½³
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x03AD)	; έ
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER EPSILON WITH OXIA")
       (=ucs		  . #x1FC9)	; Έ
       ))
-    (=ucs		. #x1F73)	; á½³
     ))
 (define-char
   '((name		. "LATIN SMALL LETTER OPEN E WITH ACUTE")
@@ -1270,739 +1906,1096 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x025B #x0301)
+    (=decomposition
+     ((name		  . "LATIN SMALL LETTER OPEN E")
+      (=ucs		  . #x025B)	; ɛ
+      )
+     ((name		  . "COMBINING ACUTE ACCENT")
+      (=ucs		  . #x0301)	; ́
+      ))
+    (=ucs@jis		. #x1F73)	; &JX1-2B51;
+    (=jis-x0213-1	. #x2B51)	; &JX1-2B51; [11-49]
     (->uppercase
      ((name		  . "LATIN CAPITAL LETTER OPEN E WITH ACUTE")
       ))
-    (=jis-x0213-1-2000	. #x2B51)	; &JX1-2B51; [11-49]
-    (=ucs@jis		. #x1F73)	; &JX1-2B51;
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F74)	; á½´
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH VARIA")
       (=ucs		  . #x1FCA)	; Ὴ
       ))
-    (=ucs		. #x1F74)	; á½´
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ETA WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AE)
+    (=ucs		. #x1F75)	; á½µ
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER ETA WITH TONOS")
+      (=ucs		  . #x03AE)	; ή
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ETA WITH OXIA")
       (=ucs		  . #x1FCB)	; Ή
       ))
-    (=ucs		. #x1F75)	; á½µ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F76)	; ὶ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH VARIA")
       (=ucs		  . #x1FDA)	; Ὶ
       ))
-    (=ucs		. #x1F76)	; ὶ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03AF)
+    (=ucs		. #x1F77)	; á½·
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x03AF)	; ί
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH OXIA")
       (=ucs		  . #x1FDB)	; Ί
       ))
-    (=ucs		. #x1F77)	; á½·
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMICRON WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03BF #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMICRON")
+      (=ucs		  . #x03BF)	; ο
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F78)	; ὸ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH VARIA")
       (=ucs		  . #x1FF8)	; Ὸ
       ))
-    (=ucs		. #x1F78)	; ὸ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMICRON WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CC)
+    (=ucs		. #x1F79)	; á½¹
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x03CC)	; ό
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMICRON WITH OXIA")
       (=ucs		  . #x1FF9)	; Ό
       ))
-    (=ucs		. #x1F79)	; á½¹
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER UPSILON WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F7A)	; ὺ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH VARIA")
       (=ucs		  . #x1FEA)	; Ὺ
       ))
-    (=ucs		. #x1F7A)	; ὺ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER UPSILON WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CD)
+    (=ucs		. #x1F7B)	; á½»
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x03CD)	; ύ
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH OXIA")
       (=ucs		  . #x1FEB)	; á¿«
       ))
-    (=ucs		. #x1F7B)	; á½»
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMEGA WITH VARIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0300)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1F7C)	; á½¼
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH VARIA")
       (=ucs		  . #x1FFA)	; Ὼ
       ))
-    (=ucs		. #x1F7C)	; á½¼
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER OMEGA WITH OXIA")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03CE)
+    (=ucs		. #x1F7D)	; á½½
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x03CE)	; ώ
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER OMEGA WITH OXIA")
       (=ucs		  . #x1FFB)	; á¿»
       ))
-    (=ucs		. #x1F7D)	; á½½
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F00 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F00)	; ἀ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F80)	; ᾀ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F88)	; ᾈ
       ))
-    (=ucs		. #x1F80)	; ᾀ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F01 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F01)	; ἁ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F81)	; ᾁ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F89)	; ᾉ
       ))
-    (=ucs		. #x1F81)	; ᾁ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F02 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F02)	; ἂ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F82)	; ᾂ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8A)	; ᾊ
       ))
-    (=ucs		. #x1F82)	; ᾂ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F03 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F03)	; ἃ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F83)	; ᾃ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8B)	; ᾋ
       ))
-    (=ucs		. #x1F83)	; ᾃ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F04 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F04)	; ἄ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F84)	; ᾄ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8C)	; ᾌ
       ))
-    (=ucs		. #x1F84)	; ᾄ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F05 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F05)	; ἅ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F85)	; ᾅ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8D)	; ᾍ
       ))
-    (=ucs		. #x1F85)	; ᾅ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F06 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F06)	; ἆ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F86)	; ᾆ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8E)	; ᾎ
       ))
-    (=ucs		. #x1F86)	; ᾆ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F07 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F07)	; ἇ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F87)	; ᾇ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F8F)	; ᾏ
       ))
-    (=ucs		. #x1F87)	; ᾇ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F08 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH PSILI")
+      (=ucs		  . #x1F08)	; Ἀ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F88)	; ᾈ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F80)	; ᾀ
       ))
-    (=ucs		. #x1F88)	; ᾈ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F09 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH DASIA")
+      (=ucs		  . #x1F09)	; Ἁ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F89)	; ᾉ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F81)	; ᾁ
       ))
-    (=ucs		. #x1F89)	; ᾉ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0A #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F0A)	; Ἂ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F8A)	; ᾊ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F82)	; ᾂ
       ))
-    (=ucs		. #x1F8A)	; ᾊ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0B #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F0B)	; Ἃ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F8B)	; ᾋ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F83)	; ᾃ
       ))
-    (=ucs		. #x1F8B)	; ᾋ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0C #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F0C)	; Ἄ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F8C)	; ᾌ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F84)	; ᾄ
       ))
-    (=ucs		. #x1F8C)	; ᾌ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0D #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F0D)	; Ἅ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F8D)	; ᾍ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F85)	; ᾅ
       ))
-    (=ucs		. #x1F8D)	; ᾍ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0E #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F0E)	; Ἆ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F8E)	; ᾎ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F86)	; ᾆ
       ))
-    (=ucs		. #x1F8E)	; ᾎ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F0F #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F0F)	; Ἇ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F8F)	; ᾏ
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F87)	; ᾇ
       ))
-    (=ucs		. #x1F8F)	; ᾏ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F20 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F20)	; á¼ 
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F90)	; ᾐ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F98)	; ᾘ
       ))
-    (=ucs		. #x1F90)	; ᾐ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F21 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F21)	; ἡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F91)	; ᾑ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F99)	; ᾙ
       ))
-    (=ucs		. #x1F91)	; ᾑ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F22 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F22)	; á¼¢
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F92)	; ᾒ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9A)	; ᾚ
       ))
-    (=ucs		. #x1F92)	; ᾒ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F23 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F23)	; á¼£
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F93)	; ᾓ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9B)	; ᾛ
       ))
-    (=ucs		. #x1F93)	; ᾓ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F24 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F24)	; ἤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F94)	; ᾔ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9C)	; ᾜ
       ))
-    (=ucs		. #x1F94)	; ᾔ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F25 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F25)	; á¼¥
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F95)	; ᾕ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9D)	; ᾝ
       ))
-    (=ucs		. #x1F95)	; ᾕ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F26 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F26)	; ἦ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F96)	; ᾖ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9E)	; ᾞ
       ))
-    (=ucs		. #x1F96)	; ᾖ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F27 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F27)	; ἧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F97)	; ᾗ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1F9F)	; ᾟ
       ))
-    (=ucs		. #x1F97)	; ᾗ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F28 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH PSILI")
+      (=ucs		  . #x1F28)	; Ἠ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F98)	; ᾘ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F90)	; ᾐ
       ))
-    (=ucs		. #x1F98)	; ᾘ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F29 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH DASIA")
+      (=ucs		  . #x1F29)	; Ἡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F99)	; ᾙ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F91)	; ᾑ
       ))
-    (=ucs		. #x1F99)	; ᾙ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2A #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F2A)	; Ἢ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F9A)	; ᾚ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F92)	; ᾒ
       ))
-    (=ucs		. #x1F9A)	; ᾚ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2B #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F2B)	; Ἣ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F9B)	; ᾛ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F93)	; ᾓ
       ))
-    (=ucs		. #x1F9B)	; ᾛ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2C #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F2C)	; Ἤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F9C)	; ᾜ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F94)	; ᾔ
       ))
-    (=ucs		. #x1F9C)	; ᾜ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2D #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F2D)	; á¼­
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F9D)	; ᾝ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1F95)	; ᾕ
       ))
-    (=ucs		. #x1F9D)	; ᾝ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2E #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F2E)	; á¼®
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F9E)	; ᾞ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F96)	; ᾖ
       ))
-    (=ucs		. #x1F9E)	; ᾞ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F2F #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F2F)	; Ἧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1F9F)	; ᾟ
     (->lowercase
      ((name . "GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1F97)	; ᾗ
       ))
-    (=ucs		. #x1F9F)	; ᾟ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F60 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F60)	; á½ 
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA0)	; á¾ 
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI")
       (=ucs		  . #x1FA8)	; ᾨ
       ))
-    (=ucs		. #x1FA0)	; á¾ 
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F61 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F61)	; ὡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA1)	; ᾡ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FA9)	; ᾩ
       ))
-    (=ucs		. #x1FA1)	; ᾡ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F62 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F62)	; á½¢
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA2)	; á¾¢
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAA)	; ᾪ
       ))
-    (=ucs		. #x1FA2)	; á¾¢
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F63 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F63)	; á½£
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA3)	; á¾£
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAB)	; ᾫ
       ))
-    (=ucs		. #x1FA3)	; á¾£
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F64 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F64)	; ὤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA4)	; ᾤ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAC)	; ᾬ
       ))
-    (=ucs		. #x1FA4)	; ᾤ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F65 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F65)	; á½¥
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA5)	; á¾¥
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAD)	; á¾­
       ))
-    (=ucs		. #x1FA5)	; á¾¥
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F66 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F66)	; ὦ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA6)	; ᾦ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAE)	; á¾®
       ))
-    (=ucs		. #x1FA6)	; ᾦ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F67 #x0345)
+    (=decomposition
+     ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F67)	; ὧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA7)	; ᾧ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
       (=ucs		  . #x1FAF)	; ᾯ
       ))
-    (=ucs		. #x1FA7)	; ᾧ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F68 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH PSILI")
+      (=ucs		  . #x1F68)	; Ὠ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA8)	; ᾨ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA0)	; á¾ 
       ))
-    (=ucs		. #x1FA8)	; ᾨ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F69 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH DASIA")
+      (=ucs		  . #x1F69)	; Ὡ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FA9)	; ᾩ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA1)	; ᾡ
       ))
-    (=ucs		. #x1FA9)	; ᾩ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6A #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA")
+      (=ucs		  . #x1F6A)	; Ὢ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FAA)	; ᾪ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA2)	; á¾¢
       ))
-    (=ucs		. #x1FAA)	; ᾪ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6B #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA")
+      (=ucs		  . #x1F6B)	; Ὣ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FAB)	; ᾫ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA3)	; á¾£
       ))
-    (=ucs		. #x1FAB)	; ᾫ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6C #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA")
+      (=ucs		  . #x1F6C)	; Ὤ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FAC)	; ᾬ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA4)	; ᾤ
       ))
-    (=ucs		. #x1FAC)	; ᾬ
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6D #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA")
+      (=ucs		  . #x1F6D)	; á½­
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FAD)	; á¾­
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA5)	; á¾¥
       ))
-    (=ucs		. #x1FAD)	; á¾­
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6E #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI")
+      (=ucs		  . #x1F6E)	; á½®
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FAE)	; á¾®
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA6)	; ᾦ
       ))
-    (=ucs		. #x1FAE)	; á¾®
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x1F6F #x0345)
+    (=decomposition
+     ((name . "GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI")
+      (=ucs		  . #x1F6F)	; Ὧ
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FAF)	; ᾯ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI")
       (=ucs		  . #x1FA7)	; ᾧ
       ))
-    (=ucs		. #x1FAF)	; ᾯ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH VRACHY")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0306)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
+    (=ucs		. #x1FB0)	; á¾°
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH VRACHY")
       (=ucs		  . #x1FB8)	; Ᾰ
       ))
-    (=ucs		. #x1FB0)	; á¾°
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER ALPHA WITH MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0304)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x1FB1)	; á¾±
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER ALPHA WITH MACRON")
       (=ucs		  . #x1FB9)	; á¾¹
       ))
-    (=ucs		. #x1FB1)	; á¾±
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI")
     (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,19 +3003,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B1 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ALPHA")
+      (=ucs		  . #x03B1)	; α
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FB3)	; á¾³
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI")
       (=ucs		  . #x1FBC)	; á¾¼
       ))
-    (=ucs		. #x1FB3)	; á¾³
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI")
     (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,67 +3063,100 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0306)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
+    (=ucs		. #x1FB8)	; Ᾰ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH VRACHY")
       (=ucs		  . #x1FB0)	; á¾°
       ))
-    (=ucs		. #x1FB8)	; Ᾰ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA WITH MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0304)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x1FB9)	; á¾¹
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH MACRON")
       (=ucs		  . #x1FB1)	; á¾±
       ))
-    (=ucs		. #x1FB9)	; á¾¹
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA WITH VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FBA)	; Ὰ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH VARIA")
       (=ucs		  . #x1F70)	; á½°
       ))
-    (=ucs		. #x1FBA)	; Ὰ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ALPHA WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0386)
+    (=ucs		. #x1FBB)	; á¾»
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER ALPHA WITH TONOS")
+      (=ucs		  . #x0386)	; Ά
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ALPHA WITH OXIA")
       (=ucs		  . #x1F71)	; á½±
       ))
-    (=ucs		. #x1FBB)	; á¾»
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0391 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ALPHA")
+      (=ucs		  . #x0391)	; Α
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FBC)	; á¾¼
     (->lowercase
      ((name . "GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI")
       (=ucs		  . #x1FB3)	; á¾³
       ))
-    (=ucs		. #x1FBC)	; á¾¼
     ))
 (define-char
   '((name		. "GREEK KORONIS")
     (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,19 +3164,28 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9)
+    (=ucs		. #x1FBE)	; á¾¾
+    (->canonical
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      ))
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA")
       (=ucs		  . #x0399)	; Ι
       ))
-    (=ucs		. #x1FBE)	; á¾¾
     ))
 (define-char
   '((name		. "GREEK PSILI")
     (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 +3193,13 @@
     (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 +3207,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 +3221,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,19 +3235,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B7 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER ETA")
+      (=ucs		  . #x03B7)	; η
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FC3)	; ῃ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI")
       (=ucs		  . #x1FCC)	; ῌ
       ))
-    (=ucs		. #x1FC3)	; ῃ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI")
     (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 +3267,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 +3281,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,67 +3295,97 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0395 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER EPSILON")
+      (=ucs		  . #x0395)	; Ε
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FC8)	; Ὲ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH VARIA")
       (=ucs		  . #x1F72)	; á½²
       ))
-    (=ucs		. #x1FC8)	; Ὲ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER EPSILON WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0388)
+    (=ucs		. #x1FC9)	; Έ
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER EPSILON WITH TONOS")
+      (=ucs		  . #x0388)	; Έ
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER EPSILON WITH OXIA")
       (=ucs		  . #x1F73)	; á½³
       ))
-    (=ucs		. #x1FC9)	; Έ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FCA)	; Ὴ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH VARIA")
       (=ucs		  . #x1F74)	; á½´
       ))
-    (=ucs		. #x1FCA)	; Ὴ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0389)
+    (=ucs		. #x1FCB)	; Ή
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER ETA WITH TONOS")
+      (=ucs		  . #x0389)	; Ή
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH OXIA")
       (=ucs		  . #x1F75)	; á½µ
       ))
-    (=ucs		. #x1FCB)	; Ή
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0397 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER ETA")
+      (=ucs		  . #x0397)	; Η
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FCC)	; ῌ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI")
       (=ucs		  . #x1FC3)	; ῃ
       ))
-    (=ucs		. #x1FCC)	; ῌ
     ))
 (define-char
   '((name		. "GREEK PSILI AND VARIA")
     (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 +3393,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 +3407,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,31 +3421,49 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0306)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
+    (=ucs		. #x1FD0)	; ῐ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH VRACHY")
       (=ucs		  . #x1FD8)	; Ῐ
       ))
-    (=ucs		. #x1FD0)	; ῐ
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B9 #x0304)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER IOTA")
+      (=ucs		  . #x03B9)	; ι
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x1FD1)	; ῑ
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER IOTA WITH MACRON")
       (=ucs		  . #x1FD9)	; Ῑ
       ))
-    (=ucs		. #x1FD1)	; ῑ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA")
     (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,15 +3471,24 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0390)
     (=ucs		. #x1FD3)	; ΐ
+    (->canonical
+     ((name . "GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS")
+      (=ucs		  . #x0390)	; ΐ
+      ))
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER IOTA WITH PERISPOMENI")
     (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 +3496,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,55 +3510,82 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0306)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
+    (=ucs		. #x1FD8)	; Ῐ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH VRACHY")
       (=ucs		  . #x1FD0)	; ῐ
       ))
-    (=ucs		. #x1FD8)	; Ῐ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER IOTA WITH MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0304)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x1FD9)	; Ῑ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH MACRON")
       (=ucs		  . #x1FD1)	; ῑ
       ))
-    (=ucs		. #x1FD9)	; Ῑ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER IOTA WITH VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x0399 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER IOTA")
+      (=ucs		  . #x0399)	; Ι
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FDA)	; Ὶ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH VARIA")
       (=ucs		  . #x1F76)	; ὶ
       ))
-    (=ucs		. #x1FDA)	; Ὶ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER IOTA WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038A)
+    (=ucs		. #x1FDB)	; Ί
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER IOTA WITH TONOS")
+      (=ucs		  . #x038A)	; Ί
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER IOTA WITH OXIA")
       (=ucs		  . #x1F77)	; á½·
       ))
-    (=ucs		. #x1FDB)	; Ί
     ))
 (define-char
   '((name		. "GREEK DASIA AND VARIA")
     (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 +3593,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 +3607,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,31 +3621,49 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0306)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
+    (=ucs		. #x1FE0)	; á¿ 
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH VRACHY")
       (=ucs		  . #x1FE8)	; Ῠ
       ))
-    (=ucs		. #x1FE0)	; á¿ 
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER UPSILON WITH MACRON")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C5 #x0304)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER UPSILON")
+      (=ucs		  . #x03C5)	; υ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x1FE1)	; á¿¡
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER UPSILON WITH MACRON")
       (=ucs		  . #x1FE9)	; á¿©
       ))
-    (=ucs		. #x1FE1)	; á¿¡
     ))
 (define-char
   '((name . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA")
     (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,15 +3671,24 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03B0)
     (=ucs		. #x1FE3)	; á¿£
+    (->canonical
+     ((name . "GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS")
+      (=ucs		  . #x03B0)	; ΰ
+      ))
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER RHO WITH PSILI")
     (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,19 +3696,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C1 #x0314)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER RHO")
+      (=ucs		  . #x03C1)	; ρ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1FE5)	; á¿¥
     (->uppercase
      ((name		  . "GREEK CAPITAL LETTER RHO WITH DASIA")
       (=ucs		  . #x1FEC)	; Ῥ
       ))
-    (=ucs		. #x1FE5)	; á¿¥
     ))
 (define-char
   '((name		. "GREEK SMALL LETTER UPSILON WITH PERISPOMENI")
     (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 +3728,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,67 +3742,100 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0306)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
+      ))
+    (=ucs		. #x1FE8)	; Ῠ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH VRACHY")
       (=ucs		  . #x1FE0)	; á¿ 
       ))
-    (=ucs		. #x1FE8)	; Ῠ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER UPSILON WITH MACRON")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0304)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING MACRON")
+      (=ucs		  . #x0304)	; ̄
+      ))
+    (=ucs		. #x1FE9)	; á¿©
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH MACRON")
       (=ucs		  . #x1FE1)	; á¿¡
       ))
-    (=ucs		. #x1FE9)	; á¿©
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER UPSILON WITH VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A5 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER UPSILON")
+      (=ucs		  . #x03A5)	; Υ
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FEA)	; Ὺ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH VARIA")
       (=ucs		  . #x1F7A)	; ὺ
       ))
-    (=ucs		. #x1FEA)	; Ὺ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER UPSILON WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038E)
+    (=ucs		. #x1FEB)	; á¿«
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER UPSILON WITH TONOS")
+      (=ucs		  . #x038E)	; Ύ
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER UPSILON WITH OXIA")
       (=ucs		  . #x1F7B)	; á½»
       ))
-    (=ucs		. #x1FEB)	; á¿«
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER RHO WITH DASIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A1 #x0314)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER RHO")
+      (=ucs		  . #x03A1)	; Ρ
+      )
+     ((name		  . "COMBINING REVERSED COMMA ABOVE")
+      (=ucs		  . #x0314)	; ̔
+      ))
+    (=ucs		. #x1FEC)	; Ῥ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER RHO WITH DASIA")
       (=ucs		  . #x1FE5)	; á¿¥
       ))
-    (=ucs		. #x1FEC)	; Ῥ
     ))
 (define-char
   '((name		. "GREEK DIALYTIKA AND VARIA")
     (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,23 +3843,35 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x0385)
     (=ucs		. #x1FEE)	; á¿®
+    (->canonical
+     ((name		  . "GREEK DIALYTIKA TONOS")
+      (=ucs		  . #x0385)	; ΅
+      ))
     ))
 (define-char
   '((name		. "GREEK VARIA")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x0060)
     (=ucs		. #x1FEF)	; `
+    (->canonical
+     ((name		  . "GRAVE ACCENT")
+      (=ucs		  . #x0060)	; `
+      ))
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI")
     (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,19 +3879,31 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03C9 #x0345)
+    (=decomposition
+     ((name		  . "GREEK SMALL LETTER OMEGA")
+      (=ucs		  . #x03C9)	; ω
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FF3)	; ῳ
     (->uppercase
      ((name . "GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI")
       (=ucs		  . #x1FFC)	; ῼ
       ))
-    (=ucs		. #x1FF3)	; ῳ
     ))
 (define-char
   '((name . "GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI")
     (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 +3911,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 +3925,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,74 +3939,107 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x039F #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMICRON")
+      (=ucs		  . #x039F)	; Ο
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FF8)	; Ὸ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH VARIA")
       (=ucs		  . #x1F78)	; ὸ
       ))
-    (=ucs		. #x1FF8)	; Ὸ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMICRON WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038C)
+    (=ucs		. #x1FF9)	; Ό
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER OMICRON WITH TONOS")
+      (=ucs		  . #x038C)	; Ό
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMICRON WITH OXIA")
       (=ucs		  . #x1F79)	; á½¹
       ))
-    (=ucs		. #x1FF9)	; Ό
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMEGA WITH VARIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0300)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING GRAVE ACCENT")
+      (=ucs		  . #x0300)	; ̀
+      ))
+    (=ucs		. #x1FFA)	; Ὼ
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH VARIA")
       (=ucs		  . #x1F7C)	; á½¼
       ))
-    (=ucs		. #x1FFA)	; Ὼ
     ))
 (define-char
   '((name		. "GREEK CAPITAL LETTER OMEGA WITH OXIA")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x038F)
+    (=ucs		. #x1FFB)	; á¿»
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER OMEGA WITH TONOS")
+      (=ucs		  . #x038F)	; Ώ
+      ))
     (->lowercase
      ((name		  . "GREEK SMALL LETTER OMEGA WITH OXIA")
       (=ucs		  . #x1F7D)	; á½½
       ))
-    (=ucs		. #x1FFB)	; á¿»
     ))
 (define-char
   '((name . "GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI")
     (general-category	letter titlecase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9 #x0345)
+    (=decomposition
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      )
+     ((name		  . "COMBINING GREEK YPOGEGRAMMENI")
+      (=ucs		  . #x0345)	; ͅ
+      ))
+    (=ucs		. #x1FFC)	; ῼ
     (->lowercase
      ((name . "GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI")
       (=ucs		  . #x1FF3)	; ῳ
       ))
-    (=ucs		. #x1FFC)	; ῼ
     ))
 (define-char
   '((name		. "GREEK OXIA")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	#x00B4)
     (=ucs		. #x1FFD)	; ´
+    (->canonical
+     ((name		  . "ACUTE ACCENT")
+      (=ucs		  . #x00B4)	; ´
+      ))
     ))
 (define-char
   '((name		. "GREEK DASIA")
     (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)	; ῾
     ))