update.

[chise/tomoyo-tools.git] / concord-turtle-dump.el

diff --git a/concord-turtle-dump.el b/concord-turtle-dump.el
index 7e6826d..55beb82 100644 (file)
--- a/concord-turtle-dump.el
+++ b/concord-turtle-dump.el
@@ -221,6 +221,8 @@
     "ideo:hanyu-dazidian")
    ((eq '*note feature-name)
     "rdfs:comment")
+   ((eq '*instance feature-name)
+    ":instance")
    (t
     (concat ":" (chise-turtle-uri-encode-ccs-name feature-name)))))
 
@@ -608,6 +610,7 @@
         (concord-turtle-insert-decomposition value readable)
         )
        ((or (eq feature-name-base 'ideographic-combination)
+            (eq feature-name-base '*instance)
             (eq feature-name-base '<-formed)
             (string-match "^\\(->\\|<-\\)[^*]*$" (symbol-name feature-name-base)))
         (concord-turtle-insert-relations value readable)
@@ -679,6 +682,10 @@
                   (insert "rdf:value ")
                   (concord-turtle-insert-target-value mdval feature-name-base)
                   )
+                 ((eq mdname :note)
+                  (insert "rdfs:comment ")
+                  (insert (format "%S" mdval))
+                  )
                  (t
                   (concord-turtle-insert-metadata mdname mdval)))))
     (if last-sep
@@ -1066,36 +1073,36 @@
                                (intern (format "=%s" name)))))
                   (setq child-ccs-list (cons ret child-ccs-list)))
               )
-             ((and
-               (not readable)
-               (not (eq name '->subsumptive))
-               (not (eq name '->uppercase))
-               (not (eq name '->lowercase))
-               (not (eq name '->titlecase))
-               (not (eq name '->canonical))
-               (not (eq name '->Bopomofo))
-               (not (eq name '->mistakable))
-               (not (eq name '->ideographic-variants))
-               (or (eq name '<-identical)
-                   (eq name '<-uppercase)
-                   (eq name '<-lowercase)
-                   (eq name '<-titlecase)
-                   (eq name '<-canonical)
-                   (eq name '<-ideographic-variants)
-                   ;; (eq name '<-synonyms)
-                   (string-match "^<-synonyms" (symbol-name name))
-                   (eq name '<-mistakable)
-                   (when (string-match "^->" (symbol-name name))
-                     (cond
-                      ((string-match "^->fullwidth" (symbol-name name))
-                       (not (and (consp value)
-                                 (characterp (car value))
-                                 (encode-char
-                                  (car value) '=ucs 'defined-only)))
-                       )
-                      (t)))
-                   ))
-              )
+              ;; ((and
+              ;;   (not readable)
+              ;;   (not (eq name '->subsumptive))
+              ;;   (not (eq name '->uppercase))
+              ;;   (not (eq name '->lowercase))
+              ;;   (not (eq name '->titlecase))
+              ;;   (not (eq name '->canonical))
+              ;;   (not (eq name '->Bopomofo))
+              ;;   (not (eq name '->mistakable))
+              ;;   (not (eq name '->ideographic-variants))
+              ;;   (or (eq name '<-identical)
+              ;;       (eq name '<-uppercase)
+              ;;       (eq name '<-lowercase)
+              ;;       (eq name '<-titlecase)
+              ;;       (eq name '<-canonical)
+              ;;       (eq name '<-ideographic-variants)
+              ;;       ;; (eq name '<-synonyms)
+              ;;       (string-match "^<-synonyms" (symbol-name name))
+              ;;       (eq name '<-mistakable)
+              ;;       (when (string-match "^->" (symbol-name name))
+              ;;         (cond
+              ;;          ((string-match "^->fullwidth" (symbol-name name))
+              ;;           (not (and (consp value)
+              ;;                     (characterp (car value))
+              ;;                     (encode-char
+              ;;                      (car value) '=ucs 'defined-only)))
+              ;;           )
+              ;;          (t)))
+              ;;       ))
+              ;;  )
              ((eq name 'ideographic-structure)
               (insert (isd-turtle-format-char nil nil value (/ column 4)
                                               'isd 'without-head-char))