(C3-2157): Use `<-simplified*sources' instead of char-ref in

`<-simplified'.
(U+533A): Likewise; add `<-simplified@JP/Jouyou'.
(U+533B): Add `<-simplified@JP/Jouyou'.

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index cc518ca..b47b0a0 100644 (file)
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -90,10 +90,10 @@
     (ideographic-strokes . 2)
     (total-strokes      . 4)
     (<-simplified
-     (:sources (morohashi-daikanwa)
-      :char    ((=daikanwa          . 02691)   ; �����
-                )
+     ((=daikanwa         . 02691)      ; �����
       ))
+    (<-simplified*sources
+     daikanwa)
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs              . #x2FF7)     ; ⿷
@@ -106,16 +106,20 @@
     (=daikanwa         . 02674)        ; �����
     ))
 (define-char
-  '((script            JP-Jouyou Ideograph)
+  '((script            JP Jouyou Ideograph)
     (morohashi-daikanwa        2674 0 1)
     (ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 2)
     (total-strokes      . 4)
     (<-simplified
-     (:sources (shinjigen-1)
-      :char    ((shinjigen-1        . 802)
-                (=daikanwa          . 02691)   ; �����
-                )
+     ((shinjigen-1       . 802)
+      (=daikanwa         . 02691)      ; �����
+      ))
+    (<-simplified*sources
+     shinjigen-1)
+    (<-simplified@JP/Jouyou
+     ((=ucs              . #x5340)     ; 區
+      (=jis-x0208-1990   . #x523F)     ; �����
       ))
     (hanyu-dazidian    1 81 5)
     (ideographic-structure
@@ -219,6 +223,11 @@
     (ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 5)
     (total-strokes      . 7)
+    (<-simplified@JP/Jouyou
+     ((=jis-x0208        . #x6E50)     ; �����
+      (=ks-x1001         . #x6C22)     ; �����
+      (=daikanwa         . 40006)      ; �����
+      ))
     (ideographic-structure
      ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
       (=ucs              . #x2FF7)     ; ⿷