(U-0002311A): Add M-13695.

- Add some `=ucs@cns' features.
- Use `->subsumptive' or `{<-|->}denotational' for some character
  definitions.

diff --git a/lisp/utf-2000/Ideograph-R070-Square.el b/lisp/utf-2000/Ideograph-R070-Square.el
index 2d53770..d22312b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R070-Square.el
+++ b/lisp/utf-2000/Ideograph-R070-Square.el
@@ -562,48 +562,36 @@
     (=cns11643-1       . #x5B22)       ; &I-C1-5B22; [59-02]
     ))
 (define-char
-  '((=>ucs             . #x65CD)       ; 旍
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=big5             . #xD5A8)       ; &M-13659;
-    (=daikanwa         . 13659)        ; &I-M-13659;
-    (=ucs@big5         . #x65CD)       ; &M-13659;
-    ))
-(define-char
-  '((=>ucs             . #x65CD)       ; 旍
-    (morohashi-daikanwa        13659 0 0)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=cns11643-2       . #x356A)       ; &C2-356A; [21-74]
-    ))
-(define-char
-  '((morohashi-daikanwa        13659 0 1)
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x65CD)       ; 旍
+    (=big5             . #xD5A8)       ; &I-B-D5A8;
+    (->subsumptive
+     ((=daikanwa         . 13659)      ; &M-13659;
+      )
+     ((=cns11643-2       . #x356A)     ; &C2-356A; [21-74]
+      (=ucs@cns                  . #x65CD)     ; &C2-356A;
+      )
+     ((=ucs@unicode      . #x65CD)     ; &UU+65CD;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x65CE)       ; 旎
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 7)
-    (total-strokes      . 11)
-    (=jis-x0212                . #x4168)       ; &M-13660; [33-72]
-    (=big5             . #xB1DD)       ; &I-B-B1DD;
-    (=daikanwa         . 13660)        ; &I-M-13660;
-    (=ucs@jis          . #x65CE)       ; &M-13660;
-    (=ucs@big5         . #x65CE)       ; &M-13660;
-    ))
-(define-char
-  '((morohashi-daikanwa        13660 0 0)
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 7)
     (total-strokes      . 11)
     (=ucs              . #x65CE)       ; 旎
-    (=gb2312           . #x6C3B)       ; &I-G0-6C3B; [76-27]
-    (=cns11643-1       . #x5B23)       ; &I-C1-5B23; [59-03]
+    (=big5             . #xB1DD)       ; &I-B-B1DD;
+    (->subsumptive
+     ((=jis-x0212        . #x4168)     ; &M-13660; [33-72]
+      (=daikanwa         . 13660)      ; &I-M-13660;
+      (=ucs@jis                  . #x65CE)     ; &M-13660;
+      )
+     ((=gb2312           . #x6C3B)     ; &G0-6C3B; [76-27]
+      (=ucs@unicode      . #x65CE)     ; &G0-6C3B;
+      )
+     ((=cns11643-1       . #x5B23)     ; &C1-5B23; [59-03]
+      ))
     ))
 (define-char
   '((=>ucs             . #x65CF)       ; 族
@@ -757,65 +745,59 @@
     (=cns11643-6       . #x4967)       ; &I-C6-4967; [41-71]
     ))
 (define-char
-  '((=>ucs             . #x65D2)       ; 旒
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
-    (=jis-x0208                . #x5A58)       ; &GT-17284; [58-56]
-    (=ks-x1001         . #x5732)       ; &I-K0-5732; [55-18]
-    (=gt               . 17284)        ; &I-GT-17284;
-    (=gt-pj-1          . #x5A58)       ; &I-GT-17284; [58-56]
-    (=daikanwa         . 13676)        ; &I-M-13676;
-    (=ucs@jis          . #x65D2)       ; &GT-17284;
-    ))
-(define-char
-  '((morohashi-daikanwa        13676 0 0)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 9)
-    (total-strokes      . 13)
+  '((ideographic-radical . 70) ; ⽅
     (=ucs              . #x65D2)       ; 旒
-    (=gb2312           . #x6C3C)       ; &I-G0-6C3C; [76-28]
-    ))
-(define-char
-  '((=>ucs             . #x65D2)       ; 旒
-    (morohashi-daikanwa        13676 0 1)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 8)
-    (total-strokes      . 12)
-    (=big5             . #xD97E)       ; &B-D97E;
-    (=ucs@big5         . #x65D2)       ; &B-D97E;
-    ))
-(define-char
-  '((=>ucs             . #x65D2)       ; 旒
-    (morohashi-daikanwa        13676 0 2)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 8)
-    (total-strokes      . 12)
-    (=cns11643-2       . #x3C43)       ; &C2-3C43; [28-35]
+    (=big5             . #xD97E)       ; &I-B-D97E;
+    (->subsumptive
+     ((ideographic-strokes . 9)
+      (total-strokes      . 13)
+      (=jis-x0208        . #x5A58)     ; &GT-17284; [58-56]
+      (=ks-x1001         . #x5732)     ; &I-K0-5732; [55-18]
+      (=gt               . 17284)      ; &I-GT-17284;
+      (=gt-pj-1                  . #x5A58)     ; &I-GT-17284; [58-56]
+      (=daikanwa         . 13676)      ; &I-M-13676;
+      (=ucs@jis                  . #x65D2)     ; &GT-17284;
+      )
+     ((ideographic-strokes . 9)
+      (total-strokes      . 13)
+      (=gb2312           . #x6C3C)     ; &G0-6C3C; [76-28]
+      (=ucs@unicode      . #x65D2)     ; &G0-6C3C;
+      )
+     ((ideographic-strokes . 8)
+      (total-strokes      . 12)
+      (=cns11643-2       . #x3C43)     ; &C2-3C43; [28-35]
+      (=ucs@cns                  . #x65D2)     ; &C2-3C43;
+      ))
     ))
 (define-char
-  '((=>ucs             . #x65D3)       ; 旓
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (=big5             . #xDDBE)       ; &M-13678;
-    (=daikanwa         . 13678)        ; &I-M-13678;
-    (=ucs@big5         . #x65D3)       ; &M-13678;
+    (=ucs              . #x65D3)       ; 旓
+    (=big5             . #xDDBE)       ; &I-B-DDBE;
     ))
 (define-char
-  '((morohashi-daikanwa        13678 0 2)
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (=ucs              . #x65D3)       ; 旓
+    (<-denotational
+     ((=ucs              . #x65D3)     ; 旓
+      ))
+    (=daikanwa         . 13678)        ; &M-13678;
     ))
 (define-char
-  '((=>ucs             . #x65D3)       ; 旓
-    (morohashi-daikanwa        13678 0 3)
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 9)
     (total-strokes      . 13)
-    (=cns11643-2       . #x4344)       ; &C2-4344; [35-36]
+    (<-denotational
+     ((=ucs              . #x65D3)     ; 旓
+      ))
+    (->subsumptive
+     ((=ucs@unicode      . #x65D3)     ; &UU+65D3;
+      )
+     ((=cns11643-2       . #x4344)     ; &C2-4344; [35-36]
+      (=ucs@cns                  . #x65D3)     ; &C2-4344;
+      ))
     ))
 (define-char
   '((=>ucs             . #x65D4)       ; 旔
@@ -985,6 +967,38 @@
     ))
 (define-char
   '((ideographic-radical . 70) ; ⽅
+    (=ucs              . #x2311A)      ; 𣄚
+    ))
+(define-char
+  '((ideographic-radical . 70) ; ⽅
+    (ideographic-strokes@daikanwa . 12)
+    (ideographic-strokes . 13)
+    (total-strokes      . 17)
+    (<-denotational
+     ((=ucs              . #x2311A)    ; 𣄚
+      ))
+    (=daikanwa         . 13695)        ; &M-13695;
+    ))
+(define-char
+  '((ideographic-radical . 70) ; ⽅
+    (ideographic-strokes . 12)
+    (total-strokes      . 16)
+    (<-denotational
+     ((=ucs              . #x2311A)    ; 𣄚
+      ))
+    (=ucs@iso          . #x2311A)      ; &UU+2311A;
+    ))
+(define-char
+  '((ideographic-radical . 70) ; ⽅
+    (ideographic-strokes . 13)
+    (total-strokes      . 17)
+    (<-denotational
+     ((=ucs              . #x2311A)    ; 𣄚
+      ))
+    (=cns11643-7       . #x3843)       ; &C7-3843; [24-35]
+    ))
+(define-char
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 12)
     (total-strokes      . 16)
     (ideographic-structure
@@ -1033,42 +1047,19 @@
     (=cns11643-5       . #x5468)       ; &I-C5-5468; [52-72]
     ))
 (define-char
-  '((=>ucs             . #x65DA)       ; 旚
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 13)
-    (total-strokes      . 17)
-    (=daikanwa         . 13698)        ; &M-13698;
-    ))
-(define-char
-  '((=>ucs             . #x65DA)       ; 旚
-    (morohashi-daikanwa        13698 0 0)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 13)
-    (total-strokes      . 17)
-    (=cns11643-2       . #x5C7C)       ; &C2-5C7C; [60-92]
-    ))
-(define-char
-  '((=>ucs             . #x65DA)       ; 旚
-    (morohashi-daikanwa        13698 0 1)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 13)
-    (total-strokes      . 17)
-    (=big5             . #xECF1)       ; &B-ECF1;
-    (=ucs@big5         . #x65DA)       ; &B-ECF1;
-    ))
-(define-char
-  '((morohashi-daikanwa        13698 0 2)
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 13)
-    (total-strokes      . 17)
-    (=ucs              . #x65DA)       ; 旚
-    ))
-(define-char
   '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 13)
     (total-strokes      . 17)
-    (=ucs              . #x2311A)      ; 𣄚
-    (=cns11643-7       . #x3843)       ; &I-C7-3843; [24-35]
+    (=ucs              . #x65DA)       ; 旚
+    (=big5             . #xECF1)       ; &I-B-ECF1;
+    (->subsumptive
+     ((=daikanwa         . 13698)      ; &M-13698;
+      )
+     ((=cns11643-2       . #x5C7C)     ; &C2-5C7C; [60-92]
+      (=ucs@cns                  . #x65DA)     ; &C2-5C7C;
+      )
+     ((=ucs@unicode      . #x65DA)     ; &UU+65DA;
+      ))
     ))
 (define-char
   '((ideographic-radical . 70) ; ⽅
@@ -1167,28 +1158,37 @@
     (=cns11643-2       . #x6555)       ; &I-C2-6555; [69-53]
     ))
 (define-char
-  '((=>ucs             . #x65DE)       ; 旞
-    (ideographic-radical . 70) ; ⽅
-    (ideographic-strokes . 15)
-    (total-strokes      . 19)
-    (=big5             . #xF249)       ; &M-13707;
-    (=daikanwa         . 13707)        ; &I-M-13707;
-    (=ucs@big5         . #x65DE)       ; &M-13707;
+  '((ideographic-radical . 70) ; ⽅
+    (=ucs              . #x65DE)       ; 旞
+    (=big5             . #xF249)       ; &I-B-F249;
     ))
 (define-char
-  '((=>ucs             . #x65DE)       ; 旞
-    (morohashi-daikanwa        13707 0 2)
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 15)
     (total-strokes      . 19)
-    (=cns11643-2       . #x6554)       ; &C2-6554; [69-52]
+    (<-denotational
+     ((=ucs              . #x65DE)     ; 旞
+      ))
+    (=daikanwa         . 13707)        ; &M-13707;
     ))
 (define-char
-  '((morohashi-daikanwa        13707 0 3)
-    (ideographic-radical . 70) ; ⽅
+  '((ideographic-radical . 70) ; ⽅
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (=ucs              . #x65DE)       ; 旞
+    (<-denotational
+     ((=ucs              . #x65DE)     ; 旞
+      ))
+    (=ucs@unicode      . #x65DE)       ; &UU+65DE;
+    ))
+(define-char
+  '((ideographic-radical . 70) ; ⽅
+    (ideographic-strokes . 15)
+    (total-strokes      . 19)
+    (<-denotational
+     ((=ucs              . #x65DE)     ; 旞
+      ))
+    (=cns11643-2       . #x6554)       ; &C2-6554; [69-52]
+    (=ucs@cns          . #x65DE)       ; &C2-6554;
     ))
 (define-char
   '((ideographic-radical . 70) ; ⽅