Update Copyright header.

[chise/isd.git] / isd-turtle.el

diff --git a/isd-turtle.el b/isd-turtle.el
index a4f1001..c1112f4 100644 (file)
--- a/isd-turtle.el
+++ b/isd-turtle.el
@@ -1,6 +1,6 @@
 ;;; isd-turtle.el --- Utility to dump ideographic-structure as Turtle files
 
-;; Copyright (C) 2017 MORIOKA Tomohiko
+;; Copyright (C) 2017, 2018 MORIOKA Tomohiko
 
 ;; Author: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
 ;; Keywords: Ideographic Structures (漢字構造、解字), IDS, CHISE, RDF, Turtle
@@ -62,6 +62,7 @@
     =ucs-var-002
     =ucs-var-003
     =ucs-var-004
+    =ucs-var-005
     =cns11643-1 =cns11643-2 =cns11643-3
     =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
     =gb2312
@@ -292,7 +293,7 @@
     (setq prefix ""))
   (let ((indent (make-string (* level 4) ?\ ))
        char
-       idc
+       idc idc-str
        p1 p2 p3
        c1 c2 c3
        ret)
@@ -344,11 +345,16 @@
      ((eq idc ?⿻)
       (setq p1 'underlying
            p2 'overlaying)
+      )
+     ((and idc (eq (encode-char idc '=>iwds-1) 305))
+      (setq idc-str "⿱・⿸")
+      (setq p1 'above
+           p2 'below)
       ))
     (cond
      (p3
       (format "%s
-%s    %s:structure [ a idc:%c ;
+%s    %s:structure [ a idc:%s ;
 %s        %s:%-8s %s
 %s        %s:%-8s %s
 %s        %s:%-8s %s
@@ -360,7 +366,7 @@
                            (chise-turtle-format-ccs-code-point ccs code-point)
                            char)
                  "["))
-             indent prefix idc
+             indent prefix (or idc-str (char-to-string idc))
              indent prefix p1 (isd-turtle-format-component c1 ?\; (1+ level) prefix)
              indent prefix p2 (isd-turtle-format-component c2 ?\; (1+ level) prefix)
              indent prefix p3 (isd-turtle-format-component c3 ?\  (1+ level) prefix)
@@ -374,7 +380,7 @@
       )
      (idc
       (format "%s
-%s    %s:structure [ a idc:%c ;
+%s    %s:structure [ a idc:%s ;
 %s        %s:%-8s %s
 %s        %s:%-8s %s
 %s    ]%s"
@@ -385,7 +391,7 @@
                            (chise-turtle-format-ccs-code-point ccs code-point)
                            char)
                  "["))
-             indent prefix idc
+             indent prefix (or idc-str (char-to-string idc))
              indent prefix p1 (isd-turtle-format-component c1 ?\; (1+ level) prefix)
              indent prefix p2 (isd-turtle-format-component c2 ?\  (1+ level) prefix)
              indent