Sync up with the current environment.

[chise/isd.git] / isd-turtle.el

diff --git a/isd-turtle.el b/isd-turtle.el
index 96201c1..a4f1001 100644 (file)
--- a/isd-turtle.el
+++ b/isd-turtle.el
@@ -53,7 +53,10 @@
     =ucs-itaiji-004
     =ucs-itaiji-005
     =ucs-itaiji-006
+    =ucs-itaiji-007
+    =ucs-itaiji-008
     =ucs-itaiji-009
+    =ucs-itaiji-010
     =ucs-itaiji-084
     =ucs-var-001
     =ucs-var-002
@@ -84,6 +87,7 @@
     =>jis-x0208 =>jis-x0213-1
     =>jis-x0208@1997
     =>ucs@iwds-1
+    =>ucs@cognate
     =>ucs@component
     =>iwds-1
     =>ucs@iso
@@ -131,7 +135,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
@@ -163,17 +171,23 @@
 (defun charset-code-point-format-spec (ccs)
   (cond ((memq ccs '(=ucs))
         "0x%04X")
-       ((memq ccs '(=gt
-                    =gt-k =daikanwa =adobe-japan1
-                    =cbeta =zinbun-oracle))
-        "%05d")
-       ((memq ccs '(=hanyo-denshi/ks
-                    =koseki =mj))
-        "%06d")
-       ((memq ccs '(=hanyo-denshi/tk ==hanyo-denshi/tk))
-        "%08d")
        (t
-        "0x%X")))
+        (let ((ccs-name (symbol-name ccs)))
+          (cond
+           ((string-match
+             "\\(shinjigen\\|daikanwa/ho\\|=>iwds-1\\)"
+             ccs-name)
+            "%04d")
+           ((string-match
+             "\\(gt\\|daikanwa\\|adobe-japan1\\|cbeta\\|zinbun-oracle\\|hng\\)"
+             ccs-name)
+            "%05d")
+           ((string-match "\\(hanyo-denshi/ks\\|koseki\\|mj\\)" ccs-name)
+            "%06d")
+           ((string-match "hanyo-denshi/tk" ccs-name)
+            "%08d")
+           (t
+            "0x%X"))))))
 
 ;; (defun isd-turtle-uri-encode-feature-name (feature-name)
 ;;   (cond
@@ -250,7 +264,7 @@
                     (encode-char object 'system-char-id))
             )))))
 
-(defun isd-turtle-format-component (component separator level)
+(defun isd-turtle-format-component (component separator level prefix)
   (cond ((characterp component)
         (format "%s %c # %c"
                 (isd-turtle-encode-char component)
@@ -265,8 +279,10 @@
                 ((setq ret (assq 'ideographic-structure component))
                  (if (eq separator ?\;)
                      (format "%s ;"
-                             (isd-turtle-format-char nil nil (cdr ret) (1+ level)))
-                   (isd-turtle-format-char nil nil (cdr ret) (1+ level)))))))))
+                             (isd-turtle-format-char nil nil (cdr ret) (1+ level)
+                                                     prefix))
+                   (isd-turtle-format-char nil nil (cdr ret) (1+ level)
+                                           prefix))))))))
 
 (defun isd-turtle-format-char (ccs code-point &optional ids-list level
                                   prefix without-head-char)
@@ -345,9 +361,9 @@
                            char)
                  "["))
              indent prefix idc
-             indent prefix p1 (isd-turtle-format-component c1 ?\; (1+ level))
-             indent prefix p2 (isd-turtle-format-component c2 ?\; (1+ level))
-             indent prefix p3 (isd-turtle-format-component c3 ?\  (1+ level))
+             indent prefix p1 (isd-turtle-format-component c1 ?\; (1+ level) prefix)
+             indent prefix p2 (isd-turtle-format-component c2 ?\; (1+ level) prefix)
+             indent prefix p3 (isd-turtle-format-component c3 ?\  (1+ level) prefix)
              indent
              (if without-head-char
                  ""
@@ -370,8 +386,8 @@
                            char)
                  "["))
              indent prefix idc
-             indent prefix p1 (isd-turtle-format-component c1 ?\; (1+ level))
-             indent prefix p2 (isd-turtle-format-component c2 ?\  (1+ level))
+             indent prefix p1 (isd-turtle-format-component c1 ?\; (1+ level) prefix)
+             indent prefix p2 (isd-turtle-format-component c2 ?\  (1+ level) prefix)
              indent
              (if without-head-char
                  ""