X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=char-db-turtle.el;h=83d173153db6ede61f7821e4592b206677fe0c25;hb=13fbcee6c305437e5467ccdf61896da0e65fa0d5;hp=d2f62bb26758f65754319a176a4bebf269644082;hpb=2064de89052957eb6cc9eb59e381887a5948140c;p=chise%2Fchiset.git

diff --git a/char-db-turtle.el b/char-db-turtle.el
index d2f62bb..83d1731 100644
--- a/char-db-turtle.el
+++ b/char-db-turtle.el
@@ -67,6 +67,7 @@
     =ucs@unicode
     =ucs@JP/hanazono
     =gb12345
+    =ucs@cns
     =zinbun-oracle =>zinbun-oracle
     =daikanwa
     =ruimoku-v6
@@ -134,6 +135,7 @@
     ===gt
     ===gt-k
     ===ucs@ks
+    ===ucs@gb
     =shinjigen
     =shinjigen@1ed
     =shinjigen/+p@rev
@@ -224,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
@@ -237,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"
@@ -551,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))
 
@@ -561,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)
 	 )
@@ -1156,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/> .