X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=cwiki-common.el;h=195ec737e96ac9d996fa33774a2b9adfbd730de7;hb=a75ec9b1bede6a9f954970b70fd0a9ede0373a78;hp=ed37b7ccc6eac4db4a535a43527a61a1d846fb32;hpb=b090fe19f530acdffad16239a398f6ac18d65df7;p=chise%2Fest.git

diff --git a/cwiki-common.el b/cwiki-common.el
index ed37b7c..195ec73 100644
--- a/cwiki-common.el
+++ b/cwiki-common.el
@@ -1,8 +1,16 @@
 ;; -*- coding: utf-8-mcs-er -*-
 (require 'char-db-util)
 
+(setq file-name-coding-system 'utf-8-mcs-er)
+
+(concord-assign-genre 'creator "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'bibliography "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'era "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'period "/usr/local/var/ruimoku/db")
+(concord-assign-genre 'journal "/usr/local/var/ruimoku/db")
+
 (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")
@@ -10,6 +18,8 @@
 (defvar chise-wiki-glyph-cgi-url
   "http://chise.zinbun.kyoto-u.ac.jp/chisewiki/glyph.cgi")
 
+(defvar chise-wiki-displayed-features nil)
+
 (defun decode-uri-string (string &optional coding-system)
   (if (> (length string) 0)
       (let ((i 0)
@@ -47,8 +57,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 +91,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 +122,143 @@
 	(intern (substring feature-name 0 (match-beginning 0)))
       feature)))
 
-(defun www-char-feature (character feature)
+(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 (concord-object-get object latest-feature)
+	  (concord-object-get object feature))
+      ))))
+
+(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 +346,11 @@
     )
    (t feature-name)))
 
-(defun www-uri-decode-char (char-rep)
+(defun www-uri-make-feature-name-url (uri-feature-name uri-char)
+  (format "%s?feature=%s&char=%s"
+	  chise-wiki-view-url uri-feature-name uri-char))
+
+(defun www-uri-decode-object (genre char-rep)
   (let (ccs cpos)
     (cond
      ((string-match "\\(%3A\\|:\\)" char-rep)
@@ -185,16 +363,28 @@
 	      (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))
-      ))))
+      (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-char (char)
   (if (encode-char char '=ucs)
@@ -239,6 +429,11 @@
 		     (encode-char char 'system-char-id))
 	     )))))
 
+(defun est-format-object (object)
+  (if (characterp object)
+      (char-to-string object)
+    (format "%s" (concord-object-id object))))
+
 
 ;;; @ Feature name presentation
 ;;;
@@ -291,7 +486,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
@@ -299,17 +494,34 @@
 		(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
@@ -465,11 +677,13 @@
     (www-format-value-as-S-exp value)))
 
 (defun www-format-value (object feature-name
-				&optional value format without-tags)
+				&optional value format
+				without-tags without-edit)
   (unless value
-    (setq value (www-char-feature object feature-name)))
+    (setq value (www-get-feature-value object feature-name)))
   (www-format-apply-value object feature-name
-			  format nil value nil nil without-tags)
+			  format nil value nil nil
+			  without-tags without-edit)
   )
 
 
