Reformatted.

diff --git a/lisp/utf-2000/Ideograph-R009-Man.el b/lisp/utf-2000/Ideograph-R009-Man.el
index be59dc7..d2e3f9d 100644 (file)
--- a/lisp/utf-2000/Ideograph-R009-Man.el
+++ b/lisp/utf-2000/Ideograph-R009-Man.el
@@ -15283,7 +15283,7 @@
       )
      ((=ucs              . #x5DFB)     ; 巻
       ))
-    (=>>jis-x0213-1@2000 . #x3771)     ; &aJX1-3771; [23-81]
+    (=>>jis-x0213-1@2000 . #x3771)     ; &G-JX1-3771; [23-81]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R014-Cover.el b/lisp/utf-2000/Ideograph-R014-Cover.el
index ead5f55..5699fcb 100644 (file)
--- a/lisp/utf-2000/Ideograph-R014-Cover.el
+++ b/lisp/utf-2000/Ideograph-R014-Cover.el
@@ -642,7 +642,7 @@
      ((=ucs              . #x51A4)     ; 冤
       ))
     (ideographic-radical . 14) ; ⼍
-    (=>>jis-x0213-1@2000 . #x514D)     ; &aJX1-514D; [49-45]
+    (=>>jis-x0213-1@2000 . #x514D)     ; &G-JX1-514D; [49-45]
     (->subsumptive
      ((ideographic-strokes . 8)
       (total-strokes      . 10)

diff --git a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
index 9ced424..056364b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
+++ b/lisp/utf-2000/Ideograph-R023-Hiding-Enclosure.el
@@ -61,9 +61,9 @@
       )
      ((=ucs              . #x513F)     ; 儿
       ))
-    (=ucs@big5         . #x5339)       ; &aGT-03429;
-    (=big5             . #xA4C7)       ; &aGT-03429;
-    (=>>gt             . 03429)        ; &aGT-03429;
+    (=ucs@big5         . #x5339)       ; &G-GT-03429;
+    (=big5             . #xA4C7)       ; &G-GT-03429;
+    (=>>gt             . 03429)        ; &G-GT-03429;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -144,7 +144,7 @@
       )
      ((=ucs              . #x3405)     ; 㐅
       ))
-    (=>>gt             . 03428)        ; &aGT-03428;
+    (=>>gt             . 03428)        ; &G-GT-03428;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -679,7 +679,7 @@
       (=jis-x0213-1@2004  . #x5928)    ; &I-JX3-5928; [57-08]
       (=daikanwa         . 11724)      ; &I-M-11724;
       ))
-    (=>>gt             . 03448)        ; &aGT-03448;
+    (=>>gt             . 03448)        ; &G-GT-03448;
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LEFT")
@@ -796,12 +796,12 @@
       )
      ((=ucs              . #x82E5)     ; 若
       ))
-    (=>>jis-x0208      . #x463F)       ; &aJX1-463F; [38-31]
-    (=>>jis-x0213-1    . #x463F)       ; &aJX1-463F; [38-31]
+    (=>>jis-x0208      . #x463F)       ; &G-JX1-463F; [38-31]
+    (=>>jis-x0213-1    . #x463F)       ; &G-JX1-463F; [38-31]
     ))
 (define-char
   '((<-denotational
-     ((=>>jis-x0208      . #x463F)     ; &aJX1-463F; [38-31]
+     ((=>>jis-x0208      . #x463F)     ; &G-JX1-463F; [38-31]
       ))
     (ideographic-radical . 23) ; ⼖
     (ideographic-strokes . 8)

diff --git a/lisp/utf-2000/Ideograph-R029-Again.el b/lisp/utf-2000/Ideograph-R029-Again.el
index 9d14f89..45aeff3 100644 (file)
--- a/lisp/utf-2000/Ideograph-R029-Again.el
+++ b/lisp/utf-2000/Ideograph-R029-Again.el
@@ -385,8 +385,8 @@
        )
        ((=ucs              . #x53C8)   ; 又
        ))
-      (=>>jis-x0208      . #x483F)     ; &aJX1-483F; [40-31]
-      (=>>jis-x0213-1    . #x483F)     ; &aJX1-483F; [40-31]
+      (=>>jis-x0208      . #x483F)     ; &G-JX1-483F; [40-31]
+      (=>>jis-x0213-1    . #x483F)     ; &G-JX1-483F; [40-31]
       (->subsumptive
        ((ideographic-structure
         ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER LEFT")
@@ -1294,7 +1294,7 @@
       )
      ((=ucs              . #x53CD)     ; 反
       ))
-    (=>>jis-x0213-1@2004 . #x4840)     ; &aJX3-4840; [40-32]
+    (=>>jis-x0213-1@2004 . #x4840)     ; &G-JX3-4840; [40-32]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1334,7 +1334,7 @@
       )
      ((=ucs              . #x53CD)     ; 反
       ))
-    (=>>jis-x0213-1@2000 . #x4840)     ; &aJX1-4840; [40-32]
+    (=>>jis-x0213-1@2000 . #x4840)     ; &G-JX1-4840; [40-32]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -1611,7 +1611,7 @@
       )
      ((=ucs              . #x53C8)     ; 又
       ))
-    (=>>jis-x0213-1@2004 . #x5257)     ; &aJX3-5257; [50-55]
+    (=>>jis-x0213-1@2004 . #x5257)     ; &G-JX3-5257; [50-55]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW")
@@ -1641,7 +1641,7 @@
     (ideographic-radical . 29) ; ⼜
     (ideographic-strokes . 7)
     (total-strokes      . 9)
-    (=>>jis-x0213-1@2000 . #x5257)     ; &aJX1-5257; [50-55]
+    (=>>jis-x0213-1@2000 . #x5257)     ; &G-JX1-5257; [50-55]
     (->subsumptive
      ((=ucs@jis/1990     . #x53DF)     ; &GT-04009;
       (=ucs@jis/2000     . #x53DF)     ; &GT-04009;

diff --git a/lisp/utf-2000/Ideograph-R030-Mouth.el b/lisp/utf-2000/Ideograph-R030-Mouth.el
index 926134f..e45fedf 100644 (file)
--- a/lisp/utf-2000/Ideograph-R030-Mouth.el
+++ b/lisp/utf-2000/Ideograph-R030-Mouth.el
@@ -7705,9 +7705,9 @@
        )
        ((=ucs              . #x53E3)   ; 口
        )
-       ((=>>gt             . 00390)    ; &aGT-00390;
+       ((=>>gt             . 00390)    ; &G-GT-00390;
        ))
-      (=>>jis-x0213-1@2004 . #x527B)   ; &aJX3-527B; [50-91]
+      (=>>jis-x0213-1@2004 . #x527B)   ; &G-JX3-527B; [50-91]
       (->subsumptive
        ((ideographic-structure
         ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")
@@ -10131,7 +10131,7 @@
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 7)
     (total-strokes      . 10)
-    (=>>gt             . 04609)        ; &aGT-04609;
+    (=>>gt             . 04609)        ; &G-GT-04609;
     (->subsumptive
      ((hanyu-dazidian    1 628 1)
       (ideographic-structure
@@ -13269,11 +13269,11 @@
       )
      ((=ucs              . #x623B)     ; 戻
       ))
-    (=>>jis-x0213-1    . #x533A)       ; &aJX1-533A; [51-26]
+    (=>>jis-x0213-1    . #x533A)       ; &G-JX1-533A; [51-26]
     ))
 (define-char
   '((<-denotational
-     ((=>>jis-x0213-1    . #x533A)     ; &aJX1-533A; [51-26]
+     ((=>>jis-x0213-1    . #x533A)     ; &G-JX1-533A; [51-26]
       ))
     (ideographic-radical . 30) ; ⼝
     (ideographic-strokes . 7)
@@ -14223,7 +14223,7 @@
       )
      ((=ucs              . #x8C55)     ; 豕
       ))
-    (=>>jis-x0213-1    . #x426F)       ; &aJX1-426F; [34-79]
+    (=>>jis-x0213-1    . #x426F)       ; &G-JX1-426F; [34-79]
     (->subsumptive
      ((ideographic-structure
        ((name . "IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT")

diff --git a/lisp/utf-2000/Ideograph-R032-Earth.el b/lisp/utf-2000/Ideograph-R032-Earth.el
index 9702db9..ebad253 100644 (file)
--- a/lisp/utf-2000/Ideograph-R032-Earth.el
+++ b/lisp/utf-2000/Ideograph-R032-Earth.el
@@ -9794,7 +9794,7 @@
     (ideographic-radical . 32) ; ⼟
     (ideographic-strokes . 11)
     (total-strokes      . 14)
-    (=>>jis-x0213-2    . #x252B)       ; &aJX2-252B; [05-11]
+    (=>>jis-x0213-2    . #x252B)       ; &G-JX2-252B; [05-11]
     (->subsumptive
      ((=ucs@jis                  . #x588D)     ; &M-05423;
       (=jis-x0212        . #x3842)     ; &M-05423; [24-34]

diff --git a/lisp/utf-2000/Ideograph-R040-Roof.el b/lisp/utf-2000/Ideograph-R040-Roof.el
index e6cb13f..469e59e 100644 (file)
--- a/lisp/utf-2000/Ideograph-R040-Roof.el
+++ b/lisp/utf-2000/Ideograph-R040-Roof.el
@@ -3331,7 +3331,7 @@
       (=shinjigen        .  0557)      ; &GT-09091;
       (=jef-china3       . #x4ABC)     ; &I-JC3-4ABC;
       )
-     ((=>>gt             . 09092)      ; &aGT-09092;
+     ((=>>gt             . 09092)      ; &G-GT-09092;
       (->subsumptive
        ((=ucs@jis          . #x5BD2)   ; &GT-09092;
        (=jis-x0208         . #x3428)   ; &GT-09092; [20-08]

diff --git a/lisp/utf-2000/Ideograph-R044-Corpse.el b/lisp/utf-2000/Ideograph-R044-Corpse.el
index 2198051..746401b 100644 (file)
--- a/lisp/utf-2000/Ideograph-R044-Corpse.el
+++ b/lisp/utf-2000/Ideograph-R044-Corpse.el
@@ -2330,7 +2330,7 @@
     (ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (=>>gt             . 09824)        ; &aGT-09824;
+    (=>>gt             . 09824)        ; &G-GT-09824;
     (->subsumptive
      ((=gt               . 09824)      ; &GT-09824;
       (=gt-pj-3                  . #x3535)     ; &GT-09824; [21-21]
@@ -2361,7 +2361,7 @@
     (ideographic-radical . 44) ; ⼫
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (=>>gt             . 09822)        ; &aGT-09822;
+    (=>>gt             . 09822)        ; &G-GT-09822;
     (->subsumptive
      ((=cns11643-4       . #x494A)     ; &C4-494A; [41-42]
       )

diff --git a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
index 5e05428..382c519 100644 (file)
--- a/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
+++ b/lisp/utf-2000/Ideograph-R053-Dotted-Cliff.el
@@ -747,7 +747,7 @@
     (ideographic-radical . 53) ; ⼴
     (ideographic-strokes . 5)
     (total-strokes      . 8)
-    (=>>jis-x0213-1@2004 . #x4A79)     ; &aJX3-4A79; [42-89]
+    (=>>jis-x0213-1@2004 . #x4A79)     ; &G-JX3-4A79; [42-89]
     (->subsumptive
      ((=ucs@jis/2004     . #x5E96)     ; &M-09266;
       (=jis-x0208@1978   . #x4A79)     ; &M-09266; [42-89]
@@ -1871,7 +1871,7 @@
       (=daikanwa         . 09337)      ; &I-M-09337;
       (=shinjigen        .  2187)      ; &GT-11748;
       )
-     ((=>>gt             . 11749)      ; &aGT-11749;
+     ((=>>gt             . 11749)      ; &G-GT-11749;
       (->subsumptive
        ((=ucs@jis          . #x5EAD)   ; &GT-11749;
        (=jis-x0208@1990    . #x446D)   ; &GT-11749; [36-77]
@@ -4476,8 +4476,8 @@
     (ideographic-radical . 53) ; ⼴
     (ideographic-strokes . 12)
     (total-strokes      . 15)
-    (=>>jis-x0213-1@2000 . #x4940)     ; &aJX1-4940; [41-32]
-    (=big5             . #xBC71)       ; &aJX1-4940;
+    (=>>jis-x0213-1@2000 . #x4940)     ; &G-JX1-4940; [41-32]
+    (=big5             . #xBC71)       ; &G-JX1-4940;
     (->subsumptive
      ((=ucs@jis/1990     . #x5EDF)     ; &GT-11956;
       (=ucs@jis/2000     . #x5EDF)     ; &GT-11956;

diff --git a/lisp/utf-2000/Ideograph-R086-Fire.el b/lisp/utf-2000/Ideograph-R086-Fire.el
index dcefa4f..1e826b7 100644 (file)
--- a/lisp/utf-2000/Ideograph-R086-Fire.el
+++ b/lisp/utf-2000/Ideograph-R086-Fire.el
@@ -13438,7 +13438,7 @@
     (ideographic-radical@cns . 130)    ; ⾁
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (=>>gt             . 38767)        ; &aGT-38767;
+    (=>>gt             . 38767)        ; &G-GT-38767;
     (->subsumptive
      ((ideographic-radical . 130)      ; ⾁
       (=gt               . 38767)      ; &GT-38767;
@@ -13458,7 +13458,7 @@
     (ideographic-radical@cns . 130)    ; ⾁
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (=>>gt             . 38769)        ; &aGT-38769;
+    (=>>gt             . 38769)        ; &G-GT-38769;
     (->subsumptive
      ((ideographic-radical . 86)       ; ⽕
       (=ucs@iso                  . #x24443)    ; &GT-38769;

diff --git a/lisp/utf-2000/Ideograph-R116-Cave.el b/lisp/utf-2000/Ideograph-R116-Cave.el
index be91f95..1023aa2 100644 (file)
--- a/lisp/utf-2000/Ideograph-R116-Cave.el
+++ b/lisp/utf-2000/Ideograph-R116-Cave.el
@@ -382,7 +382,7 @@
     (=>jis-x0213-1     . #x407C)       ; 穿 [32-92]
     (=big5             . #xACEF)       ; &I-B-ACEF;
     (->subsumptive
-     ((=>>jis-x0213-1@2004 . #x407C)   ; &aJX3-407C; [32-92]
+     ((=>>jis-x0213-1@2004 . #x407C)   ; &G-JX3-407C; [32-92]
       (->subsumptive
        ((=daikanwa         . 25436)    ; &M-25436;
        )

diff --git a/lisp/utf-2000/Ideograph-R118-Bamboo.el b/lisp/utf-2000/Ideograph-R118-Bamboo.el
index 8231f9a..a0fb6af 100644 (file)
--- a/lisp/utf-2000/Ideograph-R118-Bamboo.el
+++ b/lisp/utf-2000/Ideograph-R118-Bamboo.el
@@ -4562,7 +4562,7 @@
     (ideographic-radical . 118)        ; ⽵
     (ideographic-strokes . 9)
     (total-strokes      . 15)
-    (=>>jis-x0213-1@2000 . #x407D)     ; &aJX1-407D; [32-93]
+    (=>>jis-x0213-1@2000 . #x407D)     ; &G-JX1-407D; [32-93]
     (->subsumptive
      ((=ucs@unicode      . #x7BAD)     ; &GT-33833;
       (=jis-x0208        . #x407D)     ; &GT-33833; [32-93]

diff --git a/lisp/utf-2000/Ideograph-R130-Meat.el b/lisp/utf-2000/Ideograph-R130-Meat.el
index bbf079a..1ee0710 100644 (file)
--- a/lisp/utf-2000/Ideograph-R130-Meat.el
+++ b/lisp/utf-2000/Ideograph-R130-Meat.el
@@ -14701,7 +14701,7 @@
     (ideographic-radical@cns . 130)    ; ⾁
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (=>>gt             . 38767)        ; &aGT-38767;
+    (=>>gt             . 38767)        ; &G-GT-38767;
     (->subsumptive
      ((ideographic-radical . 130)      ; ⾁
       (=gt               . 38767)      ; &GT-38767;
@@ -14721,7 +14721,7 @@
     (ideographic-radical@cns . 130)    ; ⾁
     (ideographic-strokes . 14)
     (total-strokes      . 18)
-    (=>>gt             . 38769)        ; &aGT-38769;
+    (=>>gt             . 38769)        ; &G-GT-38769;
     (->subsumptive
      ((ideographic-radical . 86)       ; ⽕
       (=ucs@iso                  . #x24443)    ; &GT-38769;