- Use `ideo:simplified-form-of' instead of `:from.simplified'.

- Use `ideo:ancient-form-of' instead of `:from.ancient'.
- Use `ideo:same-as' instead of `:from.same'.
- Use `ideo:original-form-of' instead of `:from.original'.
- Use `ideo:vulgar-form-of' instead of `:from.vulgar'.
- Use `ideo:mistakable' instead of `:to.mistakable'.
- Sync up with the current environment.

diff --git a/Ideograph-R046-Mountain.ttl b/Ideograph-R046-Mountain.ttl
index 8825d86..e74fa66 100644 (file)
--- a/Ideograph-R046-Mountain.ttl
+++ b/Ideograph-R046-Mountain.ttl
@@ -1638,8 +1638,8 @@ a.ucs:0x5C82
     ideo:total-strokes     6 ;
     :eq rep.gb2312:0x4671         ; # &I-G0-4671;
     :eq rep.hanziku-2:0xEEDC      ; # &I-HZK02-EEDC;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x8C48         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x8C48         ] ;
     .
     rep.gb2312:0x4671
                :abstract-glyph-of         gb2312:0x4671  .
@@ -5653,8 +5653,8 @@ a.ucs:0x5CB3
     :eq rep.gt-pj-1:13145         ; # &I-GT-10017;
     :eq rep.daikanwa:08001        ; # &I-M-08001;
     :eq rep.shinjigen:1962        ; # 岳
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5DBD         ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5DBD         ] ;
     .
     rep.adobe-japan1-0:01463
                :abstract-glyph-of adobe-japan1-0:01463   .
@@ -7022,8 +7022,8 @@ a.ucs:0x5CC3
     ideo:total-strokes     8 ;
     :eq rep.iso-ir165:0x7A72      ; # &I-EGB-7A72;
     :eq rep.hanziku-2:0xF04B      ; # &I-HZK02-F04B;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5D64         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5D64         ] ;
     .
     rep.iso-ir165:0x7A72
                :abstract-glyph-of      iso-ir165:0x7A72  .
@@ -7916,7 +7916,7 @@ a.ucs:0x5CD5
     :eq rep.cns11643-4:0x287D     ; # &I-C4-287D;
     :eq rep.daikanwa:08045        ; # &I-M-08045;
     :eq rep.shinjigen:3320        ; # 峕
