X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=char-db-turtle.el;h=b7f95421ca9bde44738e2f3bb13d9318d16b3641;hb=b816843f52a97e2cabcf7043bafea306c84f0a9e;hp=287f13491a39a1e2041e1771a3ddad44da480578;hpb=3097c20534000fc92bdf16c6041c883896a1586f;p=chise%2Fchiset.git
diff --git a/char-db-turtle.el b/char-db-turtle.el
index 287f134..b7f9542 100644
--- a/char-db-turtle.el
+++ b/char-db-turtle.el
@@ -54,10 +54,20 @@
=ucs-itaiji-004
=ucs-itaiji-005
=ucs-itaiji-006
+ =ucs-itaiji-007
+ =ucs-itaiji-008
+ =ucs-itaiji-009
+ =ucs-itaiji-010
+ =ucs-itaiji-011
=ucs-itaiji-084
=ucs-var-001
=ucs-var-002
+ =ucs-var-003
=ucs-var-004
+ =ucs-var-005
+ =ucs-var-006
+ =ucs-var-008
+ =ucs-var-010
=cns11643-1 =cns11643-2 =cns11643-3
=cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
=gb2312
@@ -68,18 +78,22 @@
=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
=>ucs@iwds-1
+ =>ucs@cognate
=>ucs@component
=>iwds-1
=>ucs@iso
@@ -90,6 +104,7 @@
=>>ucs@iso =>>ucs@unicode
=>>ucs@jis =>>ucs@cns =>>ucs@ks
=>>gt-k
+ =>>hanyo-denshi/ks
==mj
==ucs@iso
==ucs@unicode
@@ -112,7 +127,13 @@
==koseki
==daikanwa
==gt-k
+ ==ucs@gb
+ ==ucs-itaiji-002
+ ==ucs-itaiji-003
+ ==ucs-itaiji-005
+ ==ucs-var-002
==ucs@JP/hanazono
+ ==daikanwa/+2p
=>>jis-x0208 =>>jis-x0213-1 =>>jis-x0213-2
=+>jis-x0208 =+>jis-x0213-1 =+>jis-x0213-2
=+>hanyo-denshi/jt
@@ -123,7 +144,11 @@
=jis-x0208@1983 =jis-x0208@1978
=>ucs-itaiji-001
=>ucs-itaiji-002
+ =>ucs-itaiji-003
+ =>ucs-itaiji-004
=>ucs-itaiji-005
+ =>ucs-itaiji-006
+ =>ucs-itaiji-007
==>ucs@bucs
=big5
=>cbeta
@@ -137,11 +162,13 @@
===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
@@ -208,6 +235,26 @@
":denotation-of")
((eq '<-formed feature-name)
":form-of")
+ ((eq '<-same feature-name)
+ "ideo:same-as")
+ ((eq '<-simplified feature-name)
+ "ideo:simplified-form-of")
+ ((eq '<-vulgar feature-name)
+ "ideo:vulgar-form-of")
+ ((eq '<-wrong feature-name)
+ "ideo:wrong-form-of")
+ ((eq '<-original feature-name)
+ "ideo:original-form-of")
+ ((eq '<-ancient feature-name)
+ "ideo:ancient-form-of")
+ ((eq '<-Small-Seal feature-name)
+ "ideo:Small-Seal-of")
+ ((eq '<-interchangeable feature-name)
+ "ideo:interchangeable-form-of")
+ ((eq '->interchangeable feature-name)
+ "ideo:interchangeable")
+ ((eq '->mistakable feature-name)
+ "ideo:mistakable")
((eq 'hanyu-dazidian feature-name)
"ideo:hanyu-dazidian")
(t
@@ -226,7 +273,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 +286,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 +614,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 +624,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)
)
@@ -938,7 +1000,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))
@@ -1093,7 +1155,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 " ;")
)
@@ -1158,6 +1220,7 @@
@prefix chisegg: .
@prefix domain: .
@prefix script: .
+@prefix ideocomb: .
@prefix chisebib: .
@prefix ruimoku: .
@prefix zob1959: .