From: MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
Date: Fri, 19 Mar 2010 04:04:29 +0000 (+0900)
Subject: (www-xml-to-stext-unit): Support <link><ref>...</ref>...</link>.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca0ee468bb1a3c2c6973188deb61517bd79c7822;p=chise%2Fest.git

(www-xml-to-stext-unit): Support <link><ref>...</ref>...</link>.
---

diff --git a/cwiki-set.el b/cwiki-set.el
index 2b552c3..1337b15 100644
--- a/cwiki-set.el
+++ b/cwiki-set.el
@@ -37,16 +37,20 @@
       (setq name (car unit))
       (if (stringp name)
 	  nil
-	(setq props (nth 1 unit)
+	(setq props (www-xml-to-stext-props (nth 1 unit))
 	      children (nthcdr 2 unit))
 	(if children
 	    (setq children (www-xml-to-stext-list children)))
+	(when (and (eq name 'link)
+		   (consp (car children))
+		   (eq (caar children) 'ref))
+	  (setq props (list* :ref (nthcdr 2 (car children))
+			     props)
+		children (cdr children)))
 	(if children
-	    (list* name
-		   (www-xml-to-stext-props props)
-		   children)
+	    (list* name props children)
 	  (if props
-	      (list name (www-xml-to-stext-props props))
+	      (list name props)
 	    (list name))))
       )
      (t