-    :from.ancient        [ :sources chisebib:shinjigen ;
+    ideo:ancient-form-of [ :sources chisebib:shinjigen ;
                            :target  rep.adobe-japan1-0:02252 ] ;
     :subsume
         g2.ucs_unicode:0x5CD5 ;
@@ -8470,7 +8470,7 @@ a.ucs:0x2F87B
     rep.daikanwa:08066
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:08066 ;
-        :from.same           [ :sources chisebib:jiyun ,
+        ideo:same-as         [ :sources chisebib:jiyun ,
                                         chisebib:daikanwa ;
                                :target  rep.cns11643-2:0x2E6F ] ;
         .
@@ -8633,10 +8633,10 @@ a.ucs:0x5CE1
     :eq rep.gt:10105              ; # &I-GT-10105;
     :eq rep.gt-pj-1:13870         ; # &I-GT-10105;
     :eq rep.daikanwa...._.p:08068 ; # 峡
-    :from.simplified     [ :context domain:CN      ;
-                           :target  rep.gb12345:0x4F3F   ] ;
-    :from.simplified     [ :context domain:JP...Jouyou ;
-                           :target  a.ucs:0x5CFD         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  rep.gb12345:0x4F3F   ] ;
+    ideo:simplified-form-of [ :context domain:JP...Jouyou ;
+                              :target  a.ucs:0x5CFD         ] ;
     :subsume
         g2.adobe-japan1-0:01702 ,
         g2.ucs_unicode:0x5CE1 ;
@@ -8771,8 +8771,8 @@ a.ucs:0x5CE3
         isd:right    a.ucs:0x5C27   # 尧
     ] ;
     :eq rep.iso-ir165:0x7A74      ; # &I-EGB-7A74;
-    :from.simplified     [ :context domain:CN      ;
-                           :target  a.ucs:0x5DA2         ] ;
+    ideo:simplified-form-of [ :context domain:CN      ;
+                              :target  a.ucs:0x5DA2         ] ;
     :subsume
         g2.ucs_unicode:0x5CE3 ;
     .
@@ -9875,8 +9875,8 @@ a.ucs:0x5CEF
     :eq rep.daikanwa:08093        ; # &I-M-08093;
     :eq rep.shinjigen:1990        ; # 峯
     :eq rep.cbeta:00123           ; # &I-CB00123;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  rep.adobe-japan1-0:03654 ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  rep.adobe-japan1-0:03654 ] ;
     .
     rep.adobe-japan1-0:03655
                :abstract-glyph-of adobe-japan1-0:03655   .
@@ -10809,7 +10809,7 @@ a.ucs:0x21DE4
     rep.daikanwa:08114
         a chisegg:abstract-glyph ;
         :abstract-glyph-of daikanwa:08114 ;
-        :from.same           [ :sources chisebib:zhengzitong ,
+        ideo:same-as         [ :sources chisebib:zhengzitong ,
                                         chisebib:daikanwa ;
                                :target  rep.cns11643-2:0x2E6F ] ;
         .
@@ -11827,7 +11827,7 @@ a.ucs:0x5D01
     :eq a.big5:0xAE72             ; # &I-B-AE72;
     :eq rep.daikanwa...ho:0145    ; # 崁
     :eq rep.jef-china3:0x93DB     ; # &I-JC3-93DB;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x574E         ] ;
     :subsume
         g2.ucs_unicode:0x5D01 ,
@@ -15799,7 +15799,7 @@ a.ucs:0x5D17
     :eq rep.gt-pj-1:22078         ; # &I-GT-10299;
     :eq rep.daikanwa:08221        ; # &I-M-08221;
     :eq rep.shinjigen:1967        ; # 崗
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5CA1         ] ;
     .
     rep.adobe-japan1-0:04683
@@ -17568,7 +17568,7 @@ a.ucs:0x5D47
     :eq a.big5:0xB452             ; # &I-B-B452;
     :eq rep.daikanwa:08273        ; # &I-M-08273;
     :eq rep.jef-china3:0x5DAE     ; # &I-JC3-5DAE;
-    :from.same           [ :sources chisebib:zhengzitong ,
+    ideo:same-as         [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x5D46         ] ;
     :subsume
@@ -18790,7 +18790,7 @@ a.ucs:0x5D52
     :eq rep.shinjigen:5402        ; # 嵒
     :form-of             [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5CA9         ] ;
-    :to.mistakable       [ :sources chisebib:daikanwa ;
+    ideo:mistakable      [ :sources chisebib:daikanwa ;
                            :target  a.ucs:0x55A6         ] ;
     .
     rep.adobe-japan1-0:04694
@@ -18831,7 +18831,7 @@ a.ucs:0x5D53
     :eq rep.shinjigen:5403        ; # 嵓
     :eq rep.cbeta:04033           ; # &I-CB04033;
     :eq rep.jef-china3:0x4BA3     ; # &I-JC3-4BA3;
-    :from.vulgar         [ :sources chisebib:shinjigen ;
+    ideo:vulgar-form-of  [ :sources chisebib:shinjigen ;
                            :target  a.ucs:0x5CA9         ] ;
     .
     rep.adobe-japan1-2:08442
@@ -19244,7 +19244,7 @@ rep.cns11643-3:0x3B31
     :eq a.ucs_iwds-1:0x5D57       ; # &C3-3B31;
     :eq rep.ucs_unicode:0x5D57    ; # &C3-3B31;
     :eq rep.daikanwa:08319        ; # &I-M-08319;
-    :from.vulgar         [ :sources chisebib:cihai ,
+    ideo:vulgar-form-of  [ :sources chisebib:cihai ,
                                     chisebib:daikanwa ;
                            :target  a.ucs:0x6B72         ] ;
     :subsume
@@ -19353,7 +19353,7 @@ a.ucs:0xFA11
     :eq rep.gt-pj-9:13172         ; # &I-GT-10395;
     :eq rep.daikanwa...ho:0149    ; # 﨑
     :eq rep.shinjigen:1996        ; # 﨑
-    :from.vulgar         [ :sources chisebib:ruijumyougishou ,
+    ideo:vulgar-form-of  [ :sources chisebib:ruijumyougishou ,
                                     chisebib:daikanwa ,
                                     chisebib:shinjigen ;
                            :target  a.ucs:0x5D0E         ] ;
@@ -21568,7 +21568,7 @@ rep.cns11643-3:0x407D
     ideo:strokes          10 ;
     ideo:total-strokes    13 ;
     :eq rep.daikanwa:08361        ; # &I-M-08361;
-    :from.vulgar         [ :sources chisebib:zhengzitong ,
+    ideo:vulgar-form-of  [ :sources chisebib:zhengzitong ,
                                     chisebib:daikanwa ;
                            :target  rep.daikanwa:08360   ] ;
     .
@@ -22995,6 +22995,12 @@ a.ucs:0x21EDF
         isd:left     a.ucs:0x5C71 ; # 山
         isd:right    a.ucs:0x83AB   # 莫
     ] ;
+    :sound               [ :context domain:ja...on...go ;
+                           :target  ( "myaku" ) ;
+                         ] ;
+    :sound               [ :context domain:ja...on...kan ;
+                           :target  ( "baku" ) ;
+                         ] ;
     .
 
 rep.ucs_iso:0x21EDF
@@ -24907,8 +24913,8 @@ a.ucs:0x3800
     :eq rep.daikanwa:08433        ; # &I-M-08433;
     :eq rep.shinjigen:1987        ; # 㠀
     :eq rep.jef-china3:0x4BB6     ; # &I-JC3-4BB6;
-    :from.original       [ :sources chisebib:shinjigen ;
-                           :target  a.ucs:0x5CF6         ] ;
+    ideo:original-form-of [ :sources chisebib:shinjigen ;
+                            :target  a.ucs:0x5CF6         ] ;
     :subsume
         g2.ucs_unicode:0x3800 ;
     .
@@ -25280,7 +25286,7 @@ rep.daikanwa:49055
         isd:right    rep.adobe-japan1-0:05065   # &AJ1-05065;
     ] ;
     :eq rep.cbeta:06478           ; # &I-CB06478;
-    :from.same           [ :sources chisebib:daikanwa ;
+    ideo:same-as         [ :sources chisebib:daikanwa ;
                            :target  rep.daikanwa:08414   ] ;
     .
     rep.cbeta:06478
@@ -25391,6 +25397,40 @@ a.ucs:0x21448
     ideo:total-strokes    14 ;
     .
 
+a.ucs:0x21F07
+    a chisegg:abstract-character ;
+    :abstract-character-of ucs:0x21F07 ;
+    ideo:radical          46 ; # ⼭ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x5C71 ; # 山
+        isd:right    a.ucs:0x21569   # 𡕩
+    ] ;
+    .
+
+rep.ucs_iso:0x21F07
+    a chisegg:abstract-glyph ;
+    :abstract-glyph-of [ :context domain:iso     ;
+                         :target     ucs:0x21F07 ] ;
+    :denotation-of
+        a.ucs:0x21F07        ;
+    ideo:radical          46 ; # ⼭ 
+    ideo:strokes          11 ;
+    ideo:total-strokes    14 ;
+    isd:structure [ a idc:⿰ ;
+        isd:left     a.ucs:0x5C71 ; # 山
+        isd:right    rep.ucs_JP...hanazono:0x21569   # &hanaJU+21569;
+    ] ;
+    :subsume
+        g2.ucs_iso:0x21F07   ;
+    .
+    g2.ucs_iso:0x21F07
+        a chisegg:abstract-glyph-form ;
+        :abstract-glyph-form-of [ :context domain:iso     ;
+                                  :target     ucs:0x21F07 ] ;
+        .
+
 a.ucs:0x3805
     a chisegg:abstract-character ;
     :abstract-character-of ucs:0x3805 ;