From: MORIOKA Tomohiko <tomo.git@chise.org>
Date: Mon, 24 Apr 2017 07:52:50 +0000 (+0900)
Subject: (chise-turtle-encode-char): Add code for `ideographic-combination'.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=eead826a2d43c4ee99c0a9fe05e56830b93e76c9;p=chise%2Fchiset.git

(chise-turtle-encode-char): Add code for `ideographic-combination'.
(char-db-turtle-insert-relations): Use `<-formed' instead of
`ideographic-combination' to represent relation features.
(char-db-turtle-insert-target-value): Add shortcut condition for
`<-formed'.
(char-db-turtle-insert-prefix): Add "ideocomb:" for the prefix for
<http://rdf.chise.org/data/character/ideo/combination/>.
---

diff --git a/char-db-turtle.el b/char-db-turtle.el
index 287f134..83d1731 100644
--- a/char-db-turtle.el
+++ b/char-db-turtle.el
@@ -226,7 +226,7 @@
 
 (defun chise-turtle-encode-char (object)
   (let ((ccs-list est-coded-charset-priority-list)
-	ccs ret)
+	ccs ret ret2)
     (if (setq ret (encode-char object '=ucs))
 	(chise-turtle-format-ccs-code-point '=ucs ret)
       (while (and ccs-list
@@ -239,6 +239,20 @@
 		  (setq ret (encode-char object ccs)))
 	     (chise-turtle-format-ccs-code-point ccs ret)
 	     )
+	    ((setq ret (get-char-attribute object 'ideographic-combination))
+	     (format "ideocomb:%s"
+		     (mapconcat (lambda (cell)
+				  (cond ((characterp cell)
+					 (char-to-string cell)
+					 )
+					((setq ret2 (find-char cell))
+					 (char-to-string ret2)
+					 )
+					(t
+					 (format "%S" cell)
+					 )))
+				ret ""))
+	     )
 	    (t
 	     (format (if est-hide-cgi-mode
 			 "system-char-id=0x%X"
@@ -553,7 +567,7 @@
 	(setq separator (format " ,%s" lbs)))
       (if (characterp cell)
 	  (insert (format "%-20s" (chise-turtle-encode-char cell)))
-	(char-db-turtle-insert-char-ref cell 'ideographic-combination))
+	(char-db-turtle-insert-char-ref cell '<-formed))
       (setq value (cdr value)))
     nil))
 
@@ -563,6 +577,7 @@
 	 )
 	((or (eq feature-name-base 'ideographic-combination)
 	     (eq feature-name-base '=decomposition)
+	     (eq feature-name-base '<-formed)
 	     (string-match "^\\(->\\|<-\\)[^*]*$" (symbol-name feature-name-base)))
 	 (char-db-turtle-insert-relations value readable)
 	 )
@@ -1158,6 +1173,7 @@
 @prefix chisegg: <http://rdf.chise.org/rdf/type/character/ggg/> .
 @prefix domain: <http://rdf.chise.org/data/domain/> .
 @prefix script: <http://rdf.chise.org/data/script/> .
+@prefix ideocomb: <http://rdf.chise.org/data/character/ideo/combination/> .
 @prefix chisebib: <http://rdf.chise.org/data/bibliography/> .
 @prefix ruimoku: <http://www.chise.org/est/view/article@ruimoku/rep.id=/> .
 @prefix zob1959: <http://chise.zinbun.kyoto-u.ac.jp/koukotsu/rubbings/> .