X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=6e7b01467fc646ef38466b2398911986d8daa734;hb=037263b4f76fb61dd7835ef61aa921ebe2a895df;hp=d8b628aad54eb67acfbce43add365bf2e27ea59e;hpb=efed7e5ca31a3a79e8b460e37ec67e02b472e3b3;p=chise%2Fest.git

diff --git a/cwiki-common.el b/cwiki-common.el
index d8b628a..6e7b014 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,14 +1,36 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (require 'char-db-util)
 
+(setq file-name-coding-system 'utf-8-mcs-er)
+
+
+(concord-assign-genre 'creator@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'person-name@ruimoku "/usr/local/var/ruimoku/db")
+
+(concord-assign-genre 'journal-volume@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'article@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'book@ruimoku "/usr/local/var/ruimoku/db")
+
+(concord-assign-genre 'classification@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'region@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'era@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'period@ruimoku "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'journal@ruimoku "/usr/local/var/ruimoku/db")
+
+(mount-char-attribute-table 'instance@ruimoku/bibliography/title)
+;; (mount-char-attribute-table 'instance@ruimoku/bibliography/content*note)
+
+
 (defvar chise-wiki-view-url "view.cgi")
-(defvar chise-wiki-edit-url "edit/edit.cgi")
+(defvar chise-wiki-edit-url "edit.cgi")
 
 (defvar chise-wiki-bitmap-glyphs-url
-  "http://chise.zinbun.kyoto-u.ac.jp/glyphs")
+  "http://www.chise.org/glyphs")
 
 (defvar chise-wiki-glyph-cgi-url
-  "http://chise.zinbun.kyoto-u.ac.jp/chisewiki/glyph.cgi")
+  "http://www.chise.org/chisewiki/glyph.cgi")
+
+(defvar chise-wiki-displayed-features nil)
 
 (defun decode-uri-string (string &optional coding-system)
   (if (> (length string) 0)
@@ -47,8 +69,28 @@
 	  'structure)
 	 ))))
 
+(defun www-feature-format (feature-name)
+  (or (char-feature-property feature-name 'format)
+      (let (fn parent ret)
+	(setq fn feature-name)
+	(while (and (setq parent (char-feature-name-parent fn))
+		    (null (setq ret
+				(char-feature-property
+				 parent 'format))))
+	  (setq fn parent))
+	ret)
+      '((name) " : " (value))))
+
 (defun www-feature-value-format (feature-name)
   (or (char-feature-property feature-name 'value-format)
+      (let (fn parent ret)
+	(setq fn feature-name)
+	(while (and (setq parent (char-feature-name-parent fn))
+		    (null (setq ret
+				(char-feature-property
+				 parent 'value-format))))
+	  (setq fn parent))
+	ret)
       (let ((type (www-feature-type feature-name)))
 	(cond ((eq type 'relation)
 	       'space-separated-char-list)
@@ -61,18 +103,30 @@
 	  (if (and (= (charset-dimension feature-name) 2)
 		   (= (charset-chars feature-name) 94))
 	      '("0x" (HEX)
-		" (" (decimal) ") <" (ku-ten) ">")
-	    '("0x" (HEX) " (" (decimal) ")")))))
+		" (" (decimal) ") <" (ku-ten) "> " (prev-char) (next-char))
+	    '("0x" (HEX) " (" (decimal) ") " (prev-char) (next-char))))))
 
 (defun char-feature-name-at-domain (feature-name domain)
+  (if domain
+      (let ((name (symbol-name feature-name)))
+	(cond
+	 ((string-match "@[^*]+$" name)
+	  (intern (format "%s/%s" name domain))
+	  )
+	 (t
+	  (intern (format "%s@%s" name domain))
+	  )))
+    feature-name))
+
+(defun char-feature-name-parent (feature-name)
   (let ((name (symbol-name feature-name)))
-    (cond
-     ((string-match "@[^*]+$" name)
-      (intern (format "%s/%s" name domain))
-      )
-     (t
-      (intern (format "%s@%s" name domain))
-      ))))
+    (if (string-match "@[^@/*]+\\(/[^@/*]+\\)*$" name)
+	(intern (substring name 0 (car (last (match-data) 2)))))))
+
+(defun char-feature-name-domain (feature-name)
+  (let ((name (symbol-name feature-name)))
+    (if (string-match "@[^@/*]+\\(/[^@/*]+\\)*$" name)
+	(intern (substring name (1+ (match-beginning 0)))))))
 
 (defun char-feature-name-sans-versions (feature)
   (let ((feature-name (symbol-name feature)))
@@ -80,11 +134,152 @@
 	(intern (substring feature-name 0 (match-beginning 0)))
       feature)))
 
-(defun www-char-feature (character feature)
+(defun est-object-genre (object)
+  (if (characterp object)
+      'character
+    (concord-object-genre object)))
+
+(defun www-get-feature-value (object feature)
   (let ((latest-feature (char-feature-name-at-domain feature '$rev=latest)))
-    (mount-char-attribute-table latest-feature)
-    (or (char-feature character latest-feature)
-	(char-feature character feature))))
+    (cond
+     ((characterp object)
+      (mount-char-attribute-table latest-feature)
+      (or (char-feature object latest-feature)
+	  (char-feature object feature))
+      )
+     (t
+      (or (condition-case nil
+	      (concord-object-get object latest-feature)
+	    (error nil))
+	  (condition-case nil
+	      (concord-object-get object feature)
+	    (error nil)))
+      ))))
+
+(defun get-previous-code-point (ccs code)
+  (let ((chars (charset-chars ccs))
+	(dim (charset-dimension ccs))
+	(i 0)
+	mask byte-min byte-max
+	bytes dest)
+    (cond
+     ((= chars 94)
+      (setq mask #x7F
+	    byte-min 33
+	    byte-max 126)
+      )
+     ((= chars 96)
+      (setq mask #x7F
+	    byte-min 32
+	    byte-max 127)
+      )
+     ((= chars 128)
+      (setq mask #x7F
+	    byte-min 0
+	    byte-max #xFF)
+      )
+     (t ; (= chars 256)
+      (setq mask #xFF
+	    byte-min 0
+	    byte-max #xFF)
+      ))
+    (setq bytes (make-vector dim 0))
+    (while (< i dim)
+      (aset bytes i (logand (lsh code (* i -8)) mask))
+      (setq i (1+ i)))
+    (setq i 0)
+    (while (and (< i dim)
+		(progn
+		  (aset bytes i (1- (aref bytes i)))
+		  (< (aref bytes i) byte-min)))
+      (aset bytes i byte-max)
+      (setq i (1+ i)))
+    (when (< i dim)
+      (setq dest (aref bytes 0)
+	    i 1)
+      (while (< i dim)
+	(setq dest (logior dest (lsh (aref bytes i) (* i 8)))
+	      i (1+ i)))
+      dest)))
+
+(defun get-next-code-point (ccs code)
+  (let ((chars (charset-chars ccs))
+	(dim (charset-dimension ccs))
+	(i 0)
+	mask byte-min byte-max
+	bytes dest)
+    (cond
+     ((= chars 94)
+      (setq mask #x7F
+	    byte-min 33
+	    byte-max 126)
+      )
+     ((= chars 96)
+      (setq mask #x7F
+	    byte-min 32
+	    byte-max 127)
+      )
+     ((= chars 128)
+      (setq mask #x7F
+	    byte-min 0
+	    byte-max #xFF)
+      )
+     (t ; (= chars 256)
+      (setq mask #xFF
+	    byte-min 0
+	    byte-max #xFF)
+      ))
+    (setq bytes (make-vector dim 0))
+    (while (< i dim)
+      (aset bytes i (logand (lsh code (* i -8)) mask))
+      (setq i (1+ i)))
+    (setq i 0)
+    (while (and (< i dim)
+		(progn
+		  (aset bytes i (1+ (aref bytes i)))
+		  (> (aref bytes i) byte-max)))
+      (aset bytes i byte-min)
+      (setq i (1+ i)))
+    (when (< i dim)
+      (setq dest (aref bytes 0)
+	    i 1)
+      (while (< i dim)
+	(setq dest (logior dest (lsh (aref bytes i) (* i 8)))
+	      i (1+ i)))
+      dest)))
+
+(defun find-previous-defined-code-point (ccs code)
+  (let ((i (get-previous-code-point ccs code))
+	char)
+    (cond
+     ((eq ccs '=jis-x0208)
+      (setq ccs '=jis-x0208@1990))
+     ((eq ccs '=jis-x0213-1)
+      (setq ccs '=jis-x0213-1@2004)))
+    (while (and i
+		(>= i 0)
+		(null (setq char (decode-char ccs i
+					      (unless (eq ccs '=ucs)
+						'defined-only)))))
+      (setq i (get-previous-code-point ccs i)))
+    char))
+
+(defun find-next-defined-code-point (ccs code)
+  (let ((i (get-next-code-point ccs code))
+	max char)
+    (setq max (+ code 1000))
+    (cond
+     ((eq ccs '=jis-x0208)
+      (setq ccs '=jis-x0208@1990))
+     ((eq ccs '=jis-x0213-1)
+      (setq ccs '=jis-x0213-1@2004)))
+    (while (and i
+		(<= i max)
+		(null (setq char (decode-char ccs i
+					      (unless (eq ccs '=ucs)
+						'defined-only)))))
+      (setq i (get-next-code-point ccs i)))
+    char))
 
 
 ;;; @ URI representation
@@ -172,7 +367,11 @@
     )
    (t feature-name)))
 
-(defun www-uri-decode-char (char-rep)
+(defun www-uri-make-feature-name-url (uri-genre uri-feature-name uri-object)
+  (format "%s?feature=%s&%s=%s"
+	  chise-wiki-view-url uri-feature-name uri-genre uri-object))
+
+(defun www-uri-decode-object (genre char-rep)
   (let (ccs cpos)
     (cond
      ((string-match "\\(%3A\\|:\\)" char-rep)
@@ -185,58 +384,85 @@
 	      (string-to-number (substring cpos (match-end 0)) 16))
 	)
        (t
-	(setq cpos (string-to-number cpos))
+	(setq cpos (car (read-from-string cpos)))
 	))
-      (if (numberp cpos)
-	  (decode-char ccs cpos))
+      (if (and (eq genre 'character)
+	       (numberp cpos))
+	  (decode-char ccs cpos)
+	(concord-decode-object ccs cpos genre))
       )
      (t
       (setq char-rep (decode-uri-string char-rep 'utf-8-mcs-er))
-      (when (= (length char-rep) 1)
-	(aref char-rep 0))
-      ))))
-
-(defun www-uri-encode-char (char)
-  (if (encode-char char '=ucs)
-      (mapconcat
-       (lambda (byte)
-	 (format "%%%02X" byte))
-       (encode-coding-string (char-to-string char) 'utf-8-mcs-er)
-       "")
-    (let ((ccs-list '(; =ucs
-		      =cns11643-1 =cns11643-2 =cns11643-3
-		      =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
-		      =gb2312 =gb12345
-		      =jis-x0208 =jis-x0208@1990
-		      =jis-x0212
-		      =cbeta =jef-china3
-		      =jis-x0213-1@2000 =jis-x0213-1@2004
-		      =jis-x0208@1983 =jis-x0208@1978
-		      =zinbun-oracle
-		      =daikanwa
-		      =gt =gt-k
-		      =>>jis-x0208 =>>jis-x0213-1
-		      =>jis-x0208 =>jis-x0213-1
-		      =>>gt
-		      =big5
-		      =big5-cdp))
-	  ccs ret)
-      (while (and ccs-list
-		  (setq ccs (pop ccs-list))
-		  (not (setq ret (encode-char char ccs 'defined-only)))))
-      (cond (ret
-	     (format "%s:0x%X"
-		     (www-uri-encode-feature-name ccs)
-		     ret))
-	    ((and (setq ccs (car (split-char char)))
-		  (setq ret (encode-char char ccs)))
-	     (format "%s:0x%X"
-		     (www-uri-encode-feature-name ccs)
-		     ret))
-	    (t
-	     (format "system-char-id:0x%X"
-		     (encode-char char 'system-char-id))
-	     )))))
+      (cond
+       ((eq genre 'character)
+	(when (= (length char-rep) 1)
+	  (aref char-rep 0))
+	)
+       ((eq genre 'feature)
+	(concord-decode-object
+	 '=id (www-uri-decode-feature-name char-rep) 'feature)
+	)
+       (t
+	(concord-decode-object
+	 '=id (car (read-from-string char-rep)) genre)
+	))))))
+
+(defun www-uri-encode-object (object)
+  (if (characterp object)
+      (if (encode-char object '=ucs)
+	  (mapconcat
+	   (lambda (byte)
+	     (format "%%%02X" byte))
+	   (encode-coding-string (char-to-string object) 'utf-8-mcs-er)
+	   "")
+	(let ((ccs-list '(; =ucs
+			  =cns11643-1 =cns11643-2 =cns11643-3
+			  =cns11643-4 =cns11643-5 =cns11643-6 =cns11643-7
+			  =gb2312 =gb12345
+			  =jis-x0208 =jis-x0208@1990
+			  =jis-x0212
+			  =cbeta =jef-china3
+			  =jis-x0213-1@2000 =jis-x0213-1@2004
+			  =jis-x0208@1983 =jis-x0208@1978
+			  =zinbun-oracle =>zinbun-oracle
+			  =daikanwa
+			  =gt =gt-k
+			  =>>jis-x0208 =>>jis-x0213-1
+			  =>jis-x0208 =>jis-x0213-1
+			  =>>gt
+			  =ruimoku-v6
+			  =big5
+			  =big5-cdp))
+	      ccs ret)
+	  (while (and ccs-list
+		      (setq ccs (pop ccs-list))
+		      (not (setq ret (encode-char object ccs 'defined-only)))))
+	  (cond (ret
+		 (format "%s:0x%X"
+			 (www-uri-encode-feature-name ccs)
+			 ret))
+		((and (setq ccs (car (split-char object)))
+		      (setq ret (encode-char object ccs)))
+		 (format "%s:0x%X"
+			 (www-uri-encode-feature-name ccs)
+			 ret))
+		(t
+		 (format "system-char-id:0x%X"
+			 (encode-char object 'system-char-id))
+		 ))))
+    (format "rep.id:%s" (concord-object-id object))))
+
+(defun est-format-object (object)
+  (if (characterp object)
+      (char-to-string object)
+    (format "%s" (concord-object-id object))))
+
+(defun www-uri-make-object-url (object &optional uri-object)
+  (format "%s?%s=%s"
+	  chise-wiki-view-url
+	  (est-object-genre object)
+	  (or uri-object
+	      (www-uri-encode-object object))))
 
 
 ;;; @ Feature name presentation
@@ -290,7 +516,7 @@
      (t dest))))
 
 (defun www-format-feature-name* (feature-name &optional lang)
-  (let (name)
+  (let (name fn parent ret)
     (cond
      ((or (and lang
 	       (char-feature-property
@@ -298,122 +524,53 @@
 		(intern (format "name@%s" lang))))
 	  (char-feature-property
 	   feature-name 'name)))
-     ((find-charset feature-name)
-      (www-format-feature-name-as-CCS feature-name))
      ((and (setq name (symbol-name feature-name))
 	   (string-match "\\*" name))
       (www-format-feature-name-as-metadata feature-name lang))
-     ((string-match "^\\(->\\)" name)
-      (www-format-feature-name-as-rel-to feature-name))
-     ((string-match "^\\(<-\\)" name)
-      (www-format-feature-name-as-rel-from feature-name))
      (t
-      (www-format-feature-name-default feature-name)))))
+      (setq fn feature-name)
+      (while (and (setq parent (char-feature-name-parent fn))
+		  (null (setq ret
+			      (or (and lang
+				       (char-feature-property
+					parent
+					(intern (format "name@%s" lang))))
+				  (char-feature-property
+				   parent 'name)))))
+	(setq fn parent))
+      (cond
+       (ret
+	(concat ret (substring (symbol-name feature-name)
+			       (length (symbol-name parent)))))
+       ((find-charset feature-name)
+	(www-format-feature-name-as-CCS feature-name))
+       ((string-match "^\\(->\\)" name)
+	(www-format-feature-name-as-rel-to feature-name))
+       ((string-match "^\\(<-\\)" name)
+	(www-format-feature-name-as-rel-from feature-name))
+       (t
+	(www-format-feature-name-default feature-name)
+	))
+      ))))
 
 (defun www-format-feature-name (feature-name &optional lang)
   (www-format-encode-string
    (www-format-feature-name* feature-name lang)))
 
 
-;;; @ Feature value presentation
+;;; @ HTML generator
 ;;;
 
-(defun www-format-value-as-kuten (value)
-  (format "%02d-%02d"
-	  (- (lsh value -8) 32)
-	  (- (logand value 255) 32)))
-
-(defun www-format-value-default (value &optional without-tags)
-  (if (listp value)
-      (mapconcat
-       (lambda (unit)
-	 (www-format-encode-string
-	  (format "%S" unit)
-	  without-tags))
-       value " ")
-    (www-format-encode-string (format "%S" value) without-tags)))
-  
-(defun www-format-value-as-char-list (value &optional without-tags)
-  (if (listp value)
-      (mapconcat
-       (if without-tags
-	   (lambda (unit)
-	     (www-format-encode-string
-	      (format (if (characterp unit)
-			  "%c"
-			"%s")
-		      unit)
-	      'without-tags))
-	 (lambda (unit)
-	   (if (characterp unit)
-	       (format "<a href=\"%s?char=%s\">%s</a>"
-		       chise-wiki-view-url
-		       (www-uri-encode-char unit)
-		       (www-format-encode-string (char-to-string unit)))
-	     (www-format-encode-string (format "%s" unit)))))
-       value " ")
-    (www-format-encode-string (format "%s" value) without-tags)))
-
-(defun www-format-value-as-ids (value &optional without-tags)
-  (if (listp value)
-      (mapconcat
-       (if without-tags
-	   (lambda (unit)
-	     (www-format-encode-string
-	      (format (if (characterp unit)
-			  "%c"
-			"%s")
-		      unit)
-	      'without-tags))
-	 (lambda (unit)
-	   (if (characterp unit)
-	       (format "<a href=\"%s?char=%s\">%s</a>"
-		       chise-wiki-view-url
-		       (www-uri-encode-char unit)
-		       (www-format-encode-string (char-to-string unit)))
-	     (www-format-encode-string (format "%s" unit)))))
-       (ideographic-structure-to-ids value) " ")
-    (www-format-encode-string (format "%s" value) without-tags)))
-
-(defun www-format-value-as-S-exp (value &optional without-tags)
-  (www-format-encode-string (format "%S" value) without-tags))
-
-(defun www-format-value-as-HEX (value)
-  (if (integerp value)
-      (format "%X" value)
-    (www-format-value-as-S-exp value)))
-
-(defun www-format-value-as-CCS-default (value)
-  (if (integerp value)
-      (format "0x%s (%d)"
-	      (www-format-value-as-HEX value)
-	      value)
-    (www-format-value-as-S-exp value)))
-
-(defun www-format-value-as-CCS-94x94 (value)
-  (if (integerp value)
-      (format "0x%s [%s] (%d)"
-	      (www-format-value-as-HEX value)
-	      (www-format-value-as-kuten value)
-	      value)
-    (www-format-value-as-S-exp value)))
-
-(defun www-format-value (object feature-name
-				&optional value format without-tags)
-  (unless value
-    (setq value (www-char-feature object feature-name)))
-  (www-format-apply-value object feature-name
-			  format nil value nil nil without-tags)
-  )
-
-
-;;; @ format evaluator
-;;;
+(defvar www-format-char-img-style "vertical-align:bottom;")
 
-(defun www-format-encode-string (string &optional without-tags)
+(defun www-format-encode-string (string &optional without-tags as-body)
   (with-temp-buffer
     (insert string)
-    (let (plane code start end char variants ret)
+    (let (plane code start end char variants ret rret)
+      (when as-body
+	(goto-char (point-min))
+	(while (search-forward "&" nil t)
+	  (replace-match "&amp;" nil t)))
       (goto-char (point-min))
       (while (search-forward "<" nil t)
 	(replace-match "&lt;" nil t))
@@ -440,6 +597,7 @@
 		'(=jis-x0208@1997	"J97-" 4 X)
 		'(=jis-x0208@1978	"J78-" 4 X)
 		'(=jis-x0208@1983	"J83-" 4 X)
+		'(=ruimoku-v6		"RUI6-" 4 X)
 		'(=zinbun-oracle	"ZOB-" 4 d)
 		'(=jef-china3		"JC3-" 4 X)
 		'(=daikanwa		"M-" 5 d)
@@ -450,10 +608,12 @@
 	  (while (re-search-forward "&CB\\([0-9]+\\);" nil t)
 	    (setq code (string-to-int (match-string 1)))
 	    (replace-match
-	     (format "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\">"
+	     (format "<img alt=\"CB%05d\" src=\"%s/cb-gaiji/%02d/CB%05d.gif\"
+style=\"%s\">"
 		     code
 		     chise-wiki-bitmap-glyphs-url
-		     (/ code 1000) code)
+		     (/ code 1000) code
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
@@ -461,12 +621,14 @@
 	    (setq plane (match-string 1)
 		  code (string-to-int (match-string 2) 16))
 	    (replace-match
-	     (format "<img alt=\"J%s-%04X\" src=\"%s/JIS-%s/%02d-%02d.gif\">"
+	     (format "<img alt=\"J%s-%04X\" src=\"%s/JIS-%s/%02d-%02d.gif\"
+style=\"%s\">"
 		     plane code
 		     chise-wiki-bitmap-glyphs-url
 		     plane
 		     (- (lsh code -8) 32)
-		     (- (logand code 255) 32))
+		     (- (logand code 255) 32)
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
@@ -474,12 +636,14 @@
 	    (setq plane (string-to-int (match-string 1))
 		  code (string-to-int (match-string 2) 16))
 	    (replace-match
-	     (format "<img alt=\"GB%d-%04X\" src=\"%s/GB%d/%02d-%02d.gif\">"
+	     (format "<img alt=\"GB%d-%04X\" src=\"%s/GB%d/%02d-%02d.gif\"
+style=\"%s\">"
 		     plane code
 		     chise-wiki-bitmap-glyphs-url
 		     plane
 		     (- (lsh code -8) 32)
-		     (- (logand code 255) 32))
+		     (- (logand code 255) 32)
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
@@ -487,10 +651,12 @@
 	    (setq plane (string-to-int (match-string 1))
 		  code (string-to-int (match-string 2) 16))
 	    (replace-match
-	     (format "<img alt=\"CNS%d-%04X\" src=\"%s/CNS%d/%04X.gif\">"
+	     (format "<img alt=\"CNS%d-%04X\" src=\"%s/CNS%d/%04X.gif\"
+style=\"%s\">"
 		     plane code
 		     chise-wiki-bitmap-glyphs-url
-		     plane code)
+		     plane code
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
@@ -502,62 +668,86 @@
 	     t 'literal))
 
 	  (goto-char (point-min))
-	  (while (re-search-forward "&ZOB-\\([0-9]+\\);" nil t)
-	    (setq code (string-to-int (match-string 1)))
+	  (while (re-search-forward "&\\(A-\\)?ZOB-\\([0-9]+\\);" nil t)
+	    (setq code (string-to-int (match-string 2)))
 	    (replace-match
-	     (format "<img alt=\"ZOB-%04d\" src=\"%s/ZOB-1968/%04d.png\">"
+	     (format "<img alt=\"ZOB-%04d\" src=\"%s/ZOB-1968/%04d.png\"
+style=\"vertical-align:middle\">"
 		     code
 		     chise-wiki-bitmap-glyphs-url
-		     code)
+		     code
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
 	  (while (re-search-forward "&\\(G-\\)?GT-\\([0-9]+\\);" nil t)
 	    (setq code (string-to-int (match-string 2)))
 	    (replace-match
-	     (format "<img alt=\"GT-%05d\" src=\"%s?char=GT-%05d\">"
+	     (format "<img alt=\"GT-%05d\" src=\"%s?char=GT-%05d\"
+style=\"%s\">"
 		     code
 		     chise-wiki-glyph-cgi-url
-		     code)
+		     code
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
 	  (while (re-search-forward "&\\(G-\\)?GT-K\\([0-9]+\\);" nil t)
 	    (setq code (string-to-int (match-string 2)))
 	    (replace-match
-	     (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\">"
+	     (format "<img alt=\"GT-K%05d\" src=\"%s?char=GT-K%05d\"
+style=\"%s\">"
 		     code
 		     chise-wiki-glyph-cgi-url
-		     code)
+		     code
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
 	  (while (re-search-forward "&B-\\([0-9A-F]+\\);" nil t)
 	    (setq code (string-to-int (match-string 1) 16))
 	    (replace-match
-	     (format "<img alt=\"B-%04X\" src=\"%s?char=B-%04X\">"
+	     (format "<img alt=\"B-%04X\" src=\"%s?char=B-%04X\"
+style=\"%s\">"
 		     code
 		     chise-wiki-glyph-cgi-url
-		     code)
+		     code
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
 	  (while (re-search-forward "&CDP-\\([0-9A-F]+\\);" nil t)
 	    (setq code (string-to-int (match-string 1) 16))
 	    (replace-match
-	     (format "<img alt=\"CDP-%04X\" src=\"%s?char=CDP-%04X\">"
+	     (format "<img alt=\"CDP-%04X\" src=\"%s?char=CDP-%04X\"
+style=\"%s\">"
+		     code
+		     chise-wiki-glyph-cgi-url
+		     code
+		     www-format-char-img-style)
+	     t 'literal))
+
+	  (goto-char (point-min))
+	  (while (re-search-forward "&RUI6-\\([0-9A-F]+\\);" nil t)
+	    (setq code (string-to-int (match-string 1) 16))
+	    (replace-match
+	     (format "<img alt=\"RUI6-%04X\" src=\"%s?char=RUI6-%04X\"
+style=\"vertical-align:middle\">"
 		     code
 		     chise-wiki-glyph-cgi-url
-		     code)
+		     code
+		     www-format-char-img-style)
 	     t 'literal))
-	  
+
 	  (goto-char (point-min))
 	  (while (re-search-forward "&\\(UU\\+\\|U-\\)\\([0-9A-F]+\\);" nil t)
 	    (setq code (string-to-int (match-string 2) 16))
 	    (replace-match
-	     (format "<img alt=\"UU+%04X\" src=\"http://www.unicode.org/cgi-bin/refglyph?24-%04X\">"
+	     (format "<img alt=\"UU+%04X\" src=\"http://www.unicode.org/cgi-bin/refglyph?24-%04X\"
+style=\"vertical-align:middle\">"
+		     code
 		     code
-		     code)
+		     www-format-char-img-style)
 	     t 'literal))
 
 	  (goto-char (point-min))
@@ -566,236 +756,47 @@
 	    (setq start (match-beginning 0)
 		  end (match-end 0))
 	    (setq char (decode-char 'system-char-id code))
-	    (setq variants (or (www-char-feature char '->subsumptive)
-			       (www-char-feature char '->denotational)))
-	    (while (and variants
-			(setq ret (www-format-encode-string
-				   (char-to-string (car variants))))
-			(string-match "&MCS-\\([0-9A-F]+\\);" ret))
-	      (setq variants (cdr variants)))
-	    (unless (string-match "&MCS-\\([0-9A-F]+\\);" ret)
-	      (goto-char start)
-	      (delete-region start end)
-	      (insert ret)))
+	    (cond
+	     ((and (setq variants
+			 (or (www-get-feature-value char '->subsumptive)
+			     (www-get-feature-value char '->denotational)))
+		   (progn
+		     (while (and variants
+				 (setq ret (www-format-encode-string
+					    (char-to-string (car variants))))
+				 (string-match "&MCS-\\([0-9A-F]+\\);" ret))
+		       (setq variants (cdr variants)))
+		     ret))
+	      (unless (string-match "&MCS-\\([0-9A-F]+\\);" ret)
+		(goto-char start)
+		(delete-region start end)
+		(insert ret))
+	      )
+	     ((setq ret (or (www-get-feature-value char 'ideographic-combination)
+			    (www-get-feature-value char 'ideographic-structure)))
+	      (setq ret
+		    (mapconcat
+		     (lambda (ch)
+		       (if (listp ch)
+			   (if (characterp (setq rret (find-char ch)))
+			       (setq ch rret)))
+		       (if (characterp ch)
+			   (www-format-encode-string
+			    (char-to-string ch) without-tags)
+			 (www-format-encode-string
+			  (format "%S" ch) without-tags)))
+		     ret ""))
+	      (when ret
+		(goto-char start)
+		(delete-region start end)
+		(insert ret))
+	      )))
 	  ))
       ;; (goto-char (point-min))
       ;; (while (search-forward "&GT-" nil t)
       ;;   (replace-match "&amp;GT-" t 'literal))
       (buffer-string))))
 
-(defun www-format-props-to-string (props &optional format)
-  (unless format
-    (setq format (plist-get props :format)))
-  (concat "%"
-	  (plist-get props :flag)
-	  (if (plist-get props :zero-padding)
-	      "0")
-	  (if (plist-get props :len)
-	      (format "%d" (plist-get props :len)))
-	  (cond
-	   ((eq format 'decimal) "d")
-	   ((eq format 'hex) "x")
-	   ((eq format 'HEX) "X")
-	   ((eq format 'S-exp) "S")
-	   (t "s"))))	   
-
-(defun www-format-apply-value (object feature-name
-				      format props value
-				      &optional uri-char uri-feature
-				      without-tags)
-  (let (ret)
-    (setq ret
-	  (cond
-	   ((memq format '(decimal hex HEX))
-	    (if (integerp value)
-		(format (www-format-props-to-string props format)
-			value)
-	      (www-format-encode-string
-	       (format "%s" value)
-	       without-tags))
-	    )
-	   ((eq format 'wiki-text)
-	    (if without-tags
-		(www-xml-format-list value)
-	      (www-format-eval-list value object feature-name nil uri-char))
-	    )
-	   ((eq format 'S-exp)
-	    (www-format-encode-string
-	     (format (www-format-props-to-string props format)
-		     value)
-	     without-tags))
-	   ((eq format 'ku-ten)
-	    (www-format-value-as-kuten value))
-	   ((eq format 'space-separated-char-list)
-	    (www-format-value-as-char-list value without-tags))
-	   ((eq format 'space-separated-ids)
-	    (www-format-value-as-ids value without-tags))
-	   ((eq format 'string)
-	    (www-format-encode-string (format "%s" value) without-tags)
-	    )
-	   (t
-	    (www-format-value-default value without-tags)
-            ))
-	  )
-    (if (or without-tags (eq (plist-get props :mode) 'peek))
-	ret
-      (format "%s <a href=\"%s?char=%s&feature=%s&format=%s\"
-><input type=\"submit\" value=\"edit\" /></a>"
-	      ret
-	      chise-wiki-edit-url
-	      uri-char uri-feature format))))
-
-(defun www-format-eval-feature-value (char
-				      feature-name
-				      &optional format lang uri-char value)
-  (unless value
-    (setq value (www-char-feature char feature-name)))
-  (unless format
-    (setq format (www-feature-value-format feature-name)))
-  (cond
-   ((symbolp format)
-    (www-format-apply-value
-     char feature-name
-     format nil value
-     uri-char (www-uri-encode-feature-name feature-name))
-    )
-   ((consp format)
-    (cond ((null (cdr format))
-	   (setq format (car format))
-	   (www-format-apply-value
-	    char feature-name
-	    (car format) (nth 1 format) value
-	    uri-char (www-uri-encode-feature-name feature-name))
-	   )
-	  (t
-	   (www-format-eval-list format char feature-name lang uri-char)
-	   )))))
-
-(defun www-format-eval-unit (exp char feature-name
-				 &optional lang uri-char value)
-  (unless value
-    (setq value (www-char-feature char feature-name)))
-  (unless uri-char
-    (setq uri-char (www-uri-encode-char char)))
-  (cond
-   ((stringp exp) (www-format-encode-string exp))
-   ((null exp) "")
-   ((consp exp)
-    (cond
-     ((memq (car exp) '(value decimal hex HEX ku-ten S-exp default))
-      (if (eq (car exp) 'value)
-	  (www-format-eval-feature-value char feature-name
-					 (plist-get (nth 1 exp) :format)
-					 lang uri-char value)
-	(www-format-apply-value
-	 char feature-name
-	 (car exp) (nth 1 exp) value
-	 uri-char (www-uri-encode-feature-name feature-name)))
-      )
-     ((eq (car exp) 'name)
-      (format "<a href=\"%s?feature=%s&char=%s\">%s</a>"
-	      chise-wiki-view-url
-	      (www-uri-encode-feature-name feature-name)
-	      uri-char
-	      (www-format-feature-name feature-name lang))
-      )
-     ((eq (car exp) 'link)
-      (format "<a
- href=\"%s\"
->%s</a
->"
-	      (www-format-eval-list (plist-get (nth 1 exp) :ref)
-				    char feature-name lang uri-char)
-	      (www-format-eval-list (nthcdr 2 exp)
-				    char feature-name lang uri-char)))
-     (t
-      (format "<%s
->%s</%s
->"
-	      (car exp)
-	      (www-format-eval-list (nthcdr 2 exp) char feature-name
-				    lang uri-char)
-	      (car exp)))))))
-
-(defun www-format-eval-list (format-list char feature-name
-					 &optional lang uri-char)
-  (if (consp format-list)
-      (mapconcat
-       (lambda (exp)
-	 (www-format-eval-unit exp char feature-name lang uri-char))
-       format-list "")
-    (www-format-eval-unit format-list char feature-name lang uri-char)))
-
-
-;;; @ XML generator
-;;;
-
-(defun www-xml-format-props (props)
-  (let ((dest "")
-	key val)
-    (while props
-      (setq key (pop props)
-	    val (pop props))
-      (if (symbolp key)
-	  (setq key (symbol-name key)))
-      (if (eq (aref key 0) ?:)
-	  (setq key (substring key 1)))
-      (setq dest
-	    (format "%s %s=\"%s\""
-		    dest key
-		    (www-format-encode-string
-		     (format "%s" val) 'without-tags))))
-    dest))
-
-(defun www-xml-format-unit (format-unit)
-  (let (name props children ret)
-    (cond
-     ((stringp format-unit)
-      (mapconcat (lambda (c)
-		   (cond
-		    ((eq c ?&) "&amp;")
-                    ;; ((eq c ?<) "&amp;lt;")
-                    ;; ((eq c ?>) "&amp;gt;")
-		    (t
-		     (char-to-string c))))
-		 (www-format-encode-string format-unit 'without-tags)
-		 "")
-      )
-     ((consp format-unit)
-      (setq name (car format-unit)
-	    props (nth 1 format-unit)
-	    children (nthcdr 2 format-unit))
-      (when (eq name 'link)
-	(setq ret (plist-get props :ref))
-	(unless (stringp ret)
-	  (setq props (plist-remprop (copy-list props) :ref))
-	  (setq children
-		(cons (list* 'ref nil ret)
-		      children))))
-      (if children
-	  (format "<%s%s>%s</%s>"
-		  name
-		  (if props
-		      (www-xml-format-props props)
-		    "")
-		  (www-xml-format-list children)
-		  name)
-	(format "<%s%s/>"
-		name (www-xml-format-props props)))
-      )
-     (t
-      (format "%s" format-unit)))))
-
-(defun www-xml-format-list (format-list)
-  (if (atom format-list)
-      (www-xml-format-unit format-list)
-    (mapconcat #'www-xml-format-unit
-	       format-list "")))
-
-
-;;; @ HTML generator
-;;;
-
 (defun www-html-display-text (text)
   (princ
    (with-temp-buffer
@@ -824,4 +825,92 @@
   (www-html-display-text text)
   (princ "</p>\n"))
 
+
+;;; @ for GlyphWiki
+;;;
+
+(defvar coded-charset-GlyphWiki-id-alist
+  '((=ucs		"u"	4 x nil)
+    (=ucs@JP		"u"	4 x nil)
+    (=ucs@jis		"u"	4 x nil)
+    (=ucs@gb		"u"	4 x "-g")
+    (=ucs@cns		"u"	4 x "-t")
+    (=ucs@ks		"u"	4 x "-k")
+    (=ucs@iso		"u"	4 x "-u")
+    (=ucs@unicode	"u"	4 x "-us")
+    (=adobe-japan1-6	"aj1-"	5 d nil)
+    (=gt		"gt-"	5 d nil)
+    (=big5-cdp		"cdp-"	4 x nil)
+    (=cbeta		"cb"	5 d nil)
+    (=jis-x0208@1978/1pr "j78-"	4 x nil)
+    (=jis-x0208@1978/-4pr "j78-" 4 x nil)
+    (=jis-x0208@1978	"j78-"	4 x nil)
+    (=jis-x0208@1983	"j83-"	4 x nil)
+    (=jis-x0208@1990	"j90-"	4 x nil)
+    (=jis-x0212		"jsp-"	4 x nil)
+    (=jis-x0213-1@2000	"jx1-2000-" 4 x nil)
+    (=jis-x0213-1@2004	"jx1-2004-" 4 x nil)
+    (=jis-x0213-2	"jx2-"	4 x nil)
+    (=cns11643-1	"c1-"	4 x nil)
+    (=cns11643-2	"c2-"	4 x nil)
+    (=cns11643-3	"c3-"	4 x nil)
+    (=cns11643-4	"c4-"	4 x nil)
+    (=cns11643-5	"c5-"	4 x nil)
+    (=cns11643-6	"c6-"	4 x nil)
+    (=cns11643-7	"c7-"	4 x nil)
+    (=daikanwa		"dkw-"	5 d nil)
+    (=gt-k		"gt-k"	5 d nil)
+    (=jef-china3	"jc3-"	4 x nil)
+    (=big5		"b-"	4 x nil)
+    (=ks-x1001		"k0-"	4 x nil)
+    ))
+
+(defun char-GlyphWiki-id (char)
+  (let ((rest coded-charset-GlyphWiki-id-alist)
+	spec ret code)
+    (while (and rest
+		(setq spec (pop rest))
+		(null (setq ret (char-feature char (car spec))))))
+    (when ret
+      (or
+       (and (memq (car spec) '(=ucs@unicode '=ucs@iso))
+	    (cond
+	     ((and (or (encode-char char '=jis-x0208@1990)
+		       (encode-char char '=jis-x0212)
+		       (encode-char char '=jis-x0213-1))
+		   (setq code (encode-char char '=ucs@jis)))
+	      (format "u%04x" code)
+	      )
+	     ((and (or (encode-char char '=gb2312)
+		       (encode-char char '=gb12345))
+		   (setq code (encode-char char '=ucs@gb)))
+	      (format "u%04x-g" code)
+	      )
+	     ((and (or (encode-char char '=cns11643-1)
+		       (encode-char char '=cns11643-2)
+		       (encode-char char '=cns11643-3)
+		       (encode-char char '=cns11643-4)
+		       (encode-char char '=cns11643-5)
+		       (encode-char char '=cns11643-6)
+		       (encode-char char '=cns11643-7))
+		   (setq code (encode-char char '=ucs@cns)))
+	      (format "u%04x-t" code)
+	      )
+	     ((and (encode-char char '=ks-x1001)
+		   (setq code (encode-char char '=ucs@ks)))
+	      (format "u%04x-k" code)
+	      )))
+       (format (format "%s%%0%d%s%s"
+		       (nth 1 spec)
+		       (nth 2 spec)
+		       (nth 3 spec)
+		       (or (nth 4 spec) ""))
+	       ret)))))
+
+
+;;; @ End.
+;;;
+
 (provide 'cwiki-common)
+
+;;; cwiki-common.el ends here