X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lisp%2Futf-2000%2Fu02100-Letterlike-Symbols.el;h=799e2e04db9b496ccba3506be29181f0782af896;hp=47d29df69792fb6aa69ddac6bd035f508355b58b;hb=8ba3626da629f1b4ecafae24c85f3d0cb3bf8b8e;hpb=b9d3e7ef920fd6d945a3d4d512f99d5d82430cf9

diff --git a/lisp/utf-2000/u02100-Letterlike-Symbols.el b/lisp/utf-2000/u02100-Letterlike-Symbols.el
index 47d29df..799e2e0 100644
--- a/lisp/utf-2000/u02100-Letterlike-Symbols.el
+++ b/lisp/utf-2000/u02100-Letterlike-Symbols.el
@@ -4,7 +4,16 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0061 #x002F #x0063)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "SOLIDUS")
+      (=ucs		  . #x002F)	; /
+      )
+     ((name		  . "LATIN SMALL LETTER C")
+      (=ucs		  . #x0063)	; c
+      ))
     (=ucs		. #x2100)	; ℀
     ))
 (define-char
@@ -12,7 +21,16 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0061 #x002F #x0073)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER A")
+      (=ucs		  . #x0061)	; a
+      )
+     ((name		  . "SOLIDUS")
+      (=ucs		  . #x002F)	; /
+      )
+     ((name		  . "LATIN SMALL LETTER S")
+      (=ucs		  . #x0073)	; s
+      ))
     (=ucs		. #x2101)	; ℁
     ))
 (define-char
@@ -20,33 +38,50 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0043)
     (=ucs		. #x2102)	; ℂ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER C")
+      (=ucs		  . #x0043)	; C
+      ))
     ))
 (define-char
   '((name		. "DEGREE CELSIUS")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x00B0 #x0043)
+    (=>decomposition@compat/unit
+     ((name		  . "DEGREE SIGN")
+      (=ucs		  . #x00B0)	; °
+      )
+     ((name		  . "LATIN CAPITAL LETTER C")
+      (=ucs		  . #x0043)	; C
+      ))
     (=ucs		. #x2103)	; ℃
     ))
 (define-char
-  '((->decomposition	compat #x00B0 #xFF23)
-    (<-denotational
+  '((<-denotational
      ((name		  . "DEGREE CELSIUS")
       (=ucs		  . #x2103)	; ℃
       ))
-    (<-fullwidth
-     ((name		  . "DEGREE CELSIUS")
-      (=ucs		  . #x2103)	; ℃
+    (=>decomposition@compat/unit
+     ((name		  . "DEGREE SIGN")
+      (=ucs		  . #x00B0)	; °
+      )
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER C")
+      (=ucs		  . #xFF23)	; ï¼£
       ))
+    (=ucs@gb		. #x2103)	; &J90-216E;
+    (=ucs@jis		. #x2103)	; &J90-216E;
     (=jis-x0208		. #x216E)	; &J90-216E; [01-78]
     (=gb2312		. #x2166)	; &I-G0-2166; [01-70]
     (=ks-x1001		. #x2149)	; &I-K0-2149; [01-41]
     (=cns11643-1	. #x226A)	; &I-C1-226A; [02-74]
+    (=jis-x0213-1	. #x216E)	; &I-JX1-216E; [01-78]
     (=big5		. #xA24A)	; &I-B-A24A;
-    (=ucs@jis		. #x2103)	; &J90-216E;
+    (<-fullwidth
+     ((name		  . "DEGREE CELSIUS")
+      (=ucs		  . #x2103)	; ℃
+      ))
     ))
 (define-char
   '((name		. "CENTRE LINE SYMBOL")
@@ -60,17 +95,47 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0063 #x002F #x006F)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER C")
+      (=ucs		  . #x0063)	; c
+      )
+     ((name		  . "SOLIDUS")
+      (=ucs		  . #x002F)	; /
+      )
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      ))
     (=ucs		. #x2105)	; ℅
-    (=cns11643-1	. #x2222)	; &I-C1-2222; [02-02]
+    ))
+(define-char
+  '((<-denotational
+     ((name		  . "CARE OF")
+      (=ucs		  . #x2105)	; ℅
+      ))
+    (=ucs@cns		. #x2105)	; &C1-2222;
+    (=ucs@big5		. #x2105)	; &C1-2222;
+    (=cns11643-1	. #x2222)	; &C1-2222; [02-02]
     (=big5		. #xA1C1)	; &I-B-A1C1;
+    (<-fullwidth
+     ((name		  . "CARE OF")
+      (=ucs		  . #x2105)	; ℅
+      ))
     ))
 (define-char
   '((name		. "CADA UNA")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0063 #x002F #x0075)
+    (=>decomposition@compat
+     ((name		  . "LATIN SMALL LETTER C")
+      (=ucs		  . #x0063)	; c
+      )
+     ((name		  . "SOLIDUS")
+      (=ucs		  . #x002F)	; /
+      )
+     ((name		  . "LATIN SMALL LETTER U")
+      (=ucs		  . #x0075)	; u
+      ))
     (=ucs		. #x2106)	; ℆
     ))
 (define-char
@@ -78,8 +143,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x0190)
     (=ucs		. #x2107)	; ℇ
+    (<-compat/math
+     ((name		  . "LATIN CAPITAL LETTER OPEN E")
+      (=ucs		  . #x0190)	; Ɛ
+      ))
     ))
 (define-char
   '((name		. "SCRUPLE")
@@ -93,128 +161,173 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x00B0 #x0046)
+    (=>decomposition@compat/unit
+     ((name		  . "DEGREE SIGN")
+      (=ucs		  . #x00B0)	; °
+      )
+     ((name		  . "LATIN CAPITAL LETTER F")
+      (=ucs		  . #x0046)	; F
+      ))
     (=ucs		. #x2109)	; ℉
     ))
 (define-char
-  '((->decomposition	compat #x00B0 #xFF26)
-    (<-denotational
+  '((<-denotational
      ((name		  . "DEGREE FAHRENHEIT")
       (=ucs		  . #x2109)	; ℉
       ))
-    (<-fullwidth
-     ((name		  . "DEGREE FAHRENHEIT")
-      (=ucs		  . #x2109)	; ℉
+    (=>decomposition@compat/unit
+     ((name		  . "DEGREE SIGN")
+      (=ucs		  . #x00B0)	; °
+      )
+     ((name		  . "FULLWIDTH LATIN CAPITAL LETTER F")
+      (=ucs		  . #xFF26)	; Ｆ
       ))
     (=ks-x1001		. #x2235)	; &C1-226B; [02-21]
     (=cns11643-1	. #x226B)	; &I-C1-226B; [02-75]
     (=big5		. #xA24B)	; &I-B-A24B;
+    (<-fullwidth
+     ((name		  . "DEGREE FAHRENHEIT")
+      (=ucs		  . #x2109)	; ℉
+      ))
     ))
 (define-char
   '((name		. "SCRIPT SMALL G")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0067)
     (=ucs		. #x210A)	; ℊ
+    (<-font/script
+     ((name		  . "LATIN SMALL LETTER G")
+      (=ucs		  . #x0067)	; g
+      ))
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL H")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0048)
     (=ucs		. #x210B)	; ℋ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      ))
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL H")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0048)
     (=ucs		. #x210C)	; ℌ
+    (<-font/black-letter
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      ))
     ))
 (define-char
   '((name		. "DOUBLE-STRUCK CAPITAL H")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0048)
     (=ucs		. #x210D)	; ℍ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER H")
+      (=ucs		  . #x0048)	; H
+      ))
     ))
 (define-char
   '((name		. "PLANCK CONSTANT")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0068)
     (=ucs		. #x210E)	; ℎ
+    (<-font/script/physical
+     ((name		  . "LATIN SMALL LETTER H")
+      (=ucs		  . #x0068)	; h
+      ))
     ))
 (define-char
   '((name		. "PLANCK CONSTANT OVER TWO PI")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0127)
     (=ucs		. #x210F)	; ℏ
+    (<-font/script/physical
+     ((name		  . "LATIN SMALL LETTER H WITH STROKE")
+      (=ucs		  . #x0127)	; ħ
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "PLANCK CONSTANT OVER TWO PI")
       (=ucs		  . #x210F)	; ℏ
       ))
+    (=ucs@jis/fw	. #x210F)	; &JX1-235D;
+    (=jis-x0213-1	. #x235D)	; &JX1-235D; [03-61]
     (<-fullwidth
      ((name		  . "PLANCK CONSTANT OVER TWO PI")
       (=ucs		  . #x210F)	; ℏ
       ))
-    (=jis-x0213-1-2000	. #x235D)	; &JX1-235D; [03-61]
-    (=ucs@jis/fw	. #x210F)	; &JX1-235D;
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL I")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0049)
     (=ucs		. #x2110)	; ℐ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      ))
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL I")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0049)
     (=ucs		. #x2111)	; ℑ
+    (<-font/black-letter
+     ((name		  . "LATIN CAPITAL LETTER I")
+      (=ucs		  . #x0049)	; I
+      ))
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL L")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x004C)
     (=ucs		. #x2112)	; ℒ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      ))
     ))
 (define-char
   '((name		. "SCRIPT SMALL L")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x006C)
     (=ucs		. #x2113)	; ℓ
+    (<-font/script
+     ((name		  . "LATIN SMALL LETTER L")
+      (=ucs		  . #x006C)	; l
+      ))
     ))
 (define-char
-  '((->decomposition	font #xFF4C)
-    (<-denotational
+  '((<-denotational
      ((name		  . "SCRIPT SMALL L")
       (=ucs		  . #x2113)	; ℓ
       ))
+    (=ucs@jis/fw	. #x2113)	; &JX1-235F;
+    (=ks-x1001		. #x2724)	; &JX1-235F; [07-04]
+    (=jis-x0213-1	. #x235F)	; &I-JX1-235F; [03-63]
+    (<-font/script
+     ((name		  . "FULLWIDTH LATIN SMALL LETTER L")
+      (=ucs		  . #xFF4C)	; ｌ
+      ))
     (<-fullwidth
      ((name		  . "SCRIPT SMALL L")
       (=ucs		  . #x2113)	; ℓ
       ))
-    (=ks-x1001		. #x2724)	; &JX1-235F; [07-04]
-    (=jis-x0213-1-2000	. #x235F)	; &I-JX1-235F; [03-63]
-    (=ucs@jis/fw	. #x2113)	; &JX1-235F;
     ))
 (define-char
   '((name		. "L B BAR SYMBOL")
@@ -228,15 +341,24 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x004E)
     (=ucs		. #x2115)	; ℕ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      ))
     ))
 (define-char
   '((name		. "NUMERO SIGN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x004E #x006F)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER N")
+      (=ucs		  . #x004E)	; N
+      )
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      ))
     (=ucs		. #x2116)	; №
     (cyrillic-iso8859-5 . #xF0)	; &I-CYRILLIC-70;
     ))
@@ -245,16 +367,16 @@
      ((name		  . "NUMERO SIGN")
       (=ucs		  . #x2116)	; №
       ))
+    (=ucs@unicode	. #x2116)	; &JX1-2D62;
+    (=gb2312		. #x216D)	; &JX1-2D62; [01-77]
+    (=ks-x1001		. #x2260)	; &I-K0-2260; [02-64]
+    (=jis-x0212		. #x2271)	; &I-JSP-2271; [02-81]
+    (=jis-x0213-1	. #x2D62)	; &I-JX1-2D62; [13-66]
+    (=big5-eten		. #xC8D2)	; &I-B-C8D2;
     (<-fullwidth
      ((name		  . "NUMERO SIGN")
       (=ucs		  . #x2116)	; №
       ))
-    (=gb2312		. #x216D)	; &JX1-2D62; [01-77]
-    (=ks-x1001		. #x2260)	; &I-K0-2260; [02-64]
-    (=jis-x0212		. #x2271)	; &I-JSP-2271; [02-81]
-    (=jis-x0213-1-2000	. #x2D62)	; &I-JX1-2D62; [13-66]
-    (=big5-eten		. #xC8D2)	; &B-C8D2;
-    (=ucs@unicode	. #x2116)	; &JX1-2D62;
     ))
 (define-char
   '((name		. "SOUND RECORDING COPYRIGHT")
@@ -275,40 +397,55 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0050)
     (=ucs		. #x2119)	; ℙ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER P")
+      (=ucs		  . #x0050)	; P
+      ))
     ))
 (define-char
   '((name		. "DOUBLE-STRUCK CAPITAL Q")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0051)
     (=ucs		. #x211A)	; ℚ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER Q")
+      (=ucs		  . #x0051)	; Q
+      ))
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL R")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0052)
     (=ucs		. #x211B)	; ℛ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      ))
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL R")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0052)
     (=ucs		. #x211C)	; ℜ
+    (<-font/black-letter
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      ))
     ))
 (define-char
   '((name		. "DOUBLE-STRUCK CAPITAL R")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0052)
     (=ucs		. #x211D)	; ℝ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER R")
+      (=ucs		  . #x0052)	; R
+      ))
     ))
 (define-char
   '((name		. "PRESCRIPTION TAKE")
@@ -329,7 +466,13 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	super #x0053 #x004D)
+    (=>decomposition@superscript
+     ((name		  . "LATIN CAPITAL LETTER S")
+      (=ucs		  . #x0053)	; S
+      )
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      ))
     (=ucs		. #x2120)	; ℠
     ))
 (define-char
@@ -337,7 +480,16 @@
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	compat #x0054 #x0045 #x004C)
+    (=>decomposition@compat
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      )
+     ((name		  . "LATIN CAPITAL LETTER L")
+      (=ucs		  . #x004C)	; L
+      ))
     (=ucs		. #x2121)	; ℡
     ))
 (define-char
@@ -345,36 +497,41 @@
      ((name		  . "TELEPHONE SIGN")
       (=ucs		  . #x2121)	; ℡
       ))
+    (=ucs@unicode	. #x2121)	; &JX1-2D64;
+    (=ks-x1001		. #x2265)	; &JX1-2D64; [02-69]
+    (=jis-x0213-1	. #x2D64)	; &I-JX1-2D64; [13-68]
+    (=big5-eten		. #xC8D3)	; &I-B-C8D3;
     (<-fullwidth
      ((name		  . "TELEPHONE SIGN")
       (=ucs		  . #x2121)	; ℡
       ))
-    (=ks-x1001		. #x2265)	; &JX1-2D64; [02-69]
-    (=jis-x0213-1-2000	. #x2D64)	; &I-JX1-2D64; [13-68]
-    (=big5-eten		. #xC8D3)	; &B-C8D3;
-    (=ucs@unicode	. #x2121)	; &JX1-2D64;
     ))
 (define-char
   '((name		. "TRADE MARK SIGN")
     (general-category	symbol other) ; Informative Category
     (bidi-category	. "ON")
     (mirrored		. nil)
-    (->decomposition	super #x0054 #x004D)
+    (=>decomposition@superscript
+     ((name		  . "LATIN CAPITAL LETTER T")
+      (=ucs		  . #x0054)	; T
+      )
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      ))
     (=ucs		. #x2122)	; ™
     ))
 (define-char
-  '((->decomposition	super #xFF34 #xFF2D)
-    (<-denotational
+  '((<-denotational
      ((name		  . "TRADE MARK SIGN")
       (=ucs		  . #x2122)	; ™
       ))
+    (=ucs@jis		. #x2122)	; &JSP-226F;
+    (=ks-x1001		. #x2262)	; &JSP-226F; [02-66]
+    (=jis-x0212		. #x226F)	; &I-JSP-226F; [02-79]
     (<-fullwidth
      ((name		  . "TRADE MARK SIGN")
       (=ucs		  . #x2122)	; ™
       ))
-    (=ks-x1001		. #x2262)	; &JSP-226F; [02-66]
-    (=jis-x0212		. #x226F)	; &I-JSP-226F; [02-79]
-    (=ucs@jis		. #x2122)	; &JSP-226F;
     ))
 (define-char
   '((name		. "VERSICLE")
@@ -388,8 +545,11 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x005A)
     (=ucs		. #x2124)	; ℤ
+    (<-font/double-struck
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      ))
     ))
 (define-char
   '((name		. "OUNCE SIGN")
@@ -403,19 +563,22 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x03A9)
     (=ucs		. #x2126)	; Ω
+    (->canonical
+     ((name		  . "GREEK CAPITAL LETTER OMEGA")
+      (=ucs		  . #x03A9)	; Ω
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "OHM SIGN")
       (=ucs		  . #x2126)	; Ω
       ))
+    (=ks-x1001		. #x2759)	; &K0-2759; [07-57]
     (<-fullwidth
      ((name		  . "OHM SIGN")
       (=ucs		  . #x2126)	; Ω
       ))
-    (=ks-x1001		. #x2759)	; &K0-2759; [07-57]
     ))
 (define-char
   '((name		. "INVERTED OHM SIGN")
@@ -429,20 +592,23 @@
      ((name		  . "INVERTED OHM SIGN")
       (=ucs		  . #x2127)	; ℧
       ))
+    (=ucs@jis/fw	. #x2127)	; &JX1-2360;
+    (=jis-x0213-1	. #x2360)	; &JX1-2360; [03-64]
     (<-fullwidth
      ((name		  . "INVERTED OHM SIGN")
       (=ucs		  . #x2127)	; ℧
       ))
-    (=jis-x0213-1-2000	. #x2360)	; &JX1-2360; [03-64]
-    (=ucs@jis/fw	. #x2127)	; &JX1-2360;
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL Z")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x005A)
     (=ucs		. #x2128)	; ℨ
+    (<-font/black-letter
+     ((name		  . "LATIN CAPITAL LETTER Z")
+      (=ucs		  . #x005A)	; Z
+      ))
     ))
 (define-char
   '((name		. "TURNED GREEK SMALL LETTER IOTA")
@@ -456,46 +622,59 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x004B)
     (=ucs		. #x212A)	; K
+    (->canonical
+     ((name		  . "LATIN CAPITAL LETTER K")
+      (=ucs		  . #x004B)	; K
+      ))
     ))
 (define-char
   '((name		. "ANGSTROM SIGN")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	#x00C5)
     (=ucs		. #x212B)	; Å
+    (->canonical
+     ((name		  . "LATIN CAPITAL LETTER A WITH RING ABOVE")
+      (=ucs		  . #x00C5)	; Å
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "ANGSTROM SIGN")
       (=ucs		  . #x212B)	; Å
       ))
+    (=ucs@jis		. #x212B)	; &J90-2272;
+    (=jis-x0208@1983	. #x2272)	; &J90-2272; [02-82]
+    (=ks-x1001		. #x214A)	; &I-K0-214A; [01-42]
+    (=jis-x0208@1990	. #x2272)	; &I-J90-2272; [02-82]
+    (=jis-x0213-1	. #x2272)	; &I-JX1-2272; [02-82]
     (<-fullwidth
      ((name		  . "ANGSTROM SIGN")
       (=ucs		  . #x212B)	; Å
       ))
-    (=jis-x0208@1983	. #x2272)	; &J90-2272; [02-82]
-    (=ks-x1001		. #x214A)	; &I-K0-214A; [01-42]
-    (=jis-x0208@1990	. #x2272)	; &I-J90-2272; [02-82]
-    (=ucs@jis		. #x212B)	; &J90-2272;
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL B")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0042)
     (=ucs		. #x212C)	; ℬ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER B")
+      (=ucs		  . #x0042)	; B
+      ))
     ))
 (define-char
   '((name		. "BLACK-LETTER CAPITAL C")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0043)
     (=ucs		. #x212D)	; ℭ
+    (<-font/black-letter
+     ((name		  . "LATIN CAPITAL LETTER C")
+      (=ucs		  . #x0043)	; C
+      ))
     ))
 (define-char
   '((name		. "ESTIMATED SYMBOL")
@@ -509,24 +688,33 @@
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0065)
     (=ucs		. #x212F)	; ℯ
+    (<-font/script
+     ((name		  . "LATIN SMALL LETTER E")
+      (=ucs		  . #x0065)	; e
+      ))
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL E")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0045)
     (=ucs		. #x2130)	; ℰ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER E")
+      (=ucs		  . #x0045)	; E
+      ))
     ))
 (define-char
   '((name		. "SCRIPT CAPITAL F")
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0046)
     (=ucs		. #x2131)	; ℱ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER F")
+      (=ucs		  . #x0046)	; F
+      ))
     ))
 (define-char
   '((name		. "TURNED CAPITAL F")
@@ -540,68 +728,89 @@
     (general-category	letter uppercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x004D)
     (=ucs		. #x2133)	; ℳ
+    (<-font/script
+     ((name		  . "LATIN CAPITAL LETTER M")
+      (=ucs		  . #x004D)	; M
+      ))
     ))
 (define-char
   '((name		. "SCRIPT SMALL O")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x006F)
     (=ucs		. #x2134)	; ℴ
+    (<-font/script
+     ((name		  . "LATIN SMALL LETTER O")
+      (=ucs		  . #x006F)	; o
+      ))
     ))
 (define-char
   '((name		. "ALEF SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x05D0)
     (=ucs		. #x2135)	; ℵ
+    (<-compat/math
+     ((name		  . "HEBREW LETTER ALEF")
+      (=ucs		  . #x05D0)	; א
+      ))
     ))
 (define-char
   '((<-denotational
      ((name		  . "ALEF SYMBOL")
       (=ucs		  . #x2135)	; ℵ
       ))
+    (=ucs@jis		. #x2135)	; &JX1-235C;
+    (=jis-x0213-1	. #x235C)	; &JX1-235C; [03-60]
     (<-fullwidth
      ((name		  . "ALEF SYMBOL")
       (=ucs		  . #x2135)	; ℵ
       ))
-    (=jis-x0213-1-2000	. #x235C)	; &JX1-235C; [03-60]
-    (=ucs@jis		. #x2135)	; &JX1-235C;
     ))
 (define-char
   '((name		. "BET SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x05D1)
     (=ucs		. #x2136)	; ℶ
+    (<-compat/math
+     ((name		  . "HEBREW LETTER BET")
+      (=ucs		  . #x05D1)	; ב
+      ))
     ))
 (define-char
   '((name		. "GIMEL SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x05D2)
     (=ucs		. #x2137)	; ℷ
+    (<-compat/math
+     ((name		  . "HEBREW LETTER GIMEL")
+      (=ucs		  . #x05D2)	; ג
+      ))
     ))
 (define-char
   '((name		. "DALET SYMBOL")
     (general-category	letter other) ; Informative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	compat #x05D3)
     (=ucs		. #x2138)	; ℸ
+    (<-compat/math
+     ((name		  . "HEBREW LETTER DALET")
+      (=ucs		  . #x05D3)	; ד
+      ))
     ))
 (define-char
   '((name		. "INFORMATION SOURCE")
     (general-category	letter lowercase) ; Normative Category
     (bidi-category	. "L")
     (mirrored		. nil)
-    (->decomposition	font #x0069)
     (=ucs		. #x2139)	; ℹ
+    (<-font
+     ((name		  . "LATIN SMALL LETTER I")
+      (=ucs		  . #x0069)	; i
+      ))
     ))
 (define-char
   '((name		. "ROTATED CAPITAL Q")