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

diff --git a/char-db-turtle.el b/char-db-turtle.el
index d2f62bb..9f367ff 100644
--- a/char-db-turtle.el
+++ b/char-db-turtle.el
@@ -54,9 +54,12 @@
     =ucs-itaiji-004
     =ucs-itaiji-005
     =ucs-itaiji-006
+    =ucs-itaiji-007
+    =ucs-itaiji-009
     =ucs-itaiji-084
     =ucs-var-001
     =ucs-var-002
+    =ucs-var-003
     =ucs-var-004
     =cns11643-1 =cns11643-2 =cns11643-3
     =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
@@ -67,14 +70,18 @@
     =ucs@unicode
     =ucs@JP/hanazono
     =gb12345
+    =ucs@cns
+    =ucs@gb
     =zinbun-oracle =>zinbun-oracle
     =daikanwa
     =ruimoku-v6
     =cbeta =jef-china3
+    =daikanwa/+2p
     =+>ucs@iso =+>ucs@unicode
     =+>ucs@jis
     =+>ucs@cns
     =+>ucs@ks
+    =+>ucs@jis/1990
     =>mj
     =>jis-x0208 =>jis-x0213-1
     =>jis-x0208@1997
@@ -89,6 +96,7 @@
     =>>ucs@iso =>>ucs@unicode
     =>>ucs@jis =>>ucs@cns =>>ucs@ks
     =>>gt-k
+    =>>hanyo-denshi/ks
     ==mj
     ==ucs@iso
     ==ucs@unicode
@@ -111,7 +119,10 @@
     ==koseki
     ==daikanwa
     ==gt-k
+    ==ucs@gb
+    ==ucs-itaiji-003
     ==ucs@JP/hanazono
+    ==daikanwa/+2p
     =>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2
     =+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2
     =+>hanyo-denshi/jt
@@ -134,12 +145,15 @@
     ===gt
     ===gt-k
     ===ucs@ks
+    ===ucs@gb
     =shinjigen
+    =shinjigen@rev
     =shinjigen@1ed
     =shinjigen/+p@rev
     ==shinjigen
     ==shinjigen@rev
     ==daikanwa/+p
+    ==shinjigen@1ed
     ===daikanwa/+p
     =>daikanwa/ho
     ===daikanwa/ho
@@ -224,7 +238,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 +251,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 +579,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 +589,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)
 	 )
@@ -936,7 +965,7 @@
 			  line-separator))
 	  (setq col (current-column))
 	  (insert (format ":context domain:%-7s ;\n%s:target  %S"
-			  domain
+			  (chise-turtle-uri-encode-ccs-name domain)
 			  (make-string col ?\ )
 			  value))
 	  (setq attributes (delq key attributes))
@@ -1091,7 +1120,7 @@
 		    ))
 	       )
 	      ((eq name 'ideographic-structure)
-	       (insert (isd-turtle-format-char nil nil value nil
+	       (insert (isd-turtle-format-char nil nil value (/ column 4)
 					       'isd 'without-head-char))
 	       (insert " ;")
 	       )
@@ -1156,6 +1185,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/> .