@@ -645,8 +859,8 @@
 	    (setq char (decode-char 'system-char-id code))
 	    (cond
 	     ((and (setq variants
-			 (or (www-char-feature char '->subsumptive)
-			     (www-char-feature char '->denotational)))
+			 (or (www-get-feature-value char '->subsumptive)
+			     (www-get-feature-value char '->denotational)))
 		   (progn
 		     (while (and variants
 				 (setq ret (www-format-encode-string
@@ -659,8 +873,8 @@
 		(delete-region start end)
 		(insert ret))
 	      )
-	     ((setq ret (or (www-char-feature char 'ideographic-combination)
-			    (www-char-feature char 'ideographic-structure)))
+	     ((setq ret (or (www-get-feature-value char 'ideographic-combination)
+			    (www-get-feature-value char 'ideographic-structure)))
 	      (setq ret
 		    (mapconcat
 		     (lambda (ch)
@@ -692,7 +906,11 @@
           ;; (if (plist-get props :zero-padding)
           ;;     "0")
 	  (if (plist-get props :len)
-	      (format "0%d" (plist-get props :len)))
+	      (format "0%d"
+		      (let ((ret (plist-get props :len)))
+			(if (stringp ret)
+			    (string-to-int ret)
+			  ret))))
 	  (cond
 	   ((eq format 'decimal) "d")
 	   ((eq format 'hex) "x")
@@ -702,8 +920,8 @@
 
 (defun www-format-apply-value (object feature-name
 				      format props value
-				      &optional uri-char uri-feature
-				      without-tags)
+				      &optional uri-object uri-feature
+				      without-tags without-edit)
   (let (ret)
     (setq ret
 	  (cond
@@ -718,7 +936,8 @@
 	   ((eq format 'wiki-text)
 	    (if without-tags
 		(www-xml-format-list value)
-	      (www-format-eval-list value object feature-name nil uri-char))
+	      (www-format-eval-list value object feature-name nil uri-object
+				    without-tags without-edit))
 	    )
 	   ((eq format 'S-exp)
 	    (www-format-encode-string
@@ -742,46 +961,53 @@
 	    (www-format-value-default value without-tags)
             ))
 	  )
-    (if (or without-tags (eq (plist-get props :mode) 'peek))
+    (if (or without-tags
+	    without-edit
+	    (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))))
+	      uri-object uri-feature format))))
 
-(defun www-format-eval-feature-value (char
+(defun www-format-eval-feature-value (object
 				      feature-name
-				      &optional format lang uri-char value)
+				      &optional format lang uri-object value
+				      without-tags without-edit)
   (unless value
-    (setq value (www-char-feature char feature-name)))
+    (setq value (www-get-feature-value object feature-name)))
   (unless format
     (setq format (www-feature-value-format feature-name)))
   (cond
    ((symbolp format)
     (www-format-apply-value
-     char feature-name
+     object feature-name
      format nil value
-     uri-char (www-uri-encode-feature-name feature-name))
+     uri-object (www-uri-encode-feature-name feature-name)
+     without-tags without-edit)
     )
    ((consp format)
     (cond ((null (cdr format))
 	   (setq format (car format))
 	   (www-format-apply-value
-	    char feature-name
+	    object feature-name
 	    (car format) (nth 1 format) value
-	    uri-char (www-uri-encode-feature-name feature-name))
+	    uri-object (www-uri-encode-feature-name feature-name)
+	    without-tags without-edit)
 	   )
 	  (t
-	   (www-format-eval-list format char feature-name lang uri-char)
+	   (www-format-eval-list format object feature-name lang uri-object
+				 without-tags without-edit)
 	   )))))
 
-(defun www-format-eval-unit (exp char feature-name
-				 &optional lang uri-char value)
+(defun www-format-eval-unit (exp object feature-name
+				 &optional lang uri-object value
+				 without-tags without-edit)
   (unless value
-    (setq value (www-char-feature char feature-name)))
-  (unless uri-char
-    (setq uri-char (www-uri-encode-char char)))
+    (setq value (www-get-feature-value object feature-name)))
+  (unless uri-object
+    (setq uri-object (www-uri-encode-char object)))
   (cond
    ((stringp exp) (www-format-encode-string exp))
    ((null exp) "")
@@ -789,48 +1015,133 @@
     (cond
      ((memq (car exp) '(value decimal hex HEX ku-ten kangxi-radical
 			      S-exp string default))
+      (let ((fn (plist-get (nth 1 exp) :feature))
+	    domain domain-fn ret)
+	(when fn
+	  (when (stringp fn)
+	    (setq fn (intern fn)))
+	  (setq domain (char-feature-name-domain feature-name))
+	  (setq domain-fn (char-feature-name-at-domain fn domain))
+	  (if (setq ret (www-get-feature-value object domain-fn))
+	      (setq feature-name domain-fn
+		    value ret)
+	    (setq feature-name fn
+		  value (www-get-feature-value object fn)))
+	  (push feature-name chise-wiki-displayed-features)
+          ))
       (if (eq (car exp) 'value)
-	  (www-format-eval-feature-value char feature-name
+	  (www-format-eval-feature-value object feature-name
 					 (plist-get (nth 1 exp) :format)
-					 lang uri-char value)
+					 lang uri-object value
+					 without-tags without-edit)
 	(www-format-apply-value
-	 char feature-name
+	 object feature-name
 	 (car exp) (nth 1 exp) value
-	 uri-char (www-uri-encode-feature-name feature-name)))
+	 uri-object (www-uri-encode-feature-name feature-name)
+	 without-tags without-edit))
       )
      ((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))
+      (let ((fn (plist-get (nth 1 exp) :feature))
+	    domain domain-fn)
+	(when fn
+	  (setq domain (char-feature-name-domain feature-name))
+	  (when (stringp fn)
+	    (setq fn (intern fn)))
+	  (setq domain-fn (char-feature-name-at-domain fn domain))
+	  (setq feature-name domain-fn)))
+      (if without-tags
+	  (www-format-feature-name feature-name lang)
+	(format "<a href=\"%s\">%s</a>"
+		(www-uri-make-feature-name-url
+		 (www-uri-encode-feature-name feature-name)
+		 uri-object)
+		(www-format-feature-name feature-name lang))
+        )
+      )
+     ((eq (car exp) 'name-url)
+      (let ((fn (plist-get (nth 1 exp) :feature))
+	    domain domain-fn)
+	(when fn
+	  (setq domain (char-feature-name-domain feature-name))
+	  (when (stringp fn)
+	    (setq fn (intern fn)))
+	  (setq domain-fn (char-feature-name-at-domain fn domain))
+	  (setq feature-name domain-fn)))
+      (www-uri-make-feature-name-url
+       (www-uri-encode-feature-name feature-name)
+       uri-object)
+      )
+     ((eq (car exp) 'domain-name)
+      (let ((domain (char-feature-name-domain feature-name)))
+	(if domain
+	    (format "@%s" domain))))
+     ((eq (car exp) 'prev-char)
+      (if without-tags
+	  ""
+	(let ((prev-char (find-previous-defined-code-point
+			  feature-name value)))
+	  (if prev-char
+	      (format "\n<a href=\"%s?char=%s\">%s</a>"
+		      chise-wiki-view-url
+		      (www-uri-encode-char prev-char)
+                      "<input type=\"submit\" value=\"-\" />"
+		      ;; (www-format-encode-string
+                      ;;  (char-to-string prev-char))
+		      )
+	    "")))
+      )
+     ((eq (car exp) 'next-char)
+      (if without-tags
+	  ""
+	(let ((next-char (find-next-defined-code-point
+			  feature-name value)))
+	  (if next-char
+	      (format "<a href=\"%s?char=%s\">%s</a>"
+		      chise-wiki-view-url
+		      (www-uri-encode-char next-char)
+                      "<input type=\"submit\" value=\"+\" />"
+		      ;; (www-format-encode-string
+                      ;;  (char-to-string next-char))
+		      )
+	    "")))
       )
      ((eq (car exp) 'link)
-      (format "<a
+      (if without-tags
+	  (www-format-eval-list (nthcdr 2 exp)
+				object feature-name lang uri-object
+				without-tags without-edit)
+	(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)))
+		(www-format-eval-list (plist-get (nth 1 exp) :ref)
+				      object feature-name lang uri-object
+				      'without-tags 'without-edit)
+		(www-format-eval-list (nthcdr 2 exp)
+				      object feature-name lang uri-object
+				      without-tags without-edit)))
+      )
      (t
       (format "<%s
 >%s</%s
 >"
 	      (car exp)
-	      (www-format-eval-list (nthcdr 2 exp) char feature-name
-				    lang uri-char)
+	      (www-format-eval-list (nthcdr 2 exp) object feature-name
+				    lang uri-object
+				    without-tags without-edit)
 	      (car exp)))))))
 
-(defun www-format-eval-list (format-list char feature-name
-					 &optional lang uri-char)
+(defun www-format-eval-list (format-list object feature-name
+					 &optional lang uri-object
+					 without-tags without-edit)
   (if (consp format-list)
       (mapconcat
        (lambda (exp)
-	 (www-format-eval-unit exp char feature-name lang uri-char))
+	 (www-format-eval-unit exp object feature-name lang uri-object
+			       nil without-tags without-edit))
        format-list "")
-    (www-format-eval-unit format-list char feature-name lang uri-char)))
+    (www-format-eval-unit format-list object feature-name lang uri-object
+			  nil without-tags without-edit)))
 
 
 ;;; @ XML generator