From dlichteblau at common-lisp.net Fri May 5 09:05:22 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Fri, 5 May 2006 05:05:22 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml
Message-ID: <20060505090522.4FD4F23005@common-lisp.net>
Update of /project/cxml/cvsroot/cxml
In directory clnet:/tmp/cvs-serv8224
Modified Files:
README.html
Log Message:
fixed CDATA serialization, thanks to Donavon Keithley
--- /project/cxml/cvsroot/cxml/README.html 2006/01/23 21:54:44 1.21
+++ /project/cxml/cvsroot/cxml/README.html 2006/05/05 09:05:22 1.22
@@ -109,7 +109,7 @@
Recent Changes
rel-2006-xx-yy
- - Serialization fixes (thanks to Nathan Bird).
+ - Serialization fixes (thanks to Nathan Bird, Donavon Keithley).
rel-2006-01-05
From dlichteblau at common-lisp.net Fri May 5 09:05:22 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Fri, 5 May 2006 05:05:22 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060505090522.ABF7C24002@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv8224/xml
Modified Files:
unparse.lisp
Log Message:
fixed CDATA serialization, thanks to Donavon Keithley
--- /project/cxml/cvsroot/cxml/xml/unparse.lisp 2006/02/17 12:53:19 1.9
+++ /project/cxml/cvsroot/cxml/xml/unparse.lisp 2006/05/05 09:05:22 1.10
@@ -545,6 +545,7 @@
value)
(defun cdata (data)
+ (maybe-emit-start-tag)
(sax:start-cdata *sink*)
(sax:characters *sink* (rod data))
(sax:end-cdata *sink*)
From dlichteblau at common-lisp.net Mon May 15 21:57:47 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Mon, 15 May 2006 17:57:47 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060515215747.94DB0650D9@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv22880
Modified Files:
xmls-compat.lisp
Log Message:
fixed cxml-xmls:map-node, thanks to Kim Minh Kaplan for the report
--- /project/cxml/cvsroot/cxml/xml/xmls-compat.lisp 2005/11/28 22:33:47 1.2
+++ /project/cxml/cvsroot/cxml/xml/xmls-compat.lisp 2006/05/15 21:57:47 1.3
@@ -7,7 +7,7 @@
;;;; Copyright: David Lichteblau
;;;; XXX Der namespace-Support in xmls kommt mir zweifelhaft vor.
-;;;; Wir immitieren das soweit es gebraucht wurde bisher.
+;;;; Wir imitieren das soweit es gebraucht wurde bisher.
(defpackage cxml-xmls
(:use :cl :runes)
@@ -135,9 +135,12 @@
(let* ((attlist
(compute-attributes node include-xmlns-attributes))
(lname (rod (node-name node)))
- (ns (rod (node-ns node)))
- (qname (concatenate 'rod ns (rod ":") lname)))
- ;; fixme: namespaces
+ (qname (if (node-ns node)
+ (concatenate 'rod
+ (rod (node-ns node))
+ (rod ":")
+ lname)
+ lname)))
(sax:start-element handler nil lname qname attlist)
(dolist (child (node-children node))
(typecase child
From dlichteblau at common-lisp.net Thu May 18 10:08:36 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Thu, 18 May 2006 06:08:36 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060518100836.AA84B5834B@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv27988
Modified Files:
xml-parse.lisp
Log Message:
set up a stream name in parse-rod for circularity detection
(thanks to Donavon Keithley for the report)
--- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/03/20 12:42:26 1.60
+++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/05/18 10:08:36 1.61
@@ -3027,7 +3027,13 @@
(dtd *ctx*)))))
(defun parse-rod (string handler &rest args)
- (apply #'parse-xstream (string->xstream string) handler args))
+ (let ((xstream (string->xstream string)))
+ (setf (xstream-name xstream)
+ (make-stream-name
+ :entity-name "main document"
+ :entity-kind :main
+ :uri nil))
+ (apply #'parse-xstream xstream handler args)))
(defun string->xstream (string)
(make-rod-xstream (string-rod string)))