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

diff --git a/char-db-turtle.el b/char-db-turtle.el
index db3f9df..83d1731 100644
--- a/char-db-turtle.el
+++ b/char-db-turtle.el
@@ -67,12 +67,11 @@
     =ucs@unicode
     =ucs@JP/hanazono
     =gb12345
+    =ucs@cns
     =zinbun-oracle =>zinbun-oracle
     =daikanwa
     =ruimoku-v6
     =cbeta =jef-china3
-    =shinjigen@1ed
-    =shinjigen/+p@rev
     =+>ucs@iso =+>ucs@unicode
     =+>ucs@jis
     =+>ucs@cns
@@ -108,13 +107,12 @@
     ==gt
     ==cns11643-1 ==cns11643-2 ==cns11643-3
     ==cns11643-4 ==cns11643-5 ==cns11643-6 ==cns11643-7
+    ==jis-x0212
     ==ucs@cns
-    ==gt-k
     ==koseki
+    ==daikanwa
+    ==gt-k
     ==ucs@JP/hanazono
-    ==shinjigen
-    ==shinjigen@rev
-    ==daikanwa/+p
     =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2
     =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2
     =+>hanyo-denshi/jt
@@ -137,7 +135,15 @@
     ===gt
     ===gt-k
     ===ucs@ks
+    ===ucs@gb
+    =shinjigen
+    =shinjigen@1ed
+    =shinjigen/+p@rev
+    ==shinjigen
+    ==shinjigen@rev
+    ==daikanwa/+p
     ===daikanwa/+p
+    =>daikanwa/ho
     ===daikanwa/ho
     ))
 
@@ -220,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
@@ -233,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"
@@ -489,7 +509,7 @@
 
 (defun char-db-turtle-insert-source-list (value &optional readable)
   (let (lbs separator rest cell al cal key ret)
-    (setq lbs (concat "\n" (make-string (current-column) ?\ ))
+    (setq lbs (concat " ,\n" (make-string (current-column) ?\ ))
 	  separator nil)
     (while (consp value)
       (setq cell (car value))
@@ -547,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))
 
@@ -557,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)
 	 )
@@ -1152,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/> .