X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2Fu03200-Enclosed-CJK-Letters-and-Months.el;h=b68c95e36fe8af03454faeed834fce655a37f858;hp=9c9f9232263520a13e9dc764a466c23234b74878;hb=8ba3626da629f1b4ecafae24c85f3d0cb3bf8b8e;hpb=2e06e736b01a36e62a7aa156347b42dcdef89e1e

diff --git a/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el b/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el
index 9c9f923..b68c95e 100644
--- a/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el
+++ b/lisp/utf-2000/u03200-Enclosed-CJK-Letters-and-Months.el
@@ -1,361 +1,755 @@
-;; -*- coding: utf-8-mcs -*-
+;; -*- coding: utf-8-mcs-er -*-
 (define-char
   '((name		. "PARENTHESIZED HANGUL KIYEOK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1100 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG KIYEOK")
+      (=ucs		  . #x1100)	; ᄀ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3200)	; ㈀
-    (=ks-x1001		. #x2931)	; ø»ˆ¦Œ
+    (=ks-x1001		. #x2931)	; &I-K0-2931; [09-17]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL NIEUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1102 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG NIEUN")
+      (=ucs		  . #x1102)	; ᄂ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3201)	; ㈁
-    (=ks-x1001		. #x2932)	; ø»ˆ¦
+    (=ks-x1001		. #x2932)	; &I-K0-2932; [09-18]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL TIKEUT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1103 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG TIKEUT")
+      (=ucs		  . #x1103)	; ᄃ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3202)	; ㈂
-    (=ks-x1001		. #x2933)	; ø»ˆ¦Ž
+    (=ks-x1001		. #x2933)	; &I-K0-2933; [09-19]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL RIEUL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1105 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG RIEUL")
+      (=ucs		  . #x1105)	; ᄅ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3203)	; ㈃
-    (=ks-x1001		. #x2934)	; ø»ˆ¦
+    (=ks-x1001		. #x2934)	; &I-K0-2934; [09-20]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL MIEUM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1106 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG MIEUM")
+      (=ucs		  . #x1106)	; ᄆ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3204)	; ㈄
-    (=ks-x1001		. #x2935)	; ø»ˆ¦
+    (=ks-x1001		. #x2935)	; &I-K0-2935; [09-21]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL PIEUP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1107 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG PIEUP")
+      (=ucs		  . #x1107)	; ᄇ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3205)	; ㈅
-    (=ks-x1001		. #x2936)	; ø»ˆ¦‘
+    (=ks-x1001		. #x2936)	; &I-K0-2936; [09-22]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL SIOS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1109 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG SIOS")
+      (=ucs		  . #x1109)	; ᄉ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3206)	; ㈆
-    (=ks-x1001		. #x2937)	; ø»ˆ¦’
+    (=ks-x1001		. #x2937)	; &I-K0-2937; [09-23]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL IEUNG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110B #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG IEUNG")
+      (=ucs		  . #x110B)	; ᄋ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3207)	; ㈇
-    (=ks-x1001		. #x2938)	; ø»ˆ¦“
+    (=ks-x1001		. #x2938)	; &I-K0-2938; [09-24]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL CIEUC")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110C #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG CIEUC")
+      (=ucs		  . #x110C)	; ᄌ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3208)	; ㈈
-    (=ks-x1001		. #x2939)	; ø»ˆ¦”
+    (=ks-x1001		. #x2939)	; &I-K0-2939; [09-25]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL CHIEUCH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110E #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG CHIEUCH")
+      (=ucs		  . #x110E)	; ᄎ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3209)	; ㈉
-    (=ks-x1001		. #x293A)	; ø»ˆ¦•
+    (=ks-x1001		. #x293A)	; &I-K0-293A; [09-26]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL KHIEUKH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110F #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG KHIEUKH")
+      (=ucs		  . #x110F)	; ᄏ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x320A)	; ㈊
-    (=ks-x1001		. #x293B)	; ø»ˆ¦–
+    (=ks-x1001		. #x293B)	; &I-K0-293B; [09-27]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL THIEUTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1110 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG THIEUTH")
+      (=ucs		  . #x1110)	; ᄐ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x320B)	; ㈋
-    (=ks-x1001		. #x293C)	; ø»ˆ¦—
+    (=ks-x1001		. #x293C)	; &I-K0-293C; [09-28]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL PHIEUPH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1111 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG PHIEUPH")
+      (=ucs		  . #x1111)	; ᄑ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x320C)	; ㈌
-    (=ks-x1001		. #x293D)	; ø»ˆ¦˜
+    (=ks-x1001		. #x293D)	; &I-K0-293D; [09-29]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL HIEUH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1112 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG HIEUH")
+      (=ucs		  . #x1112)	; ᄒ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x320D)	; ㈍
-    (=ks-x1001		. #x293E)	; ø»ˆ¦™
+    (=ks-x1001		. #x293E)	; &I-K0-293E; [09-30]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL KIYEOK A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1100 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG KIYEOK")
+      (=ucs		  . #x1100)	; ᄀ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x320E)	; ㈎
-    (=ks-x1001		. #x293F)	; ø»ˆ¦š
+    (=ks-x1001		. #x293F)	; &I-K0-293F; [09-31]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL NIEUN A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1102 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG NIEUN")
+      (=ucs		  . #x1102)	; ᄂ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x320F)	; ㈏
-    (=ks-x1001		. #x2940)	; ø»ˆ¦›
+    (=ks-x1001		. #x2940)	; &I-K0-2940; [09-32]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL TIKEUT A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1103 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG TIKEUT")
+      (=ucs		  . #x1103)	; ᄃ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3210)	; ㈐
-    (=ks-x1001		. #x2941)	; ø»ˆ¦œ
+    (=ks-x1001		. #x2941)	; &I-K0-2941; [09-33]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL RIEUL A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1105 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG RIEUL")
+      (=ucs		  . #x1105)	; ᄅ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3211)	; ㈑
-    (=ks-x1001		. #x2942)	; ø»ˆ¦
+    (=ks-x1001		. #x2942)	; &I-K0-2942; [09-34]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL MIEUM A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1106 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG MIEUM")
+      (=ucs		  . #x1106)	; ᄆ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3212)	; ㈒
-    (=ks-x1001		. #x2943)	; ø»ˆ¦ž
+    (=ks-x1001		. #x2943)	; &I-K0-2943; [09-35]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL PIEUP A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1107 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG PIEUP")
+      (=ucs		  . #x1107)	; ᄇ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3213)	; ㈓
-    (=ks-x1001		. #x2944)	; ø»ˆ¦Ÿ
+    (=ks-x1001		. #x2944)	; &I-K0-2944; [09-36]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL SIOS A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1109 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG SIOS")
+      (=ucs		  . #x1109)	; ᄉ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3214)	; ㈔
-    (=ks-x1001		. #x2945)	; ø»ˆ¦ 
+    (=ks-x1001		. #x2945)	; &I-K0-2945; [09-37]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL IEUNG A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110B #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG IEUNG")
+      (=ucs		  . #x110B)	; ᄋ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3215)	; ㈕
-    (=ks-x1001		. #x2946)	; ø»ˆ¦¡
+    (=ks-x1001		. #x2946)	; &I-K0-2946; [09-38]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL CIEUC A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110C #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG CIEUC")
+      (=ucs		  . #x110C)	; ᄌ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3216)	; ㈖
-    (=ks-x1001		. #x2947)	; ø»ˆ¦¢
+    (=ks-x1001		. #x2947)	; &I-K0-2947; [09-39]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL CHIEUCH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110E #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG CHIEUCH")
+      (=ucs		  . #x110E)	; ᄎ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3217)	; ㈗
-    (=ks-x1001		. #x2948)	; ø»ˆ¦£
+    (=ks-x1001		. #x2948)	; &I-K0-2948; [09-40]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL KHIEUKH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110F #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG KHIEUKH")
+      (=ucs		  . #x110F)	; ᄏ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3218)	; ㈘
-    (=ks-x1001		. #x2949)	; ø»ˆ¦¤
+    (=ks-x1001		. #x2949)	; &I-K0-2949; [09-41]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL THIEUTH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1110 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG THIEUTH")
+      (=ucs		  . #x1110)	; ᄐ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3219)	; ㈙
-    (=ks-x1001		. #x294A)	; ø»ˆ¦¥
+    (=ks-x1001		. #x294A)	; &I-K0-294A; [09-42]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL PHIEUPH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1111 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG PHIEUPH")
+      (=ucs		  . #x1111)	; ᄑ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x321A)	; ㈚
-    (=ks-x1001		. #x294B)	; ø»ˆ¦¦
+    (=ks-x1001		. #x294B)	; &I-K0-294B; [09-43]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL HIEUH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x1112 #x1161 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG HIEUH")
+      (=ucs		  . #x1112)	; ᄒ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x321B)	; ㈛
-    (=ks-x1001		. #x294C)	; ø»ˆ¦§
+    (=ks-x1001		. #x294C)	; &I-K0-294C; [09-44]
     ))
 (define-char
   '((name		. "PARENTHESIZED HANGUL CIEUC U")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x110C #x116E #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((name		  . "HANGUL CHOSEONG CIEUC")
+      (=ucs		  . #x110C)	; ᄌ
+      )
+     ((name		  . "HANGUL JUNGSEONG U")
+      (=ucs		  . #x116E)	; ᅮ
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x321C)	; ㈜
-    (=ks-x1001		. #x225F)	; ø»ˆœ¨
+    (=ks-x1001		. #x225F)	; &I-K0-225F; [02-63]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH ONE")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4E00 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4E00)	; 一
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3220)	; ㈠
-    (=gb2312		. #x2265)	; ø»„ˆ¦
+    (=gb2312		. #x2265)	; &I-G0-2265; [02-69]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH TWO")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4E8C #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4E8C)	; 二
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3221)	; ㈡
-    (=gb2312		. #x2266)	; ø»„ˆ§
+    (=gb2312		. #x2266)	; &I-G0-2266; [02-70]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH THREE")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4E09 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4E09)	; 三
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3222)	; ㈢
-    (=gb2312		. #x2267)	; ø»„ˆ¨
+    (=gb2312		. #x2267)	; &I-G0-2267; [02-71]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH FOUR")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x56DB #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x56DB)	; 四
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3223)	; ㈣
-    (=gb2312		. #x2268)	; ø»„ˆ©
+    (=gb2312		. #x2268)	; &I-G0-2268; [02-72]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH FIVE")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4E94 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4E94)	; 五
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3224)	; ㈤
-    (=gb2312		. #x2269)	; ø»„ˆª
+    (=gb2312		. #x2269)	; &I-G0-2269; [02-73]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH SIX")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x516D #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x516D)	; 六
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3225)	; ㈥
-    (=gb2312		. #x226A)	; ø»„ˆ«
+    (=gb2312		. #x226A)	; &I-G0-226A; [02-74]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH SEVEN")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4E03 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4E03)	; 七
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3226)	; ㈦
-    (=gb2312		. #x226B)	; ø»„ˆ¬
+    (=gb2312		. #x226B)	; &I-G0-226B; [02-75]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH EIGHT")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x516B #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x516B)	; 八
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3227)	; ㈧
-    (=gb2312		. #x226C)	; ø»„ˆ­
+    (=gb2312		. #x226C)	; &I-G0-226C; [02-76]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH NINE")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4E5D #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4E5D)	; 九
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3228)	; ㈨
-    (=gb2312		. #x226D)	; ø»„ˆ®
+    (=gb2312		. #x226D)	; &I-G0-226D; [02-77]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH TEN")
     (general-category	number other) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x5341 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x5341)	; 十
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3229)	; ㈩
-    (=gb2312		. #x226E)	; ø»„ˆ¯
+    (=gb2312		. #x226E)	; &I-G0-226E; [02-78]
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH MOON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x6708 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x6708)	; 月
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x322A)	; ㈪
     ))
 (define-char
@@ -363,7 +757,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x706B #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x706B)	; 火
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x322B)	; ㈫
     ))
 (define-char
@@ -371,7 +773,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x6C34 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x6C34)	; æ°´
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x322C)	; ㈬
     ))
 (define-char
@@ -379,7 +789,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x6728 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x6728)	; 木
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x322D)	; ㈭
     ))
 (define-char
@@ -387,7 +805,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x91D1 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x91D1)	; 金
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x322E)	; ㈮
     ))
 (define-char
@@ -395,7 +821,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x571F #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x571F)	; 土
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x322F)	; ㈯
     ))
 (define-char
@@ -403,7 +837,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x65E5 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x65E5)	; 日
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3230)	; ㈰
     ))
 (define-char
@@ -411,64 +853,120 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x682A #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x682A)	; æ ª
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3231)	; ㈱
-    (=jis-x0213-1-2000	. #x2D6A)	; ø»¢¥­
-    (=big5-eten		. #xC8D1)	; ý¢€Œ£‘
-    (=jef-china3	. #x78D5)	; øº‡£•
+    (=jis-x0213-1	. #x2D6A)	; &I-JX1-2D6A; [13-74]
+    (=big5-eten		. #xC8D1)	; &I-B-C8D1;
+    (=jef-china3	. #x78D5)	; &I-JC3-78D5;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH HAVE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x6709 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x6709)	; 有
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3232)	; ㈲
-    (=jis-x0213-1-2000	. #x2D6B)	; ø»¢¥®
-    (=jef-china3	. #x78CF)	; øº‡£
+    (=jis-x0213-1	. #x2D6B)	; &I-JX1-2D6B; [13-75]
+    (=jef-china3	. #x78CF)	; &I-JC3-78CF;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH SOCIETY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x793E #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x793E)	; 社
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3233)	; ㈳
-    (=jef-china3	. #x78D0)	; øº‡£
+    (=jef-china3	. #x78D0)	; &I-JC3-78D0;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH NAME")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x540D #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x540D)	; 名
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3234)	; ㈴
-    (=jef-china3	. #x78CD)	; øº‡£
+    (=jef-china3	. #x78CD)	; &I-JC3-78CD;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH SPECIAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x7279 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x7279)	; 特
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3235)	; ㈵
-    (=jef-china3	. #x78D6)	; øº‡£–
+    (=jef-china3	. #x78D6)	; &I-JC3-78D6;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH FINANCIAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x8CA1 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x8CA1)	; 財
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3236)	; ㈶
-    (=jef-china3	. #x78D4)	; øº‡£”
+    (=jef-china3	. #x78D4)	; &I-JC3-78D4;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH CONGRATULATION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x795D #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x795D)	; 祝
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3237)	; ㈷
     ))
 (define-char
@@ -476,7 +974,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x52B4 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x52B4)	; 労
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3238)	; ㈸
     ))
 (define-char
@@ -484,80 +990,152 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4EE3 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4EE3)	; 代
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3239)	; ㈹
-    (=jis-x0213-1-2000	. #x2D6C)	; ø»¢¥¯
-    (=jef-china3	. #x78CB)	; øº‡£‹
+    (=jis-x0213-1	. #x2D6C)	; &I-JX1-2D6C; [13-76]
+    (=jef-china3	. #x78CB)	; &I-JC3-78CB;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH CALL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x547C #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x547C)	; 呼
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x323A)	; ㈺
-    (=jef-china3	. #x78D9)	; øº‡£™
+    (=jef-china3	. #x78D9)	; &I-JC3-78D9;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH STUDY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x5B66 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x5B66)	; å­¦
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x323B)	; ㈻
-    (=jef-china3	. #x78D7)	; øº‡£—
+    (=jef-china3	. #x78D7)	; &I-JC3-78D7;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH SUPERVISE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x76E3 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x76E3)	; 監
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x323C)	; ㈼
-    (=jef-china3	. #x78D1)	; øº‡£‘
+    (=jef-china3	. #x78D1)	; &I-JC3-78D1;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH ENTERPRISE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4F01 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4F01)	; 企
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x323D)	; ㈽
-    (=jef-china3	. #x78CA)	; øº‡£Š
+    (=jef-china3	. #x78CA)	; &I-JC3-78CA;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH RESOURCE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x8CC7 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x8CC7)	; 資
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x323E)	; ㈾
-    (=jef-china3	. #x78D3)	; øº‡£“
+    (=jef-china3	. #x78D3)	; &I-JC3-78D3;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH ALLIANCE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x5354 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x5354)	; 協
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x323F)	; ㈿
-    (=jef-china3	. #x78CC)	; øº‡£Œ
+    (=jef-china3	. #x78CC)	; &I-JC3-78CC;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH FESTIVAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x796D #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x796D)	; 祭
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3240)	; ㉀
-    (=jef-china3	. #x78D8)	; øº‡£˜
+    (=jef-china3	. #x78D8)	; &I-JC3-78D8;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH REST")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x4F11 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x4F11)	; 休
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3241)	; ㉁
     ))
 (define-char
@@ -565,345 +1143,592 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x81EA #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x81EA)	; 自
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3242)	; ㉂
-    (=jef-china3	. #x78D2)	; øº‡£’
+    (=jef-china3	. #x78D2)	; &I-JC3-78D2;
     ))
 (define-char
   '((name		. "PARENTHESIZED IDEOGRAPH REACH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0028 #x81F3 #x0029)
+    (=>decomposition@compat
+     ((name		  . "LEFT PARENTHESIS")
+      (=ucs		  . #x0028)	; (
+      )
+     ((=ucs		  . #x81F3)	; 至
+      )
+     ((name		  . "RIGHT PARENTHESIS")
+      (=ucs		  . #x0029)	; )
+      ))
     (=ucs		. #x3243)	; ㉃
-    (=jef-china3	. #x78C9)	; øº‡£‰
+    (=jef-china3	. #x78C9)	; &I-JC3-78C9;
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY ONE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      ))
     (=ucs		. #x3251)	; ㉑
-    (=jis-x0213-1-2000	. #x2841)	; ø»¢®
+    (=jis-x0213-1	. #x2841)	; &I-JX1-2841; [08-33]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY TWO")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      ))
     (=ucs		. #x3252)	; ㉒
-    (=jis-x0213-1-2000	. #x2842)	; ø»¢¯
+    (=jis-x0213-1	. #x2842)	; &I-JX1-2842; [08-34]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY THREE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      ))
     (=ucs		. #x3253)	; ㉓
-    (=jis-x0213-1-2000	. #x2843)	; ø»¢°
+    (=jis-x0213-1	. #x2843)	; &I-JX1-2843; [08-35]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY FOUR")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      ))
     (=ucs		. #x3254)	; ㉔
-    (=jis-x0213-1-2000	. #x2844)	; ø»¢±
+    (=jis-x0213-1	. #x2844)	; &I-JX1-2844; [08-36]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY FIVE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      ))
     (=ucs		. #x3255)	; ㉕
-    (=jis-x0213-1-2000	. #x2845)	; ø»¢²
+    (=jis-x0213-1	. #x2845)	; &I-JX1-2845; [08-37]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY SIX")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT SIX")
+      (=ucs		  . #x0036)	; 6
+      ))
     (=ucs		. #x3256)	; ㉖
-    (=jis-x0213-1-2000	. #x2846)	; ø»¢³
+    (=jis-x0213-1	. #x2846)	; &I-JX1-2846; [08-38]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY SEVEN")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT SEVEN")
+      (=ucs		  . #x0037)	; 7
+      ))
     (=ucs		. #x3257)	; ㉗
-    (=jis-x0213-1-2000	. #x2847)	; ø»¢´
+    (=jis-x0213-1	. #x2847)	; &I-JX1-2847; [08-39]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY EIGHT")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT EIGHT")
+      (=ucs		  . #x0038)	; 8
+      ))
     (=ucs		. #x3258)	; ㉘
-    (=jis-x0213-1-2000	. #x2848)	; ø»¢µ
+    (=jis-x0213-1	. #x2848)	; &I-JX1-2848; [08-40]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER TWENTY NINE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((name		  . "DIGIT NINE")
+      (=ucs		  . #x0039)	; 9
+      ))
     (=ucs		. #x3259)	; ㉙
-    (=jis-x0213-1-2000	. #x2849)	; ø»¢¶
+    (=jis-x0213-1	. #x2849)	; &I-JX1-2849; [08-41]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT ZERO")
+      (=ucs		  . #x0030)	; 0
+      ))
     (=ucs		. #x325A)	; ㉚
-    (=jis-x0213-1-2000	. #x284A)	; ø»¢·
+    (=jis-x0213-1	. #x284A)	; &I-JX1-284A; [08-42]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY ONE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      ))
     (=ucs		. #x325B)	; ㉛
-    (=jis-x0213-1-2000	. #x284B)	; ø»¢¸
+    (=jis-x0213-1	. #x284B)	; &I-JX1-284B; [08-43]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY TWO")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      ))
     (=ucs		. #x325C)	; ㉜
-    (=jis-x0213-1-2000	. #x284C)	; ø»¢¹
+    (=jis-x0213-1	. #x284C)	; &I-JX1-284C; [08-44]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY THREE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      ))
     (=ucs		. #x325D)	; ㉝
-    (=jis-x0213-1-2000	. #x284D)	; ø»¢º
+    (=jis-x0213-1	. #x284D)	; &I-JX1-284D; [08-45]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY FOUR")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      ))
     (=ucs		. #x325E)	; ㉞
-    (=jis-x0213-1-2000	. #x284E)	; ø»¢»
+    (=jis-x0213-1	. #x284E)	; &I-JX1-284E; [08-46]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY FIVE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      ))
     (=ucs		. #x325F)	; ㉟
-    (=jis-x0213-1-2000	. #x284F)	; ø»¢¼
+    (=jis-x0213-1	. #x284F)	; &I-JX1-284F; [08-47]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL KIYEOK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1100)
     (=ucs		. #x3260)	; ㉠
-    (=ks-x1001		. #x2831)	; ø»ˆ¤®
+    (=ks-x1001		. #x2831)	; &I-K0-2831; [08-17]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG KIYEOK")
+      (=ucs		  . #x1100)	; ᄀ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL NIEUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1102)
     (=ucs		. #x3261)	; ㉡
-    (=ks-x1001		. #x2832)	; ø»ˆ¤¯
+    (=ks-x1001		. #x2832)	; &I-K0-2832; [08-18]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG NIEUN")
+      (=ucs		  . #x1102)	; ᄂ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL TIKEUT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1103)
     (=ucs		. #x3262)	; ㉢
-    (=ks-x1001		. #x2833)	; ø»ˆ¤°
+    (=ks-x1001		. #x2833)	; &I-K0-2833; [08-19]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG TIKEUT")
+      (=ucs		  . #x1103)	; ᄃ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL RIEUL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1105)
     (=ucs		. #x3263)	; ㉣
-    (=ks-x1001		. #x2834)	; ø»ˆ¤±
+    (=ks-x1001		. #x2834)	; &I-K0-2834; [08-20]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG RIEUL")
+      (=ucs		  . #x1105)	; ᄅ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL MIEUM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1106)
     (=ucs		. #x3264)	; ㉤
-    (=ks-x1001		. #x2835)	; ø»ˆ¤²
+    (=ks-x1001		. #x2835)	; &I-K0-2835; [08-21]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG MIEUM")
+      (=ucs		  . #x1106)	; ᄆ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL PIEUP")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1107)
     (=ucs		. #x3265)	; ㉥
-    (=ks-x1001		. #x2836)	; ø»ˆ¤³
+    (=ks-x1001		. #x2836)	; &I-K0-2836; [08-22]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG PIEUP")
+      (=ucs		  . #x1107)	; ᄇ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL SIOS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1109)
     (=ucs		. #x3266)	; ㉦
-    (=ks-x1001		. #x2837)	; ø»ˆ¤´
+    (=ks-x1001		. #x2837)	; &I-K0-2837; [08-23]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG SIOS")
+      (=ucs		  . #x1109)	; ᄉ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL IEUNG")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110B)
     (=ucs		. #x3267)	; ㉧
-    (=ks-x1001		. #x2838)	; ø»ˆ¤µ
+    (=ks-x1001		. #x2838)	; &I-K0-2838; [08-24]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG IEUNG")
+      (=ucs		  . #x110B)	; ᄋ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL CIEUC")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110C)
     (=ucs		. #x3268)	; ㉨
-    (=ks-x1001		. #x2839)	; ø»ˆ¤¶
+    (=ks-x1001		. #x2839)	; &I-K0-2839; [08-25]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG CIEUC")
+      (=ucs		  . #x110C)	; ᄌ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL CHIEUCH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110E)
     (=ucs		. #x3269)	; ㉩
-    (=ks-x1001		. #x283A)	; ø»ˆ¤·
+    (=ks-x1001		. #x283A)	; &I-K0-283A; [08-26]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG CHIEUCH")
+      (=ucs		  . #x110E)	; ᄎ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL KHIEUKH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110F)
     (=ucs		. #x326A)	; ㉪
-    (=ks-x1001		. #x283B)	; ø»ˆ¤¸
+    (=ks-x1001		. #x283B)	; &I-K0-283B; [08-27]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG KHIEUKH")
+      (=ucs		  . #x110F)	; ᄏ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL THIEUTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1110)
     (=ucs		. #x326B)	; ㉫
-    (=ks-x1001		. #x283C)	; ø»ˆ¤¹
+    (=ks-x1001		. #x283C)	; &I-K0-283C; [08-28]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG THIEUTH")
+      (=ucs		  . #x1110)	; ᄐ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL PHIEUPH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1111)
     (=ucs		. #x326C)	; ㉬
-    (=ks-x1001		. #x283D)	; ø»ˆ¤º
+    (=ks-x1001		. #x283D)	; &I-K0-283D; [08-29]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG PHIEUPH")
+      (=ucs		  . #x1111)	; ᄑ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL HIEUH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1112)
     (=ucs		. #x326D)	; ㉭
-    (=ks-x1001		. #x283E)	; ø»ˆ¤»
+    (=ks-x1001		. #x283E)	; &I-K0-283E; [08-30]
+    (<-circled
+     ((name		  . "HANGUL CHOSEONG HIEUH")
+      (=ucs		  . #x1112)	; ᄒ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED HANGUL KIYEOK A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1100 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG KIYEOK")
+      (=ucs		  . #x1100)	; ᄀ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x326E)	; ㉮
-    (=ks-x1001		. #x283F)	; ø»ˆ¤¼
+    (=ks-x1001		. #x283F)	; &I-K0-283F; [08-31]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL NIEUN A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1102 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG NIEUN")
+      (=ucs		  . #x1102)	; ᄂ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x326F)	; ㉯
-    (=ks-x1001		. #x2840)	; ø»ˆ¤½
+    (=ks-x1001		. #x2840)	; &I-K0-2840; [08-32]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL TIKEUT A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1103 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG TIKEUT")
+      (=ucs		  . #x1103)	; ᄃ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3270)	; ㉰
-    (=ks-x1001		. #x2841)	; ø»ˆ¤¾
+    (=ks-x1001		. #x2841)	; &I-K0-2841; [08-33]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL RIEUL A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1105 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG RIEUL")
+      (=ucs		  . #x1105)	; ᄅ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3271)	; ㉱
-    (=ks-x1001		. #x2842)	; ø»ˆ¤¿
+    (=ks-x1001		. #x2842)	; &I-K0-2842; [08-34]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL MIEUM A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1106 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG MIEUM")
+      (=ucs		  . #x1106)	; ᄆ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3272)	; ㉲
-    (=ks-x1001		. #x2843)	; ø»ˆ¥€
+    (=ks-x1001		. #x2843)	; &I-K0-2843; [08-35]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL PIEUP A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1107 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG PIEUP")
+      (=ucs		  . #x1107)	; ᄇ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3273)	; ㉳
-    (=ks-x1001		. #x2844)	; ø»ˆ¥
+    (=ks-x1001		. #x2844)	; &I-K0-2844; [08-36]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL SIOS A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1109 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG SIOS")
+      (=ucs		  . #x1109)	; ᄉ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3274)	; ㉴
-    (=ks-x1001		. #x2845)	; ø»ˆ¥‚
+    (=ks-x1001		. #x2845)	; &I-K0-2845; [08-37]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL IEUNG A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110B #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG IEUNG")
+      (=ucs		  . #x110B)	; ᄋ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3275)	; ㉵
-    (=ks-x1001		. #x2846)	; ø»ˆ¥ƒ
+    (=ks-x1001		. #x2846)	; &I-K0-2846; [08-38]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL CIEUC A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110C #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG CIEUC")
+      (=ucs		  . #x110C)	; ᄌ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3276)	; ㉶
-    (=ks-x1001		. #x2847)	; ø»ˆ¥„
+    (=ks-x1001		. #x2847)	; &I-K0-2847; [08-39]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL CHIEUCH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110E #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG CHIEUCH")
+      (=ucs		  . #x110E)	; ᄎ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3277)	; ㉷
-    (=ks-x1001		. #x2848)	; ø»ˆ¥…
+    (=ks-x1001		. #x2848)	; &I-K0-2848; [08-40]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL KHIEUKH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x110F #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG KHIEUKH")
+      (=ucs		  . #x110F)	; ᄏ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3278)	; ㉸
-    (=ks-x1001		. #x2849)	; ø»ˆ¥†
+    (=ks-x1001		. #x2849)	; &I-K0-2849; [08-41]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL THIEUTH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1110 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG THIEUTH")
+      (=ucs		  . #x1110)	; ᄐ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x3279)	; ㉹
-    (=ks-x1001		. #x284A)	; ø»ˆ¥‡
+    (=ks-x1001		. #x284A)	; &I-K0-284A; [08-42]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL PHIEUPH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1111 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG PHIEUPH")
+      (=ucs		  . #x1111)	; ᄑ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x327A)	; ㉺
-    (=ks-x1001		. #x284B)	; ø»ˆ¥ˆ
+    (=ks-x1001		. #x284B)	; &I-K0-284B; [08-43]
     ))
 (define-char
   '((name		. "CIRCLED HANGUL HIEUH A")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x1112 #x1161)
+    (=>decomposition@circled
+     ((name		  . "HANGUL CHOSEONG HIEUH")
+      (=ucs		  . #x1112)	; ᄒ
+      )
+     ((name		  . "HANGUL JUNGSEONG A")
+      (=ucs		  . #x1161)	; ᅡ
+      ))
     (=ucs		. #x327B)	; ㉻
-    (=ks-x1001		. #x284C)	; ø»ˆ¥‰
+    (=ks-x1001		. #x284C)	; &I-K0-284C; [08-44]
     ))
 (define-char
   '((name		. "KOREAN STANDARD SYMBOL")
@@ -911,7 +1736,7 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (=ucs		. #x327F)	; ㉿
-    (=ks-x1001		. #x225E)	; ø»ˆœ§
+    (=ks-x1001		. #x225E)	; &I-K0-225E; [02-62]
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ONE")
@@ -919,8 +1744,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 1)
-    (->decomposition	circle #x4E00)
     (=ucs		. #x3280)	; ㊀
+    (<-circled
+     ((=ucs		  . #x4E00)	; 一
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH TWO")
@@ -928,8 +1755,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 2)
-    (->decomposition	circle #x4E8C)
     (=ucs		. #x3281)	; ㊁
+    (<-circled
+     ((=ucs		  . #x4E8C)	; 二
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH THREE")
@@ -937,8 +1766,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 3)
-    (->decomposition	circle #x4E09)
     (=ucs		. #x3282)	; ㊂
+    (<-circled
+     ((=ucs		  . #x4E09)	; 三
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FOUR")
@@ -946,8 +1777,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 4)
-    (->decomposition	circle #x56DB)
     (=ucs		. #x3283)	; ㊃
+    (<-circled
+     ((=ucs		  . #x56DB)	; 四
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FIVE")
@@ -955,8 +1788,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 5)
-    (->decomposition	circle #x4E94)
     (=ucs		. #x3284)	; ㊄
+    (<-circled
+     ((=ucs		  . #x4E94)	; 五
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SIX")
@@ -964,8 +1799,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 6)
-    (->decomposition	circle #x516D)
     (=ucs		. #x3285)	; ㊅
+    (<-circled
+     ((=ucs		  . #x516D)	; 六
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SEVEN")
@@ -973,8 +1810,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 7)
-    (->decomposition	circle #x4E03)
     (=ucs		. #x3286)	; ㊆
+    (<-circled
+     ((=ucs		  . #x4E03)	; 七
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH EIGHT")
@@ -982,8 +1821,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 8)
-    (->decomposition	circle #x516B)
     (=ucs		. #x3287)	; ㊇
+    (<-circled
+     ((=ucs		  . #x516B)	; 八
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH NINE")
@@ -991,8 +1832,10 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 9)
-    (->decomposition	circle #x4E5D)
     (=ucs		. #x3288)	; ㊈
+    (<-circled
+     ((=ucs		  . #x4E5D)	; 九
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH TEN")
@@ -1000,423 +1843,613 @@
     (bidi-category	. "L")
     (mirrored		. nil)
     (numeric-value	. 10)
-    (->decomposition	circle #x5341)
     (=ucs		. #x3289)	; ㊉
+    (<-circled
+     ((=ucs		  . #x5341)	; 十
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH MOON")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x6708)
     (=ucs		. #x328A)	; ㊊
+    (<-circled
+     ((=ucs		  . #x6708)	; 月
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FIRE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x706B)
     (=ucs		. #x328B)	; ㊋
+    (<-circled
+     ((=ucs		  . #x706B)	; 火
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH WATER")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x6C34)
     (=ucs		. #x328C)	; ㊌
+    (<-circled
+     ((=ucs		  . #x6C34)	; æ°´
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH WOOD")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x6728)
     (=ucs		. #x328D)	; ㊍
+    (<-circled
+     ((=ucs		  . #x6728)	; 木
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH METAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x91D1)
     (=ucs		. #x328E)	; ㊎
+    (<-circled
+     ((=ucs		  . #x91D1)	; 金
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH EARTH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x571F)
     (=ucs		. #x328F)	; ㊏
+    (<-circled
+     ((=ucs		  . #x571F)	; 土
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SUN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x65E5)
     (=ucs		. #x3290)	; ㊐
+    (<-circled
+     ((=ucs		  . #x65E5)	; 日
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH STOCK")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x682A)
     (=ucs		. #x3291)	; ㊑
-    (=jef-china3	. #x78E6)	; øº‡£¦
+    (=jef-china3	. #x78E6)	; &I-JC3-78E6;
+    (<-circled
+     ((=ucs		  . #x682A)	; æ ª
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH HAVE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x6709)
     (=ucs		. #x3292)	; ㊒
-    (=jef-china3	. #x78E5)	; øº‡£¥
+    (=jef-china3	. #x78E5)	; &I-JC3-78E5;
+    (<-circled
+     ((=ucs		  . #x6709)	; 有
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SOCIETY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x793E)
     (=ucs		. #x3293)	; ㊓
-    (=jef-china3	. #x78E7)	; øº‡£§
+    (=jef-china3	. #x78E7)	; &I-JC3-78E7;
+    (<-circled
+     ((=ucs		  . #x793E)	; 社
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH NAME")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x540D)
     (=ucs		. #x3294)	; ㊔
-    (=jef-china3	. #x78E1)	; øº‡£¡
+    (=jef-china3	. #x78E1)	; &I-JC3-78E1;
+    (<-circled
+     ((=ucs		  . #x540D)	; 名
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SPECIAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x7279)
     (=ucs		. #x3295)	; ㊕
+    (<-circled
+     ((=ucs		  . #x7279)	; 特
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FINANCIAL")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x8CA1)
     (=ucs		. #x3296)	; ㊖
-    (=jef-china3	. #x78EA)	; øº‡£ª
+    (=jef-china3	. #x78EA)	; &I-JC3-78EA;
+    (<-circled
+     ((=ucs		  . #x8CA1)	; 財
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH CONGRATULATION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x795D)
     (=ucs		. #x3297)	; ㊗
+    (<-circled
+     ((=ucs		  . #x795D)	; 祝
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH LABOR")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x52B4)
     (=ucs		. #x3298)	; ㊘
-    (=jef-china3	. #x78E3)	; øº‡££
+    (=jef-china3	. #x78E3)	; &I-JC3-78E3;
+    (<-circled
+     ((=ucs		  . #x52B4)	; 労
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SECRET")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x79D8)
     (=ucs		. #x3299)	; ㊙
+    (<-circled
+     ((=ucs		  . #x79D8)	; 秘
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH MALE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x7537)
     (=ucs		. #x329A)	; ㊚
+    (<-circled
+     ((=ucs		  . #x7537)	; 男
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH FEMALE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5973)
     (=ucs		. #x329B)	; ㊛
+    (<-circled
+     ((=ucs		  . #x5973)	; 女
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SUITABLE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x9069)
     (=ucs		. #x329C)	; ㊜
+    (<-circled
+     ((=ucs		  . #x9069)	; 適
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH EXCELLENT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x512A)
     (=ucs		. #x329D)	; ㊝
+    (<-circled
+     ((=ucs		  . #x512A)	; 優
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH PRINT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5370)
     (=ucs		. #x329E)	; ㊞
+    (<-circled
+     ((=ucs		  . #x5370)	; 印
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ATTENTION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x6CE8)
     (=ucs		. #x329F)	; ㊟
+    (<-circled
+     ((=ucs		  . #x6CE8)	; 注
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ITEM")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x9805)
     (=ucs		. #x32A0)	; ㊠
+    (<-circled
+     ((=ucs		  . #x9805)	; 項
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH REST")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x4F11)
     (=ucs		. #x32A1)	; ㊡
+    (<-circled
+     ((=ucs		  . #x4F11)	; 休
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH COPY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5199)
     (=ucs		. #x32A2)	; ㊢
+    (<-circled
+     ((=ucs		  . #x5199)	; 写
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH CORRECT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x6B63)
     (=ucs		. #x32A3)	; ㊣
-    (=cns11643-1	. #x2221)	; ø»‘ƒº
-    (=big5		. #xA1C0)	; ý¢€Š‡€
+    (=cns11643-1	. #x2221)	; &I-C1-2221; [02-01]
+    (=big5		. #xA1C0)	; &I-B-A1C0;
+    (<-circled
+     ((=ucs		  . #x6B63)	; æ­£
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH HIGH")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x4E0A)
     (=ucs		. #x32A4)	; ㊤
-    (=jis-x0213-1-2000	. #x2D65)	; ø»¢¥¨
+    (=jis-x0213-1	. #x2D65)	; &I-JX1-2D65; [13-69]
+    (<-circled
+     ((=ucs		  . #x4E0A)	; 上
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH CENTRE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x4E2D)
     (=ucs		. #x32A5)	; ㊥
-    (=jis-x0213-1-2000	. #x2D66)	; ø»¢¥©
+    (=jis-x0213-1	. #x2D66)	; &I-JX1-2D66; [13-70]
+    (<-circled
+     ((=ucs		  . #x4E2D)	; 中
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH LOW")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x4E0B)
     (=ucs		. #x32A6)	; ㊦
-    (=jis-x0213-1-2000	. #x2D67)	; ø»¢¥ª
+    (=jis-x0213-1	. #x2D67)	; &I-JX1-2D67; [13-71]
+    (<-circled
+     ((=ucs		  . #x4E0B)	; 下
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH LEFT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5DE6)
     (=ucs		. #x32A7)	; ㊧
-    (=jis-x0213-1-2000	. #x2D68)	; ø»¢¥«
+    (=jis-x0213-1	. #x2D68)	; &I-JX1-2D68; [13-72]
+    (<-circled
+     ((=ucs		  . #x5DE6)	; å·¦
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH RIGHT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x53F3)
     (=ucs		. #x32A8)	; ㊨
-    (=jis-x0213-1-2000	. #x2D69)	; ø»¢¥¬
+    (=jis-x0213-1	. #x2D69)	; &I-JX1-2D69; [13-73]
+    (<-circled
+     ((=ucs		  . #x53F3)	; 右
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH MEDICINE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x533B)
     (=ucs		. #x32A9)	; ㊩
-    (=jef-china3	. #x78DF)	; øº‡£Ÿ
+    (=jef-china3	. #x78DF)	; &I-JC3-78DF;
+    (<-circled
+     ((=ucs		  . #x533B)	; 医
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH RELIGION")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5B97)
     (=ucs		. #x32AA)	; ㊪
-    (=jef-china3	. #x78E2)	; øº‡£¢
+    (=jef-china3	. #x78E2)	; &I-JC3-78E2;
+    (<-circled
+     ((=ucs		  . #x5B97)	; 宗
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH STUDY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5B66)
     (=ucs		. #x32AB)	; ㊫
-    (=jef-china3	. #x78E4)	; øº‡£¤
+    (=jef-china3	. #x78E4)	; &I-JC3-78E4;
+    (<-circled
+     ((=ucs		  . #x5B66)	; å­¦
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH SUPERVISE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x76E3)
     (=ucs		. #x32AC)	; ㊬
-    (=jef-china3	. #x78E8)	; øº‡£¨
+    (=jef-china3	. #x78E8)	; &I-JC3-78E8;
+    (<-circled
+     ((=ucs		  . #x76E3)	; 監
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ENTERPRISE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x4F01)
     (=ucs		. #x32AD)	; ㊭
-    (=jef-china3	. #x78DE)	; øº‡£ž
+    (=jef-china3	. #x78DE)	; &I-JC3-78DE;
+    (<-circled
+     ((=ucs		  . #x4F01)	; 企
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH RESOURCE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x8CC7)
     (=ucs		. #x32AE)	; ㊮
-    (=jef-china3	. #x78E9)	; øº‡£©
+    (=jef-china3	. #x78E9)	; &I-JC3-78E9;
+    (<-circled
+     ((=ucs		  . #x8CC7)	; 資
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH ALLIANCE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x5354)
     (=ucs		. #x32AF)	; ㊯
-    (=jef-china3	. #x78E0)	; øº‡£ 
+    (=jef-china3	. #x78E0)	; &I-JC3-78E0;
+    (<-circled
+     ((=ucs		  . #x5354)	; 協
+      ))
     ))
 (define-char
   '((name		. "CIRCLED IDEOGRAPH NIGHT")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x591C)
     (=ucs		. #x32B0)	; ㊰
-    (=jef-china3	. #x78DD)	; øº‡£
+    (=jef-china3	. #x78DD)	; &I-JC3-78DD;
+    (<-circled
+     ((=ucs		  . #x591C)	; 夜
+      ))
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY SIX")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT SIX")
+      (=ucs		  . #x0036)	; 6
+      ))
     (=ucs		. #x32B1)	; ㊱
-    (=jis-x0213-1-2000	. #x2850)	; ø»¢½
+    (=jis-x0213-1	. #x2850)	; &I-JX1-2850; [08-48]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY SEVEN")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT SEVEN")
+      (=ucs		  . #x0037)	; 7
+      ))
     (=ucs		. #x32B2)	; ㊲
-    (=jis-x0213-1-2000	. #x2851)	; ø»¢¾
+    (=jis-x0213-1	. #x2851)	; &I-JX1-2851; [08-49]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY EIGHT")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT EIGHT")
+      (=ucs		  . #x0038)	; 8
+      ))
     (=ucs		. #x32B3)	; ㊳
-    (=jis-x0213-1-2000	. #x2852)	; ø»¢¿
+    (=jis-x0213-1	. #x2852)	; &I-JX1-2852; [08-50]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER THIRTY NINE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((name		  . "DIGIT NINE")
+      (=ucs		  . #x0039)	; 9
+      ))
     (=ucs		. #x32B4)	; ㊴
-    (=jis-x0213-1-2000	. #x2853)	; ø»¢ž€
+    (=jis-x0213-1	. #x2853)	; &I-JX1-2853; [08-51]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT ZERO")
+      (=ucs		  . #x0030)	; 0
+      ))
     (=ucs		. #x32B5)	; ㊵
-    (=jis-x0213-1-2000	. #x2854)	; ø»¢ž
+    (=jis-x0213-1	. #x2854)	; &I-JX1-2854; [08-52]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY ONE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      ))
     (=ucs		. #x32B6)	; ㊶
-    (=jis-x0213-1-2000	. #x2855)	; ø»¢ž‚
+    (=jis-x0213-1	. #x2855)	; &I-JX1-2855; [08-53]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY TWO")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      ))
     (=ucs		. #x32B7)	; ㊷
-    (=jis-x0213-1-2000	. #x2856)	; ø»¢žƒ
+    (=jis-x0213-1	. #x2856)	; &I-JX1-2856; [08-54]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY THREE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      ))
     (=ucs		. #x32B8)	; ㊸
-    (=jis-x0213-1-2000	. #x2857)	; ø»¢ž„
+    (=jis-x0213-1	. #x2857)	; &I-JX1-2857; [08-55]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY FOUR")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      ))
     (=ucs		. #x32B9)	; ㊹
-    (=jis-x0213-1-2000	. #x2858)	; ø»¢ž…
+    (=jis-x0213-1	. #x2858)	; &I-JX1-2858; [08-56]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY FIVE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      ))
     (=ucs		. #x32BA)	; ㊺
-    (=jis-x0213-1-2000	. #x2859)	; ø»¢ž†
+    (=jis-x0213-1	. #x2859)	; &I-JX1-2859; [08-57]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY SIX")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT SIX")
+      (=ucs		  . #x0036)	; 6
+      ))
     (=ucs		. #x32BB)	; ㊻
-    (=jis-x0213-1-2000	. #x285A)	; ø»¢ž‡
+    (=jis-x0213-1	. #x285A)	; &I-JX1-285A; [08-58]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY SEVEN")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT SEVEN")
+      (=ucs		  . #x0037)	; 7
+      ))
     (=ucs		. #x32BC)	; ㊼
-    (=jis-x0213-1-2000	. #x285B)	; ø»¢žˆ
+    (=jis-x0213-1	. #x285B)	; &I-JX1-285B; [08-59]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY EIGHT")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT EIGHT")
+      (=ucs		  . #x0038)	; 8
+      ))
     (=ucs		. #x32BD)	; ㊽
-    (=jis-x0213-1-2000	. #x285C)	; ø»¢ž‰
+    (=jis-x0213-1	. #x285C)	; &I-JX1-285C; [08-60]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FORTY NINE")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((name		  . "DIGIT NINE")
+      (=ucs		  . #x0039)	; 9
+      ))
     (=ucs		. #x32BE)	; ㊾
-    (=jis-x0213-1-2000	. #x285D)	; ø»¢žŠ
+    (=jis-x0213-1	. #x285D)	; &I-JX1-285D; [08-61]
     ))
 (define-char
   '((name		. "CIRCLED NUMBER FIFTY")
+    (=>decomposition@circled
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      )
+     ((name		  . "DIGIT ZERO")
+      (=ucs		  . #x0030)	; 0
+      ))
     (=ucs		. #x32BF)	; ㊿
-    (=jis-x0213-1-2000	. #x285E)	; ø»¢ž‹
+    (=jis-x0213-1	. #x285E)	; &I-JX1-285E; [08-62]
     ))
 (define-char
   '((name		. "IDEOGRAPHIC TELEGRAPH SYMBOL FOR JANUARY")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0031 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C0)	; ㋀
     ))
 (define-char
@@ -1424,7 +2457,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0032 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C1)	; ㋁
     ))
 (define-char
@@ -1432,7 +2470,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0033 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT THREE")
+      (=ucs		  . #x0033)	; 3
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C2)	; ㋂
     ))
 (define-char
@@ -1440,7 +2483,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0034 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT FOUR")
+      (=ucs		  . #x0034)	; 4
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C3)	; ㋃
     ))
 (define-char
@@ -1448,7 +2496,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0035 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT FIVE")
+      (=ucs		  . #x0035)	; 5
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C4)	; ㋄
     ))
 (define-char
@@ -1456,7 +2509,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0036 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT SIX")
+      (=ucs		  . #x0036)	; 6
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C5)	; ㋅
     ))
 (define-char
@@ -1464,7 +2522,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0037 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT SEVEN")
+      (=ucs		  . #x0037)	; 7
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C6)	; ㋆
     ))
 (define-char
@@ -1472,7 +2535,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0038 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT EIGHT")
+      (=ucs		  . #x0038)	; 8
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C7)	; ㋇
     ))
 (define-char
@@ -1480,7 +2548,12 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0039 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT NINE")
+      (=ucs		  . #x0039)	; 9
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C8)	; ㋈
     ))
 (define-char
@@ -1488,7 +2561,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0031 #x0030 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      )
+     ((name		  . "DIGIT ZERO")
+      (=ucs		  . #x0030)	; 0
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32C9)	; ㋉
     ))
 (define-char
@@ -1496,7 +2577,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0031 #x0031 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      )
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32CA)	; ㋊
     ))
 (define-char
@@ -1504,7 +2593,15 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0031 #x0032 #x6708)
+    (=>decomposition@compat
+     ((name		  . "DIGIT ONE")
+      (=ucs		  . #x0031)	; 1
+      )
+     ((name		  . "DIGIT TWO")
+      (=ucs		  . #x0032)	; 2
+      )
+     ((=ucs		  . #x6708)	; 月
+      ))
     (=ucs		. #x32CB)	; ㋋
     ))
 (define-char
@@ -1512,399 +2609,540 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30A2)
     (=ucs		. #x32D0)	; ㋐
-    (=jis-x0213-1-2000	. #x2C5B)	; ø»¢¤€
+    (=jis-x0213-1	. #x2C5B)	; &I-JX1-2C5B; [12-59]
+    (<-circled
+     ((name		  . "KATAKANA LETTER A")
+      (=ucs		  . #x30A2)	; ア
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA I")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30A4)
     (=ucs		. #x32D1)	; ㋑
-    (=jis-x0213-1-2000	. #x2C5C)	; ø»¢¤
+    (=jis-x0213-1	. #x2C5C)	; &I-JX1-2C5C; [12-60]
+    (<-circled
+     ((name		  . "KATAKANA LETTER I")
+      (=ucs		  . #x30A4)	; イ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA U")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30A6)
     (=ucs		. #x32D2)	; ㋒
-    (=jis-x0213-1-2000	. #x2C5D)	; ø»¢¤‚
+    (=jis-x0213-1	. #x2C5D)	; &I-JX1-2C5D; [12-61]
+    (<-circled
+     ((name		  . "KATAKANA LETTER U")
+      (=ucs		  . #x30A6)	; ウ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA E")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30A8)
     (=ucs		. #x32D3)	; ㋓
-    (=jis-x0213-1-2000	. #x2C5E)	; ø»¢¤ƒ
+    (=jis-x0213-1	. #x2C5E)	; &I-JX1-2C5E; [12-62]
+    (<-circled
+     ((name		  . "KATAKANA LETTER E")
+      (=ucs		  . #x30A8)	; エ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA O")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30AA)
     (=ucs		. #x32D4)	; ㋔
-    (=jis-x0213-1-2000	. #x2C5F)	; ø»¢¤„
+    (=jis-x0213-1	. #x2C5F)	; &I-JX1-2C5F; [12-63]
+    (<-circled
+     ((name		  . "KATAKANA LETTER O")
+      (=ucs		  . #x30AA)	; オ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30AB)
     (=ucs		. #x32D5)	; ㋕
-    (=jis-x0213-1-2000	. #x2C60)	; ø»¢¤…
+    (=jis-x0213-1	. #x2C60)	; &I-JX1-2C60; [12-64]
+    (<-circled
+     ((name		  . "KATAKANA LETTER KA")
+      (=ucs		  . #x30AB)	; カ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30AD)
     (=ucs		. #x32D6)	; ㋖
-    (=jis-x0213-1-2000	. #x2C61)	; ø»¢¤†
+    (=jis-x0213-1	. #x2C61)	; &I-JX1-2C61; [12-65]
+    (<-circled
+     ((name		  . "KATAKANA LETTER KI")
+      (=ucs		  . #x30AD)	; キ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30AF)
     (=ucs		. #x32D7)	; ㋗
-    (=jis-x0213-1-2000	. #x2C62)	; ø»¢¤‡
+    (=jis-x0213-1	. #x2C62)	; &I-JX1-2C62; [12-66]
+    (<-circled
+     ((name		  . "KATAKANA LETTER KU")
+      (=ucs		  . #x30AF)	; ク
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30B1)
     (=ucs		. #x32D8)	; ㋘
-    (=jis-x0213-1-2000	. #x2C63)	; ø»¢¤ˆ
+    (=jis-x0213-1	. #x2C63)	; &I-JX1-2C63; [12-67]
+    (<-circled
+     ((name		  . "KATAKANA LETTER KE")
+      (=ucs		  . #x30B1)	; ケ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA KO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30B3)
     (=ucs		. #x32D9)	; ㋙
-    (=jis-x0213-1-2000	. #x2C64)	; ø»¢¤‰
+    (=jis-x0213-1	. #x2C64)	; &I-JX1-2C64; [12-68]
+    (<-circled
+     ((name		  . "KATAKANA LETTER KO")
+      (=ucs		  . #x30B3)	; コ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30B5)
     (=ucs		. #x32DA)	; ㋚
-    (=jis-x0213-1-2000	. #x2C65)	; ø»¢¤Š
+    (=jis-x0213-1	. #x2C65)	; &I-JX1-2C65; [12-69]
+    (<-circled
+     ((name		  . "KATAKANA LETTER SA")
+      (=ucs		  . #x30B5)	; サ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30B7)
     (=ucs		. #x32DB)	; ㋛
-    (=jis-x0213-1-2000	. #x2C66)	; ø»¢¤‹
+    (=jis-x0213-1	. #x2C66)	; &I-JX1-2C66; [12-70]
+    (<-circled
+     ((name		  . "KATAKANA LETTER SI")
+      (=ucs		  . #x30B7)	; シ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30B9)
     (=ucs		. #x32DC)	; ㋜
-    (=jis-x0213-1-2000	. #x2C67)	; ø»¢¤Œ
+    (=jis-x0213-1	. #x2C67)	; &I-JX1-2C67; [12-71]
+    (<-circled
+     ((name		  . "KATAKANA LETTER SU")
+      (=ucs		  . #x30B9)	; ス
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30BB)
     (=ucs		. #x32DD)	; ㋝
-    (=jis-x0213-1-2000	. #x2C68)	; ø»¢¤
+    (=jis-x0213-1	. #x2C68)	; &I-JX1-2C68; [12-72]
+    (<-circled
+     ((name		  . "KATAKANA LETTER SE")
+      (=ucs		  . #x30BB)	; セ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA SO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30BD)
     (=ucs		. #x32DE)	; ㋞
-    (=jis-x0213-1-2000	. #x2C69)	; ø»¢¤Ž
+    (=jis-x0213-1	. #x2C69)	; &I-JX1-2C69; [12-73]
+    (<-circled
+     ((name		  . "KATAKANA LETTER SO")
+      (=ucs		  . #x30BD)	; ソ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30BF)
     (=ucs		. #x32DF)	; ㋟
-    (=jis-x0213-1-2000	. #x2C6A)	; ø»¢¤
+    (=jis-x0213-1	. #x2C6A)	; &I-JX1-2C6A; [12-74]
+    (<-circled
+     ((name		  . "KATAKANA LETTER TA")
+      (=ucs		  . #x30BF)	; タ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30C1)
     (=ucs		. #x32E0)	; ㋠
-    (=jis-x0213-1-2000	. #x2C6B)	; ø»¢¤
+    (=jis-x0213-1	. #x2C6B)	; &I-JX1-2C6B; [12-75]
+    (<-circled
+     ((name		  . "KATAKANA LETTER TI")
+      (=ucs		  . #x30C1)	; チ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30C4)
     (=ucs		. #x32E1)	; ㋡
-    (=jis-x0213-1-2000	. #x2C6C)	; ø»¢¤‘
+    (=jis-x0213-1	. #x2C6C)	; &I-JX1-2C6C; [12-76]
+    (<-circled
+     ((name		  . "KATAKANA LETTER TU")
+      (=ucs		  . #x30C4)	; ツ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30C6)
     (=ucs		. #x32E2)	; ㋢
-    (=jis-x0213-1-2000	. #x2C6D)	; ø»¢¤’
+    (=jis-x0213-1	. #x2C6D)	; &I-JX1-2C6D; [12-77]
+    (<-circled
+     ((name		  . "KATAKANA LETTER TE")
+      (=ucs		  . #x30C6)	; テ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA TO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30C8)
     (=ucs		. #x32E3)	; ㋣
-    (=jis-x0213-1-2000	. #x2C6E)	; ø»¢¤“
+    (=jis-x0213-1	. #x2C6E)	; &I-JX1-2C6E; [12-78]
+    (<-circled
+     ((name		  . "KATAKANA LETTER TO")
+      (=ucs		  . #x30C8)	; ト
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30CA)
     (=ucs		. #x32E4)	; ㋤
+    (<-circled
+     ((name		  . "KATAKANA LETTER NA")
+      (=ucs		  . #x30CA)	; ナ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30CB)
     (=ucs		. #x32E5)	; ㋥
-    (=jis-x0213-1-2000	. #x2C71)	; ø»¢¤–
+    (=jis-x0213-1	. #x2C71)	; &I-JX1-2C71; [12-81]
+    (<-circled
+     ((name		  . "KATAKANA LETTER NI")
+      (=ucs		  . #x30CB)	; ニ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30CC)
     (=ucs		. #x32E6)	; ㋦
+    (<-circled
+     ((name		  . "KATAKANA LETTER NU")
+      (=ucs		  . #x30CC)	; ヌ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30CD)
     (=ucs		. #x32E7)	; ㋧
+    (<-circled
+     ((name		  . "KATAKANA LETTER NE")
+      (=ucs		  . #x30CD)	; ネ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA NO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30CE)
     (=ucs		. #x32E8)	; ㋨
+    (<-circled
+     ((name		  . "KATAKANA LETTER NO")
+      (=ucs		  . #x30CE)	; ノ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30CF)
     (=ucs		. #x32E9)	; ㋩
-    (=jis-x0213-1-2000	. #x2C70)	; ø»¢¤•
+    (=jis-x0213-1	. #x2C70)	; &I-JX1-2C70; [12-80]
+    (<-circled
+     ((name		  . "KATAKANA LETTER HA")
+      (=ucs		  . #x30CF)	; ハ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30D2)
     (=ucs		. #x32EA)	; ㋪
+    (<-circled
+     ((name		  . "KATAKANA LETTER HI")
+      (=ucs		  . #x30D2)	; ヒ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30D5)
     (=ucs		. #x32EB)	; ㋫
+    (<-circled
+     ((name		  . "KATAKANA LETTER HU")
+      (=ucs		  . #x30D5)	; フ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30D8)
     (=ucs		. #x32EC)	; ㋬
-    (=jis-x0213-1-2000	. #x2C73)	; ø»¢¤˜
+    (=jis-x0213-1	. #x2C73)	; &I-JX1-2C73; [12-83]
+    (<-circled
+     ((name		  . "KATAKANA LETTER HE")
+      (=ucs		  . #x30D8)	; ヘ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA HO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30DB)
     (=ucs		. #x32ED)	; ㋭
-    (=jis-x0213-1-2000	. #x2C72)	; ø»¢¤—
+    (=jis-x0213-1	. #x2C72)	; &I-JX1-2C72; [12-82]
+    (<-circled
+     ((name		  . "KATAKANA LETTER HO")
+      (=ucs		  . #x30DB)	; ホ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30DE)
     (=ucs		. #x32EE)	; ㋮
+    (<-circled
+     ((name		  . "KATAKANA LETTER MA")
+      (=ucs		  . #x30DE)	; マ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30DF)
     (=ucs		. #x32EF)	; ㋯
+    (<-circled
+     ((name		  . "KATAKANA LETTER MI")
+      (=ucs		  . #x30DF)	; ミ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E0)
     (=ucs		. #x32F0)	; ㋰
+    (<-circled
+     ((name		  . "KATAKANA LETTER MU")
+      (=ucs		  . #x30E0)	; ム
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA ME")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E1)
     (=ucs		. #x32F1)	; ㋱
+    (<-circled
+     ((name		  . "KATAKANA LETTER ME")
+      (=ucs		  . #x30E1)	; メ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA MO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E2)
     (=ucs		. #x32F2)	; ㋲
+    (<-circled
+     ((name		  . "KATAKANA LETTER MO")
+      (=ucs		  . #x30E2)	; モ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA YA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E4)
     (=ucs		. #x32F3)	; ㋳
+    (<-circled
+     ((name		  . "KATAKANA LETTER YA")
+      (=ucs		  . #x30E4)	; ヤ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA YU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E6)
     (=ucs		. #x32F4)	; ㋴
+    (<-circled
+     ((name		  . "KATAKANA LETTER YU")
+      (=ucs		  . #x30E6)	; ユ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA YO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E8)
     (=ucs		. #x32F5)	; ㋵
+    (<-circled
+     ((name		  . "KATAKANA LETTER YO")
+      (=ucs		  . #x30E8)	; ヨ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30E9)
     (=ucs		. #x32F6)	; ㋶
+    (<-circled
+     ((name		  . "KATAKANA LETTER RA")
+      (=ucs		  . #x30E9)	; ラ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30EA)
     (=ucs		. #x32F7)	; ㋷
+    (<-circled
+     ((name		  . "KATAKANA LETTER RI")
+      (=ucs		  . #x30EA)	; リ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RU")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30EB)
     (=ucs		. #x32F8)	; ㋸
+    (<-circled
+     ((name		  . "KATAKANA LETTER RU")
+      (=ucs		  . #x30EB)	; ル
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30EC)
     (=ucs		. #x32F9)	; ㋹
+    (<-circled
+     ((name		  . "KATAKANA LETTER RE")
+      (=ucs		  . #x30EC)	; レ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA RO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30ED)
     (=ucs		. #x32FA)	; ㋺
-    (=jis-x0213-1-2000	. #x2C6F)	; ø»¢¤”
+    (=jis-x0213-1	. #x2C6F)	; &I-JX1-2C6F; [12-79]
+    (<-circled
+     ((name		  . "KATAKANA LETTER RO")
+      (=ucs		  . #x30ED)	; ロ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30EF)
     (=ucs		. #x32FB)	; ㋻
+    (<-circled
+     ((name		  . "KATAKANA LETTER WA")
+      (=ucs		  . #x30EF)	; ワ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WI")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30F0)
     (=ucs		. #x32FC)	; ㋼
+    (<-circled
+     ((name		  . "KATAKANA LETTER WI")
+      (=ucs		  . #x30F0)	; ヰ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WE")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30F1)
     (=ucs		. #x32FD)	; ㋽
+    (<-circled
+     ((name		  . "KATAKANA LETTER WE")
+      (=ucs		  . #x30F1)	; ヱ
+      ))
     ))
 (define-char
   '((name		. "CIRCLED KATAKANA WO")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	circle #x30F2)
     (=ucs		. #x32FE)	; ㋾
+    (<-circled
+     ((name		  . "KATAKANA LETTER WO")
+      (=ucs		  . #x30F2)	; ヲ
+      ))
     ))