X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2Fu002B0-Spacing-Modifier-Letters.el;h=6a4e44a005e4ffc391cde1c303f5d9ff5d54c2c6;hp=0774a6052452e97bb92b3cc384bc67a30dc07f7b;hb=8ba3626da629f1b4ecafae24c85f3d0cb3bf8b8e;hpb=2e06e736b01a36e62a7aa156347b42dcdef89e1e

diff --git a/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el b/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
index 0774a60..6a4e44a 100644
--- a/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
+++ b/lisp/utf-2000/u002B0-Spacing-Modifier-Letters.el
@@ -1,75 +1,102 @@
-;; -*- coding: utf-8-mcs -*-
+;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((name		. "MODIFIER LETTER SMALL H")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0068)
     (=ucs		. #x02B0)	; Ê°
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL H WITH HOOK")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0266)
     (=ucs		. #x02B1)	; ʱ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER H WITH HOOK")
+      (=ucs		  . #x0266)	; ɦ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL J")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x006A)
     (=ucs		. #x02B2)	; ʲ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER J")
+      (=ucs		  . #x006A)	; j
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL R")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0072)
     (=ucs		. #x02B3)	; ʳ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER R")
+      (=ucs		  . #x0072)	; r
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL TURNED R")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0279)
     (=ucs		. #x02B4)	; Ê´
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER TURNED R")
+      (=ucs		  . #x0279)	; ɹ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL TURNED R WITH HOOK")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x027B)
     (=ucs		. #x02B5)	; ʵ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER TURNED R WITH HOOK")
+      (=ucs		  . #x027B)	; É»
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL CAPITAL INVERTED R")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0281)
     (=ucs		. #x02B6)	; ʶ
+    (<-superscript
+     ((name		  . "LATIN LETTER SMALL CAPITAL INVERTED R")
+      (=ucs		  . #x0281)	; ʁ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL W")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0077)
     (=ucs		. #x02B7)	; Ê·
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER W")
+      (=ucs		  . #x0077)	; w
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL Y")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0079)
     (=ucs		. #x02B8)	; ʸ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER Y")
+      (=ucs		  . #x0079)	; y
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER PRIME")
@@ -98,7 +125,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (=ucs		. #x02BC)	; ʼ
-    (greek-iso8859-7	. #xA2)	; øº’»¢
+    (greek-iso8859-7	. #xA2)	; &I-GREEK-22;
     ))
 (define-char
   '((name		. "MODIFIER LETTER REVERSED COMMA")
@@ -106,7 +133,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (=ucs		. #x02BD)	; ʽ
-    (greek-iso8859-7	. #xA1)	; øº’»¡
+    (greek-iso8859-7	. #xA1)	; &I-GREEK-21;
     ))
 (define-char
   '((name		. "MODIFIER LETTER RIGHT HALF RING")
@@ -170,7 +197,7 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (=ucs		. #x02C6)	; ˆ
-    (=big5-eten		. #xC6D9)	; ý¢€Œ›™
+    (=big5-eten		. #xC6D9)	; &I-B-C6D9;
     ))
 (define-char
   '((name		. "CARON")
@@ -178,64 +205,48 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (iso-10646-comment	. "Mandarin Chinese third tone")
-    (->fullwidth
-     ((name		  . "fullwidth caron")
-      (=jis-x0213-1-2000  . #x2A31)	; ø»¢ š
-      (=cns11643-1	  . #x256F)	; ø»‘‰¢
-      (=jis-x0212	  . #x2230)	; ø»Š¥½
-      (=ks-x1001	  . #x2227)	; ø»ˆ›°
-      (=gb2312		  . #x2126)	; ø»„†‰
-      ))
     (=ucs		. #x02C7)	; ˇ
-    (latin-iso8859-4	. #xB7)	; øº’¸·
-    (latin-iso8859-2	. #xB7)	; øº’µ·
+    (latin-iso8859-2	. #xB7)	; &I-LATIN2-37;
+    (latin-iso8859-4	. #xB7)	; &I-LATIN4-37;
     ))
 (define-char
-  '((name		. "fullwidth caron")
-    (=>ucs		. #x02C7)	; ˇ
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (iso-10646-comment	. "Mandarin Chinese third tone")
-    (->decomposition	wide #x02C7)
+  '((<-denotational
+     ((name		  . "CARON")
+      (=ucs		  . #x02C7)	; ˇ
+      ))
+    (=ucs@gb/fw		. #x02C7)	; &JX1-2A31;
+    (=ucs@jis/fw	. #x02C7)	; &JX1-2A31;
+    (=gb2312		. #x2126)	; &JX1-2A31; [01-06]
+    (=ks-x1001		. #x2227)	; &I-K0-2227; [02-07]
+    (=jis-x0212		. #x2230)	; &I-JSP-2230; [02-16]
+    (=cns11643-1	. #x256F)	; &I-C1-256F; [05-79]
+    (=jis-x0213-1	. #x2A31)	; &I-JX1-2A31; [10-17]
+    (=big5		. #xA3BE)	; &I-B-A3BE;
+    (=jef-china3	. #x81AB)	; &I-JC3-81AB;
     (<-fullwidth
      ((name		  . "CARON")
       (=ucs		  . #x02C7)	; ˇ
       ))
-    (=ucs@jis		. #x02C7)	; ø»¢ š
-    (=jis-x0213-1-2000	. #x2A31)	; ø»¢ š
-    (=cns11643-1	. #x256F)	; ø»‘‰¢
-    (=jis-x0212		. #x2230)	; ø»Š¥½
-    (=ks-x1001		. #x2227)	; ø»ˆ›°
-    (=gb2312		. #x2126)	; ø»„†‰
-    (=big5		. #xA3BE)	; ý¢€ŠŽ¾
-    (=jef-china3	. #x81AB)	; øºˆ†«
     ))
 (define-char
   '((name		. "MODIFIER LETTER VERTICAL LINE")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter vertical line")
-      (=jis-x0213-1-2000  . #x2B53)	; ø»¢¢š
-      ))
     (=ucs		. #x02C8)	; ˈ
-    (ipa		. #xF0)	; øº’›°
+    (ipa		. #xF0)	; &I-MULE-IPA-70;
     ))
 (define-char
-  '((name		. "fullwidth modifier letter vertical line")
-    (=>ucs		. #x02C8)	; ˈ
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02C8)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER VERTICAL LINE")
+      (=ucs		  . #x02C8)	; ˈ
+      ))
+    (=ucs@jis/fw	. #x02C8)	; &JX1-2B53;
+    (=jis-x0213-1	. #x2B53)	; &JX1-2B53; [11-51]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER VERTICAL LINE")
       (=ucs		  . #x02C8)	; ˈ
       ))
-    (=ucs@jis		. #x02C8)	; ø»¢¢š
-    (=jis-x0213-1-2000	. #x2B53)	; ø»¢¢š
     ))
 (define-char
   '((name		. "MODIFIER LETTER MACRON")
@@ -243,27 +254,21 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (iso-10646-comment	. "Mandarin Chinese first tone")
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter macron")
-      (=gb2312		  . #x2125)	; ø»„†ˆ
-      ))
     (=ucs		. #x02C9)	; ˉ
     ))
 (define-char
-  '((name		. "fullwidth modifier letter macron")
-    (=>ucs		. #x02C9)	; ˉ
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (iso-10646-comment	. "Mandarin Chinese first tone")
-    (->decomposition	wide #x02C9)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER MACRON")
+      (=ucs		  . #x02C9)	; ˉ
+      ))
+    (=ucs@gb/fw		. #x02C9)	; &C1-256D;
+    (=gb2312		. #x2125)	; &C1-256D; [01-05]
+    (=cns11643-1	. #x256D)	; &I-C1-256D; [05-77]
+    (=big5		. #xA3BC)	; &I-B-A3BC;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER MACRON")
       (=ucs		  . #x02C9)	; ˉ
       ))
-    (=cns11643-1	. #x256D)	; ø»‘‰ 
-    (=gb2312		. #x2125)	; ø»„†ˆ
-    (=big5		. #xA3BC)	; ý¢€ŠŽ¼
     ))
 (define-char
   '((name		. "MODIFIER LETTER ACUTE ACCENT")
@@ -271,27 +276,19 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (iso-10646-comment	. "Mandarin Chinese second tone")
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter acute accent")
-      (=cns11643-1	  . #x256E)	; ø»‘‰¡
-      (=big5		  . #xA3BD)	; ý¢€ŠŽ½
-      ))
     (=ucs		. #x02CA)	; ˊ
     ))
 (define-char
-  '((name		. "fullwidth modifier letter acute accent")
-    (=>ucs		. #x02CA)	; ˊ
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (iso-10646-comment	. "Mandarin Chinese second tone")
-    (->decomposition	wide #x02CA)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER ACUTE ACCENT")
+      (=ucs		  . #x02CA)	; ˊ
+      ))
+    (=cns11643-1	. #x256E)	; &C1-256E; [05-78]
+    (=big5		. #xA3BD)	; &I-B-A3BD;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER ACUTE ACCENT")
       (=ucs		  . #x02CA)	; ˊ
       ))
-    (=cns11643-1	. #x256E)	; ø»‘‰¡
-    (=big5		. #xA3BD)	; ý¢€ŠŽ½
     ))
 (define-char
   '((name		. "MODIFIER LETTER GRAVE ACCENT")
@@ -299,52 +296,39 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (iso-10646-comment	. "Mandarin Chinese fourth tone")
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter grave accent")
-      (=cns11643-1	  . #x2570)	; ø»‘‰£
-      (=big5		  . #xA3BF)	; ý¢€ŠŽ¿
-      ))
     (=ucs		. #x02CB)	; ˋ
     ))
 (define-char
-  '((name		. "fullwidth modifier letter grave accent")
-    (=>ucs		. #x02CB)	; ˋ
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (iso-10646-comment	. "Mandarin Chinese fourth tone")
-    (->decomposition	wide #x02CB)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER GRAVE ACCENT")
+      (=ucs		  . #x02CB)	; ˋ
+      ))
+    (=cns11643-1	. #x2570)	; &C1-2570; [05-80]
+    (=big5		. #xA3BF)	; &I-B-A3BF;
     (<-fullwidth
      ((name		  . "MODIFIER LETTER GRAVE ACCENT")
       (=ucs		  . #x02CB)	; ˋ
       ))
-    (=cns11643-1	. #x2570)	; ø»‘‰£
-    (=big5		. #xA3BF)	; ý¢€ŠŽ¿
     ))
 (define-char
   '((name		. "MODIFIER LETTER LOW VERTICAL LINE")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name . "fullwidth modifier letter low vertical line")
-      (=jis-x0213-1-2000  . #x2B54)	; ø»¢¢›
-      ))
     (=ucs		. #x02CC)	; ˌ
-    (ipa		. #xF1)	; øº’›±
+    (ipa		. #xF1)	; &I-MULE-IPA-71;
     ))
 (define-char
-  '((name		. "fullwidth modifier letter low vertical line")
-    (=>ucs		. #x02CC)	; ˌ
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER LOW VERTICAL LINE")
+      (=ucs		  . #x02CC)	; ˌ
+      ))
+    (=ucs@jis/fw	. #x02CC)	; &JX1-2B54;
+    (=jis-x0213-1	. #x2B54)	; &JX1-2B54; [11-52]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER LOW VERTICAL LINE")
       (=ucs		  . #x02CC)	; ˌ
       ))
-    (=ucs@jis		. #x02CC)	; ø»¢¢›
-    (=jis-x0213-1-2000	. #x2B54)	; ø»¢¢›
     ))
 (define-char
   '((name		. "MODIFIER LETTER LOW MACRON")
@@ -354,6 +338,15 @@
     (=ucs		. #x02CD)	; ˍ
     ))
 (define-char
+  '((name		. "heavy low line")
+    (=>ucs		. #x02CD)	; ˍ
+    (bidi-category	. "ON")
+    (mirrored		. nil)
+    (=ucs@big5		. #x02CD)	; &C1-2226;
+    (=cns11643-1	. #x2226)	; &C1-2226; [02-06]
+    (=big5		. #xA1C5)	; &I-B-A1C5;
+    ))
+(define-char
   '((name		. "MODIFIER LETTER LOW GRAVE ACCENT")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
@@ -372,53 +365,40 @@
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter triangular colon")
-      (=jis-x0213-1-2000  . #x2B55)	; ø»¢¢œ
-      (=ks-x1001	  . #x2230)	; ø»ˆ›¹
-      ))
     (=ucs		. #x02D0)	; ː
-    (ipa		. #xF2)	; øº’›²
+    (ipa		. #xF2)	; &I-MULE-IPA-72;
     ))
 (define-char
-  '((name		. "fullwidth modifier letter triangular colon")
-    (=>ucs		. #x02D0)	; ː
-    (general-category	letter modifier) ; Informative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x02D0)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER TRIANGULAR COLON")
+      (=ucs		  . #x02D0)	; ː
+      ))
+    (=ucs@jis/fw	. #x02D0)	; &JX1-2B55;
+    (=ks-x1001		. #x2230)	; &JX1-2B55; [02-16]
+    (=jis-x0213-1	. #x2B55)	; &I-JX1-2B55; [11-53]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER TRIANGULAR COLON")
       (=ucs		  . #x02D0)	; ː
       ))
-    (=ucs@jis		. #x02D0)	; ø»¢¢œ
-    (=jis-x0213-1-2000	. #x2B55)	; ø»¢¢œ
-    (=ks-x1001		. #x2230)	; ø»ˆ›¹
     ))
 (define-char
   '((name		. "MODIFIER LETTER HALF TRIANGULAR COLON")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->fullwidth
-     ((name . "fullwidth modifier letter half triangular colon")
-      (=jis-x0213-1-2000  . #x2B56)	; ø»¢¢
-      ))
     (=ucs		. #x02D1)	; ˑ
     ))
 (define-char
-  '((name . "fullwidth modifier letter half triangular colon")
-    (=>ucs		. #x02D1)	; ˑ
-    (general-category	letter modifier) ; Informative Category
-    (bidi-category	. "L")
-    (mirrored		. nil)
-    (->decomposition	wide #x02D1)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER HALF TRIANGULAR COLON")
+      (=ucs		  . #x02D1)	; ˑ
+      ))
+    (=ucs@jis/fw	. #x02D1)	; &JX1-2B56;
+    (=jis-x0213-1	. #x2B56)	; &JX1-2B56; [11-54]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER HALF TRIANGULAR COLON")
       (=ucs		  . #x02D1)	; ˑ
       ))
-    (=ucs@jis		. #x02D1)	; ø»¢¢
-    (=jis-x0213-1-2000	. #x2B56)	; ø»¢¢
     ))
 (define-char
   '((name		. "MODIFIER LETTER CENTRED RIGHT HALF RING")
@@ -467,33 +447,31 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0306)
-    (->fullwidth
-     ((name		  . "fullwidth breve")
-      (=jis-x0213-1-2000  . #x2A22)	; ø»¢ ‹
-      (=jis-x0212	  . #x222F)	; ø»Š¥¼
-      (=ks-x1001	  . #x2228)	; ø»ˆ›±
+    (=>decomposition@compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING BREVE")
+      (=ucs		  . #x0306)	; ̆
       ))
     (=ucs		. #x02D8)	; ˘
-    (latin-iso8859-3	. #xA2)	; øº’·‚
-    (latin-iso8859-2	. #xA2)	; øº’µ¢
+    (latin-iso8859-2	. #xA2)	; &I-LATIN2-22;
+    (latin-iso8859-3	. #xA2)	; &I-LATIN3-22;
     ))
 (define-char
-  '((name		. "fullwidth breve")
-    (=>ucs		. #x02D8)	; ˘
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02D8)
+  '((<-denotational
+     ((name		  . "BREVE")
+      (=ucs		  . #x02D8)	; ˘
+      ))
+    (=ucs@jis/fw	. #x02D8)	; &JX1-2A22;
+    (=ks-x1001		. #x2228)	; &JX1-2A22; [02-08]
+    (=jis-x0212		. #x222F)	; &I-JSP-222F; [02-15]
+    (=jis-x0213-1	. #x2A22)	; &I-JX1-2A22; [10-02]
+    (=jef-china3	. #x81A8)	; &I-JC3-81A8;
     (<-fullwidth
      ((name		  . "BREVE")
       (=ucs		  . #x02D8)	; ˘
       ))
-    (=ucs@jis		. #x02D8)	; ø»¢ ‹
-    (=jis-x0213-1-2000	. #x2A22)	; ø»¢ ‹
-    (=jis-x0212		. #x222F)	; ø»Š¥¼
-    (=ks-x1001		. #x2228)	; ø»ˆ›±
-    (=jef-china3	. #x81A8)	; øºˆ†¨
     ))
 (define-char
   '((name		. "DOT ABOVE")
@@ -501,107 +479,106 @@
     (bidi-category	. "ON")
     (mirrored		. nil)
     (iso-10646-comment	. "Mandarin Chinese light tone")
-    (->decomposition	compat #x0020 #x0307)
-    (->fullwidth
-     ((name		  . "fullwidth dot above")
-      (=jis-x0213-1-2000  . #x2A58)	; ø»¢¡
-      (=cns11643-1	  . #x256C)	; ø»‘‰Ÿ
-      (=jis-x0212	  . #x2232)	; ø»Š¥¿
-      (=ks-x1001	  . #x222B)	; ø»ˆ›´
+    (=>decomposition@compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING DOT ABOVE")
+      (=ucs		  . #x0307)	; ̇
       ))
     (=ucs		. #x02D9)	; ˙
-    (latin-iso8859-4	. #xFF)	; øº’¹¿
-    (latin-iso8859-3	. #xFF)	; øº’¸Ÿ
-    (latin-iso8859-2	. #xFF)	; øº’¶¿
+    (latin-iso8859-2	. #xFF)	; &I-LATIN2-7F;
+    (latin-iso8859-3	. #xFF)	; &I-LATIN3-7F;
+    (latin-iso8859-4	. #xFF)	; &I-LATIN4-7F;
     ))
 (define-char
-  '((name		. "fullwidth dot above")
-    (=>ucs		. #x02D9)	; ˙
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (iso-10646-comment	. "Mandarin Chinese light tone")
-    (->decomposition	wide #x02D9)
+  '((<-denotational
+     ((name		  . "DOT ABOVE")
+      (=ucs		  . #x02D9)	; ˙
+      ))
+    (=ucs@jis/fw	. #x02D9)	; &JX1-2A58;
+    (=ks-x1001		. #x222B)	; &JX1-2A58; [02-11]
+    (=jis-x0212		. #x2232)	; &I-JSP-2232; [02-18]
+    (=cns11643-1	. #x256C)	; &I-C1-256C; [05-76]
+    (=jis-x0213-1	. #x2A58)	; &I-JX1-2A58; [10-56]
+    (=big5		. #xA3BB)	; &I-B-A3BB;
+    (=jef-china3	. #x81A9)	; &I-JC3-81A9;
     (<-fullwidth
      ((name		  . "DOT ABOVE")
       (=ucs		  . #x02D9)	; ˙
       ))
-    (=ucs@jis		. #x02D9)	; ø»¢¡
-    (=jis-x0213-1-2000	. #x2A58)	; ø»¢¡
-    (=cns11643-1	. #x256C)	; ø»‘‰Ÿ
-    (=jis-x0212		. #x2232)	; ø»Š¥¿
-    (=ks-x1001		. #x222B)	; ø»ˆ›´
-    (=big5		. #xA3BB)	; ý¢€ŠŽ»
-    (=jef-china3	. #x81A9)	; øºˆ†©
     ))
 (define-char
   '((name		. "RING ABOVE")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x030A)
-    (->fullwidth
-     ((name		  . "fullwidth ring above")
-      (=jis-x0212	  . #x2236)	; ø»Š¦ƒ
-      (=ks-x1001	  . #x222A)	; ø»ˆ›³
-      (=jef-china3	  . #x81AC)	; øºˆ†¬
+    (=>decomposition@compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING RING ABOVE")
+      (=ucs		  . #x030A)	; ̊
       ))
     (=ucs		. #x02DA)	; ˚
     ))
 (define-char
-  '((name		. "fullwidth ring above")
-    (=>ucs		. #x02DA)	; ˚
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02DA)
+  '((<-denotational
+     ((name		  . "RING ABOVE")
+      (=ucs		  . #x02DA)	; ˚
+      ))
+    (=ucs@jis/fw	. #x02DA)	; &JSP-2236;
+    (=ks-x1001		. #x222A)	; &JSP-2236; [02-10]
+    (=jis-x0212		. #x2236)	; &I-JSP-2236; [02-22]
+    (=jef-china3	. #x81AC)	; &I-JC3-81AC;
     (<-fullwidth
      ((name		  . "RING ABOVE")
       (=ucs		  . #x02DA)	; ˚
       ))
-    (=ucs@jis		. #x02DA)	; ø»Š¦ƒ
-    (=jis-x0212		. #x2236)	; ø»Š¦ƒ
-    (=ks-x1001		. #x222A)	; ø»ˆ›³
-    (=jef-china3	. #x81AC)	; øºˆ†¬
     ))
 (define-char
   '((name		. "OGONEK")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0328)
-    (->fullwidth
-     ((name		  . "fullwidth ogonek")
-      (=jis-x0213-1-2000  . #x2A2D)	; ø»¢ –
-      (=jis-x0212	  . #x2235)	; ø»Š¦‚
-      (=ks-x1001	  . #x222D)	; ø»ˆ›¶
+    (=>decomposition@compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING OGONEK")
+      (=ucs		  . #x0328)	; ̨
       ))
     (=ucs		. #x02DB)	; ˛
-    (latin-iso8859-4	. #xB2)	; øº’¸²
-    (latin-iso8859-2	. #xB2)	; øº’µ²
+    (latin-iso8859-2	. #xB2)	; &I-LATIN2-32;
+    (latin-iso8859-4	. #xB2)	; &I-LATIN4-32;
     ))
 (define-char
-  '((name		. "fullwidth ogonek")
-    (=>ucs		. #x02DB)	; ˛
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (->decomposition	wide #x02DB)
+  '((<-denotational
+     ((name		  . "OGONEK")
+      (=ucs		  . #x02DB)	; ˛
+      ))
+    (=ucs@jis/fw	. #x02DB)	; &JX1-2A2D;
+    (=ks-x1001		. #x222D)	; &JX1-2A2D; [02-13]
+    (=jis-x0212		. #x2235)	; &I-JSP-2235; [02-21]
+    (=jis-x0213-1	. #x2A2D)	; &I-JX1-2A2D; [10-13]
+    (=jef-china3	. #x81B3)	; &I-JC3-81B3;
     (<-fullwidth
      ((name		  . "OGONEK")
       (=ucs		  . #x02DB)	; ˛
       ))
-    (=ucs@jis		. #x02DB)	; ø»¢ –
-    (=jis-x0213-1-2000	. #x2A2D)	; ø»¢ –
-    (=jis-x0212		. #x2235)	; ø»Š¦‚
-    (=ks-x1001		. #x222D)	; ø»ˆ›¶
-    (=jef-china3	. #x81B3)	; øºˆ†³
     ))
 (define-char
   '((name		. "SMALL TILDE")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x0303)
+    (=>decomposition@compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING TILDE")
+      (=ucs		  . #x0303)	; ̃
+      ))
     (=ucs		. #x02DC)	; ˜
     ))
 (define-char
@@ -609,57 +586,49 @@
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0020 #x030B)
-    (->fullwidth
-     ((name		  . "fullwidth double acute accent")
-      (=jis-x0213-1-2000  . #x2A36)	; ø»¢ Ÿ
-      (=jis-x0212	  . #x2233)	; ø»Š¦€
-      (=ks-x1001	  . #x2229)	; ø»ˆ›²
+    (=>decomposition@compat
+     ((name		  . "SPACE")
+      (=ucs		  . #x0020)	;
+      )
+     ((name		  . "COMBINING DOUBLE ACUTE ACCENT")
+      (=ucs		  . #x030B)	; ̋
       ))
     (=ucs		. #x02DD)	; ˝
-    (latin-iso8859-2	. #xBD)	; øº’µ½
+    (latin-iso8859-2	. #xBD)	; &I-LATIN2-3D;
     ))
 (define-char
-  '((name		. "fullwidth double acute accent")
-    (=>ucs		. #x02DD)	; ˝
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02DD)
+  '((<-denotational
+     ((name		  . "DOUBLE ACUTE ACCENT")
+      (=ucs		  . #x02DD)	; ˝
+      ))
+    (=ucs@jis/fw	. #x02DD)	; &JX1-2A36;
+    (=ks-x1001		. #x2229)	; &JX1-2A36; [02-09]
+    (=jis-x0212		. #x2233)	; &I-JSP-2233; [02-19]
+    (=jis-x0213-1	. #x2A36)	; &I-JX1-2A36; [10-22]
+    (=jef-china3	. #x81B0)	; &I-JC3-81B0;
     (<-fullwidth
      ((name		  . "DOUBLE ACUTE ACCENT")
       (=ucs		  . #x02DD)	; ˝
       ))
-    (=ucs@jis		. #x02DD)	; ø»¢ Ÿ
-    (=jis-x0213-1-2000	. #x2A36)	; ø»¢ Ÿ
-    (=jis-x0212		. #x2233)	; ø»Š¦€
-    (=ks-x1001		. #x2229)	; ø»ˆ›²
-    (=jef-china3	. #x81B0)	; øºˆ†°
     ))
 (define-char
   '((name		. "MODIFIER LETTER RHOTIC HOOK")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter rhotic hook")
-      (=jis-x0213-1-2000  . #x2B71)	; ø»¢¢¸
-      ))
     (=ucs		. #x02DE)	; ˞
     ))
 (define-char
-  '((name		. "fullwidth modifier letter rhotic hook")
-    (=>ucs		. #x02DE)	; ˞
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02DE)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER RHOTIC HOOK")
+      (=ucs		  . #x02DE)	; ˞
+      ))
+    (=ucs@jis/fw	. #x02DE)	; &JX1-2B71;
+    (=jis-x0213-1	. #x2B71)	; &JX1-2B71; [11-81]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER RHOTIC HOOK")
       (=ucs		  . #x02DE)	; ˞
       ))
-    (=ucs@jis		. #x02DE)	; ø»¢¢¸
-    (=jis-x0213-1-2000	. #x2B71)	; ø»¢¢¸
     ))
 (define-char
   '((name		. "MODIFIER LETTER CROSS ACCENT")
@@ -673,165 +642,150 @@
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0263)
     (=ucs		. #x02E0)	; Ë 
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER GAMMA")
+      (=ucs		  . #x0263)	; ɣ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL L")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x006C)
     (=ucs		. #x02E1)	; Ë¡
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL S")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0073)
     (=ucs		. #x02E2)	; ˢ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER S")
+      (=ucs		  . #x0073)	; s
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL X")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0078)
     (=ucs		. #x02E3)	; ˣ
+    (<-superscript
+     ((name		  . "LATIN SMALL LETTER X")
+      (=ucs		  . #x0078)	; x
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER SMALL REVERSED GLOTTAL STOP")
     (general-category	letter modifier) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	super #x0295)
     (=ucs		. #x02E4)	; ˤ
+    (<-superscript
+     ((name		  . "LATIN LETTER PHARYNGEAL VOICED FRICATIVE")
+      (=ucs		  . #x0295)	; ʕ
+      ))
     ))
 (define-char
   '((name		. "MODIFIER LETTER EXTRA-HIGH TONE BAR")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name . "fullwidth modifier letter extra-high tone bar")
-      (=jis-x0213-1-2000  . #x2B60)	; ø»¢¢§
-      ))
     (=ucs		. #x02E5)	; ˥
     ))
 (define-char
-  '((name . "fullwidth modifier letter extra-high tone bar")
-    (=>ucs		. #x02E5)	; ˥
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02E5)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER EXTRA-HIGH TONE BAR")
+      (=ucs		  . #x02E5)	; ˥
+      ))
+    (=ucs@jis/fw	. #x02E5)	; &JX1-2B60;
+    (=jis-x0213-1	. #x2B60)	; &JX1-2B60; [11-64]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER EXTRA-HIGH TONE BAR")
       (=ucs		  . #x02E5)	; ˥
       ))
-    (=ucs@jis		. #x02E5)	; ø»¢¢§
-    (=jis-x0213-1-2000	. #x2B60)	; ø»¢¢§
     ))
 (define-char
   '((name		. "MODIFIER LETTER HIGH TONE BAR")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter high tone bar")
-      (=jis-x0213-1-2000  . #x2B61)	; ø»¢¢¨
-      ))
     (=ucs		. #x02E6)	; ˦
     ))
 (define-char
-  '((name		. "fullwidth modifier letter high tone bar")
-    (=>ucs		. #x02E6)	; ˦
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02E6)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER HIGH TONE BAR")
+      (=ucs		  . #x02E6)	; ˦
+      ))
+    (=ucs@jis/fw	. #x02E6)	; &JX1-2B61;
+    (=jis-x0213-1	. #x2B61)	; &JX1-2B61; [11-65]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER HIGH TONE BAR")
       (=ucs		  . #x02E6)	; ˦
       ))
-    (=ucs@jis		. #x02E6)	; ø»¢¢¨
-    (=jis-x0213-1-2000	. #x2B61)	; ø»¢¢¨
     ))
 (define-char
   '((name		. "MODIFIER LETTER MID TONE BAR")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter mid tone bar")
-      (=jis-x0213-1-2000  . #x2B62)	; ø»¢¢©
-      ))
     (=ucs		. #x02E7)	; ˧
     ))
 (define-char
-  '((name		. "fullwidth modifier letter mid tone bar")
-    (=>ucs		. #x02E7)	; ˧
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02E7)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER MID TONE BAR")
+      (=ucs		  . #x02E7)	; ˧
+      ))
+    (=ucs@jis/fw	. #x02E7)	; &JX1-2B62;
+    (=jis-x0213-1	. #x2B62)	; &JX1-2B62; [11-66]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER MID TONE BAR")
       (=ucs		  . #x02E7)	; ˧
       ))
-    (=ucs@jis		. #x02E7)	; ø»¢¢©
-    (=jis-x0213-1-2000	. #x2B62)	; ø»¢¢©
     ))
 (define-char
   '((name		. "MODIFIER LETTER LOW TONE BAR")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name		  . "fullwidth modifier letter low tone bar")
-      (=jis-x0213-1-2000  . #x2B63)	; ø»¢¢ª
-      ))
     (=ucs		. #x02E8)	; ˨
     ))
 (define-char
-  '((name		. "fullwidth modifier letter low tone bar")
-    (=>ucs		. #x02E8)	; ˨
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02E8)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER LOW TONE BAR")
+      (=ucs		  . #x02E8)	; ˨
+      ))
+    (=ucs@jis/fw	. #x02E8)	; &JX1-2B63;
+    (=jis-x0213-1	. #x2B63)	; &JX1-2B63; [11-67]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER LOW TONE BAR")
       (=ucs		  . #x02E8)	; ˨
       ))
-    (=ucs@jis		. #x02E8)	; ø»¢¢ª
-    (=jis-x0213-1-2000	. #x2B63)	; ø»¢¢ª
     ))
 (define-char
   '((name		. "MODIFIER LETTER EXTRA-LOW TONE BAR")
     (general-category	symbol modifier) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->fullwidth
-     ((name . "fullwidth modifier letter extra-low tone bar")
-      (=jis-x0213-1-2000  . #x2B64)	; ø»¢¢«
-      ))
     (=ucs		. #x02E9)	; Ë©
     ))
 (define-char
-  '((name		. "fullwidth modifier letter extra-low tone bar")
-    (=>ucs		. #x02E9)	; Ë©
-    (general-category	symbol modifier) ; Informative Category
-    (bidi-category	. "ON")
-    (mirrored		. nil)
-    (->decomposition	wide #x02E9)
+  '((<-denotational
+     ((name		  . "MODIFIER LETTER EXTRA-LOW TONE BAR")
+      (=ucs		  . #x02E9)	; Ë©
+      ))
+    (=ucs@jis/fw	. #x02E9)	; &JX1-2B64;
+    (=jis-x0213-1	. #x2B64)	; &JX1-2B64; [11-68]
     (<-fullwidth
      ((name		  . "MODIFIER LETTER EXTRA-LOW TONE BAR")
       (=ucs		  . #x02E9)	; Ë©
       ))
-    (=ucs@jis		. #x02E9)	; ø»¢¢«
-    (=jis-x0213-1-2000	. #x2B64)	; ø»¢¢«
     ))
 (define-char
   '((name		. "MODIFIER LETTER YIN DEPARTING TONE MARK")