- cxml-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[cxml-cvs] CVS update: cxml/README.html
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv5367 Modified Files: README.html Log Message: sb-unicode backport namespace-korrekturen noch documentation Date: Tue Dec 27 21:01:11 2005 Author: dlichteblau Index: cxml/README.html diff -u cxml/README.html:1.13 cxml/README.html:1.14 --- cxml/README.html:1.13 Mon Dec 26 23:04:08 2005 +++ cxml/README.html Tue Dec 27 21:01:10 2005 @@ -66,6 +66,7 @@ <ul class="nomargin"> <li>Implemented DOM 2 Core.</li> <li>Error handling overhaul.</li> + <li>UTF-8 string support in DOM on Lisps without Unicode characters.</li> <li>Support internal subset serialization.</li> <li>Gilbert Baumann has clarified the license as Lisp-LGPL.</li> <li>Use trivial-gray-streams.</li>

1 0

[cxml-cvs] CVS update: cxml/doc/dom.html cxml/doc/installation.html cxml/doc/quickstart.html cxml/doc/using.html
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/doc In directory common-lisp.net:/tmp/cvs-serv5367/doc Modified Files: dom.html installation.html quickstart.html using.html Log Message: sb-unicode backport namespace-korrekturen noch documentation Date: Tue Dec 27 21:01:12 2005 Author: dlichteblau Index: cxml/doc/dom.html diff -u cxml/doc/dom.html:1.2 cxml/doc/dom.html:1.3 --- cxml/doc/dom.html:1.2 Tue Dec 27 02:35:13 2005 +++ cxml/doc/dom.html Tue Dec 27 21:01:12 2005 @@ -117,6 +117,15 @@ href="using.html#misc">namespace normalizer</a> is used. </li> </ul> + <p> + <tt>unparse-document-to-octets</tt> returns an <tt>(unsigned-byte + 8)</tt> array, whereas <tt>unparse-document</tt> writes + characters.  <tt>unparse-document</tt> is useful together + with <tt>with-output-to-string</tt>.  However, note that the + resulting document in both cases is UTF-8 encoded, so the + characters written by <tt>unparse-document</tt> are really UTF-8 + bytes encoded as characters. + </p> <a name="mapping"/> <h3>DOM/Lisp mapping</h3> Index: cxml/doc/installation.html diff -u cxml/doc/installation.html:1.5 cxml/doc/installation.html:1.6 --- cxml/doc/installation.html:1.5 Mon Dec 26 23:04:10 2005 +++ cxml/doc/installation.html Tue Dec 27 21:01:12 2005 @@ -14,35 +14,31 @@ <h2>Download</h2> <ul> <li> - <a href="http://common-lisp.net/project/cxml/download/">tarballs</a> + <div><a href="http://common-lisp.net/project/cxml/download/">tarballs</a></div> </li> - <li> + <li> + <div> Anoncvs (<a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/cxml/?cvsroot=cxml">browse</a>): <pre>$ export CVSROOT=:pserver:anonymous@common-lisp.net:/project/cxml/cvsroot $ cvs login Logging in to :pserver:anonymous@common-lisp.net:2401/project/cxml/cvsroot CVS password: anonymous $ cvs co cxml</pre> - </lii> + </div> + </li> </ul> <a name="implementations"/> <h2>Implementation-specific notes</h2> <p> CXML should be portable to all Common Lisp implementations - supporting gray streams. Currently supported are ACL, CLISP, - CMUCL, LispWorks, OpenMCL, and SBCL. + supported by <a + href="http://common-lisp.net/project/cl-plus-ssl/#trivial-gray-streams">trivial-gray-streams</a>. </p> <ul> <li> - Note that CMUCL and OpenMCL do not support Unicode - natively.  (You might want to use the <a - href="using.html#rods">recoding SAX handler</a> to work with - native strings anyway.) - </li> - <li> SBCL and CLISP will trip over cxml's non-ASCII source files - unless compiled using a suitable locale configuration + unless run using a suitable locale configuration (<tt>LC_CTYPE=en_US.ISO-8859-1</tt> should help). </li> <li> @@ -51,19 +47,6 @@ </li> </ul> - - <a name="compilation"/> <h2>Compilation</h2> <p> @@ -117,9 +100,9 @@ </p> <p> - <b>fixme</b> My parser does not understand the current testsuite - anymore.  To fix this problem, revert the affected files - manually after check-out: + <b>fixme</b> domtest.lisp does not understand the current + testsuite driver anymore.  To fix this problem, revert the + affected files manually after check-out: </p> <pre>$ cd 2001/XML-Test-Suite/xmlconf/ Index: cxml/doc/quickstart.html diff -u cxml/doc/quickstart.html:1.2 cxml/doc/quickstart.html:1.3 --- cxml/doc/quickstart.html:1.2 Tue Dec 27 02:35:13 2005 +++ cxml/doc/quickstart.html Tue Dec 27 21:01:12 2005 @@ -16,7 +16,7 @@ <ul class="sub"> <li><a href="installation.html#download"><b>Download</b></a></li> <li><a href="installation.html#implementations">Implementation-specific notes</a></li> - <li><a href="installation.html#compilation"><b>Compilation</b></a></li> + <li><a href="installation.html#compilation">Compilation</a></li> <li><a href="installation.html#tests">Tests</a></li> </ul> </li> Index: cxml/doc/using.html diff -u cxml/doc/using.html:1.8 cxml/doc/using.html:1.9 --- cxml/doc/using.html:1.8 Tue Dec 27 02:35:13 2005 +++ cxml/doc/using.html Tue Dec 27 21:01:12 2005 @@ -138,9 +138,10 @@ </p> <p> - <div class="def">Function CXML:MAKE-CHARACTER-STREAM-SINK (stream &rest keys) => sink</div> + <div class="def">Function CXML:MAKE-OCTET-STREAM-SINK (stream &rest keys) => sink</div> <div class="def">Function CXML:MAKE-OCTET-VECTOR-SINK (&rest keys) => sink</div> - Return a handle suitable for event-based XML serialization. + <div class="def">Function CXML:MAKE-CHARACTER-STREAM-SINK (stream &rest keys) => sink</div> + Return a SAX serialization handle. </p> <p>Keyword arguments:</p> <ul> @@ -175,26 +176,6 @@ changes the document model and should only be used if whitespace does not matter to the application. </p> - <p> - If namespace support is enabled (the default), these functions use - a namespace normalizer (<tt>cxml:make-namespace-normalizer</tt>). - </p> - <p> - <tt>unparse-document-to-octets</tt> returns an <tt>(unsigned-byte - 8)</tt> array, whereas <tt>unparse-document</tt> writes - characters.  <tt>unparse-document</tt> is useful together - with <tt>with-output-to-string</tt>.  However, note that the - resulting document in both cases is UTF-8 encoded, so the - characters written by <tt>unparse-document</tt> are really UTF-8 - bytes encoded as characters. - </p> - <p> - These function provide the low-level mechanism used by the DOM - serialization functions. To serialize a document without building - its DOM tree first, create a sink handle and call SAX functions on that - handle. <tt>sax:end-document</tt> returns the serialized form of - the document described by the SAX events. - </p> <p> <div class="def">Macro CXML:WITH-XML-OUTPUT (sink &body body) => sink-specific result</div> @@ -214,17 +195,12 @@ (attribute "blub" "bla")) (text "Hi there.")))</pre> <p> - Prints this to <tt>stream</tt>, which must be an - <tt>(unsigned-byte 8)</tt> stream: + Prints this to <tt>stream</tt>: </p> <pre><foo xyz="abc"> <bar blub="bla"></bar> Hi there. </foo></pre> - <p> - (Note that these functions accept both strings and rods, so we - can write <tt>"foo"</tt> instead of <tt>#"foo"</tt> above.) - </p> <p> <div class="def">Macro XHTML-GENERATOR:WITH-XHTML (sink &rest forms)</div>

1 0

[cxml-cvs] CVS update: cxml/runes/characters.lisp cxml/runes/utf8.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv5367/runes Modified Files: characters.lisp utf8.lisp Log Message: sb-unicode backport namespace-korrekturen noch documentation Date: Tue Dec 27 21:01:16 2005 Author: dlichteblau Index: cxml/runes/characters.lisp diff -u cxml/runes/characters.lisp:1.4 cxml/runes/characters.lisp:1.5 --- cxml/runes/characters.lisp:1.4 Mon Nov 28 23:33:35 2005 +++ cxml/runes/characters.lisp Tue Dec 27 21:01:16 2005 @@ -95,7 +95,9 @@ (stringp x)) (defun rod= (x y) - (string= x y)) + (if (zerop (length x)) + (zerop (length y)) + (and (plusp (length y)) (string= x y)))) (defun rod-equal (x y) (string-equal x y)) Index: cxml/runes/utf8.lisp diff -u cxml/runes/utf8.lisp:1.1 cxml/runes/utf8.lisp:1.2 --- cxml/runes/utf8.lisp:1.1 Tue Dec 27 01:21:36 2005 +++ cxml/runes/utf8.lisp Tue Dec 27 21:01:16 2005 @@ -10,14 +10,6 @@ (deftype rod () '(vector rune)) (deftype simple-rod () '(simple-array rune)) -#+(or) -(definline rune (rod index) - (char rod index)) - -#+(or) -(defun (setf rune) (newval rod index) - (setf (char rod index) newval)) - (defun rod= (r s) (string= r s))

1 0

[cxml-cvs] CVS update: cxml/dom/dom-sax.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/dom In directory common-lisp.net:/tmp/cvs-serv5367/dom Modified Files: dom-sax.lisp Log Message: sb-unicode backport namespace-korrekturen noch documentation Date: Tue Dec 27 21:01:15 2005 Author: dlichteblau Index: cxml/dom/dom-sax.lisp diff -u cxml/dom/dom-sax.lisp:1.5 cxml/dom/dom-sax.lisp:1.6 --- cxml/dom/dom-sax.lisp:1.5 Tue Dec 27 02:35:14 2005 +++ cxml/dom/dom-sax.lisp Tue Dec 27 21:01:13 2005 @@ -13,7 +13,8 @@ &key (include-xmlns-attributes sax:*include-xmlns-attributes*) include-doctype include-default-values - (recode (typep document 'utf8-dom::node))) + (recode (and #+rune-is-integer (typep document 'utf8-dom::node)))) + (declare (ignorable recode)) #+rune-is-integer (when recode (setf handler (make-recoder handler #'utf8-string-to-rod))) @@ -54,16 +55,16 @@ (dom:do-node-list (child (dom:child-nodes node)) (ecase (dom:node-type child) (:element - ;; fixme: namespaces (let ((attlist (compute-attributes child include-xmlns-attributes include-default-values)) - (lname (dom:tag-name child)) + (uri (dom:namespace-uri child)) + (lname (dom:local-name child)) (qname (dom:tag-name child))) - (sax:start-element handler nil lname qname attlist) + (sax:start-element handler uri lname qname attlist) (walk child) - (sax:end-element handler nil lname qname))) + (sax:end-element handler uri lname qname))) (:cdata-section (sax:start-cdata handler) (sax:characters handler (dom:data child)) @@ -83,10 +84,11 @@ (let ((results '())) (dom:do-node-list (a (dom:attributes element)) (when (and (or defaultp (dom:specified a)) - (or xmlnsp (not (cxml::xmlns-attr-p (dom:name a))))) + (or xmlnsp (not (cxml::xmlns-attr-p (rod (dom:name a)))))) (push (sax:make-attribute :qname (dom:name a) :value (dom:value a) + :namespace-uri (dom:namespace-uri a) :specified-p (dom:specified a)) results))) (reverse results)))

1 0

[cxml-cvs] CVS update: cxml/xml/package.lisp cxml/xml/recoder.lisp cxml/xml/xml-parse.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv17375/xml Modified Files: package.lisp recoder.lisp xml-parse.lisp Log Message: utf8-dom fixes. recoding nach utf-8 jetzt der default. Date: Tue Dec 27 02:35:22 2005 Author: dlichteblau Index: cxml/xml/package.lisp diff -u cxml/xml/package.lisp:1.7 cxml/xml/package.lisp:1.8 --- cxml/xml/package.lisp:1.7 Mon Dec 12 00:56:52 2005 +++ cxml/xml/package.lisp Tue Dec 27 02:35:18 2005 @@ -75,4 +75,6 @@ #:make-recoder #:sax-proxy #:proxy-chained-handler - #:make-namespace-normalizer)) + #:make-namespace-normalizer + #:rod-to-utf8-string + #:utf8-string-to-rod)) Index: cxml/xml/recoder.lisp diff -u cxml/xml/recoder.lisp:1.3 cxml/xml/recoder.lisp:1.4 --- cxml/xml/recoder.lisp:1.3 Tue Dec 27 01:21:38 2005 +++ cxml/xml/recoder.lisp Tue Dec 27 02:35:20 2005 @@ -74,6 +74,9 @@ (%string public-id) (%string system-id)) + (defwrapper sax:start-internal-subset ()) + (defwrapper sax:end-internal-subset ()) + (defwrapper sax:end-dtd ()) (defwrapper sax:unparsed-entity-declaration Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.54 cxml/xml/xml-parse.lisp:1.55 --- cxml/xml/xml-parse.lisp:1.54 Sat Dec 17 23:43:17 2005 +++ cxml/xml/xml-parse.lisp Tue Dec 27 02:35:20 2005 @@ -2552,13 +2552,18 @@ (defun p/document (input handler - &key validate dtd root entity-resolver disallow-internal-subset) + &key validate dtd root entity-resolver disallow-internal-subset + (recode t)) ;; check types of user-supplied arguments for better error messages: (check-type validate boolean) + (check-type recode boolean) (check-type dtd (or null extid)) (check-type root (or null rod)) (check-type entity-resolver (or null function symbol)) (check-type disallow-internal-subset boolean) + #+rune-is-integer + (when recode + (setf handler (make-recoder handler #'rod-to-utf8-string))) (let ((*ctx* (make-context :handler handler :main-zstream input

1 0

[cxml-cvs] CVS update: cxml/test/utf8domtest.diff cxml/test/domtest.lisp cxml/test/xmlconf.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/test In directory common-lisp.net:/tmp/cvs-serv17375/test Modified Files: domtest.lisp xmlconf.lisp Added Files: utf8domtest.diff Log Message: utf8-dom fixes. recoding nach utf-8 jetzt der default. Date: Tue Dec 27 02:35:16 2005 Author: dlichteblau Index: cxml/test/domtest.lisp diff -u cxml/test/domtest.lisp:1.13 cxml/test/domtest.lisp:1.14 --- cxml/test/domtest.lisp:1.13 Tue Dec 27 01:21:37 2005 +++ cxml/test/domtest.lisp Tue Dec 27 02:35:16 2005 @@ -175,7 +175,8 @@ (defun read-members (&optional (directory *directory*)) (let* ((pathname (merge-pathnames "build/dom2-interfaces.xml" directory)) (builder (rune-dom:make-dom-builder)) - (library (dom:document-element (cxml:parse-file pathname builder))) + (library (dom:document-element + (cxml:parse-file pathname builder :recode nil))) (methods '()) (fields '())) (do-child-elements (interface library :name "interface") @@ -584,7 +585,8 @@ (catch 'give-up (let* ((builder (rune-dom:make-dom-builder)) (cxml::*validate* nil) ;dom1.dtd is buggy - (test (dom:document-element (cxml:parse-file pathname builder))) + (test (dom:document-element + (cxml:parse-file pathname builder :recode nil))) title (bindings '()) (code '())) @@ -631,7 +633,8 @@ (setf name (runes:rod-string name)) (cxml:parse-file (make-pathname :name name :type "xml" :defaults *files-directory*) - (rune-dom:make-dom-builder))) + (rune-dom:make-dom-builder) + :recode nil)) (defparameter *bad-tests* '("hc_elementnormalize2.xml" @@ -656,7 +659,7 @@ (let* ((all-tests (merge-pathnames "alltests.xml" test-directory)) (builder (rune-dom:make-dom-builder)) (suite (dom:document-element - (cxml:parse-file all-tests builder))) + (cxml:parse-file all-tests builder :recode nil))) (*files-directory* (merge-pathnames "files/" test-directory))) (do-child-elements (member suite) Index: cxml/test/xmlconf.lisp diff -u cxml/test/xmlconf.lisp:1.10 cxml/test/xmlconf.lisp:1.11 --- cxml/test/xmlconf.lisp:1.10 Tue Dec 27 01:21:37 2005 +++ cxml/test/xmlconf.lisp Tue Dec 27 02:35:16 2005 @@ -77,7 +77,7 @@ (defun run-all-tests (directory) (let* ((pathname (merge-pathnames "xmlconf.xml" directory)) (builder (rune-dom:make-dom-builder)) - (xmlconf (cxml:parse-file pathname builder)) + (xmlconf (cxml:parse-file pathname builder :recode nil)) (ntried 0) (nfailed 0) (nskipped 0) @@ -125,6 +125,7 @@ (let ((document (apply #'cxml:parse-file pathname (rune-dom:make-dom-builder) + :recode nil args))) (cond ((null output) @@ -161,7 +162,10 @@ (handler-case (progn (format t " [validating:]") - (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate t) + (cxml:parse-file pathname + (rune-dom:make-dom-builder) + :recode nil + :validate t) (error "validity error not detected") nil) (cxml:validity-error () @@ -174,7 +178,10 @@ (handler-case (progn (format t " [not validating:]") - (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate nil) + (cxml:parse-file pathname + (rune-dom:make-dom-builder) + :recode nil + :validate nil) (error "well-formedness violation not detected") nil) (cxml:well-formedness-violation () @@ -183,7 +190,10 @@ (handler-case (progn (format t " [validating:]") - (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate t) + (cxml:parse-file pathname + (rune-dom:make-dom-builder) + :recode nil + :validate t) (error "well-formedness violation not detected") nil) (cxml:well-formedness-violation ()

1 0

[cxml-cvs] CVS update: cxml/dom/dom-builder.lisp cxml/dom/dom-impl.lisp cxml/dom/dom-sax.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/dom In directory common-lisp.net:/tmp/cvs-serv17375/dom Modified Files: dom-builder.lisp dom-impl.lisp dom-sax.lisp Log Message: utf8-dom fixes. recoding nach utf-8 jetzt der default. Date: Tue Dec 27 02:35:15 2005 Author: dlichteblau Index: cxml/dom/dom-builder.lisp diff -u cxml/dom/dom-builder.lisp:1.9 cxml/dom/dom-builder.lisp:1.10 --- cxml/dom/dom-builder.lisp:1.9 Tue Dec 27 01:21:31 2005 +++ cxml/dom/dom-builder.lisp Tue Dec 27 02:35:14 2005 @@ -83,7 +83,7 @@ (defmethod sax:start-element ((handler dom-builder) namespace-uri local-name qname attributes) - (check-type qname rod) + (check-type qname rod) ;catch recoder/builder mismatch (with-slots (document element-stack) handler (let* ((nsp sax:*namespace-processing*) (element (make-instance 'element Index: cxml/dom/dom-impl.lisp diff -u cxml/dom/dom-impl.lisp:1.33 cxml/dom/dom-impl.lisp:1.34 --- cxml/dom/dom-impl.lisp:1.33 Tue Dec 27 01:21:31 2005 +++ cxml/dom/dom-impl.lisp Tue Dec 27 02:35:14 2005 @@ -1228,7 +1228,9 @@ (when resolver (setf (document handler) owner) (push instance (element-stack handler)) - (funcall resolver (dom:name instance) handler))) + #+cxml-system::utf8dom-file + (setf handler (cxml:make-recoder handler #'cxml:rod-to-utf8-string)) + (funcall resolver (real-rod (dom:name instance)) handler))) (labels ((walk (n) (setf (slot-value n 'read-only-p) t) (when (dom:element-p n) Index: cxml/dom/dom-sax.lisp diff -u cxml/dom/dom-sax.lisp:1.4 cxml/dom/dom-sax.lisp:1.5 --- cxml/dom/dom-sax.lisp:1.4 Tue Dec 27 01:21:31 2005 +++ cxml/dom/dom-sax.lisp Tue Dec 27 02:35:14 2005 @@ -12,7 +12,11 @@ (handler document &key (include-xmlns-attributes sax:*include-xmlns-attributes*) include-doctype - include-default-values) + include-default-values + (recode (typep document 'utf8-dom::node))) + #+rune-is-integer + (when recode + (setf handler (make-recoder handler #'utf8-string-to-rod))) (sax:start-document handler) (when include-doctype (let ((doctype (dom:doctype document)))

1 0

[cxml-cvs] CVS update: cxml/doc/dom.html cxml/doc/quickstart.html cxml/doc/using.html
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/doc In directory common-lisp.net:/tmp/cvs-serv17375/doc Modified Files: dom.html quickstart.html using.html Log Message: utf8-dom fixes. recoding nach utf-8 jetzt der default. Date: Tue Dec 27 02:35:13 2005 Author: dlichteblau Index: cxml/doc/dom.html diff -u cxml/doc/dom.html:1.1 cxml/doc/dom.html:1.2 --- cxml/doc/dom.html:1.1 Mon Dec 26 23:04:10 2005 +++ cxml/doc/dom.html Tue Dec 27 02:35:13 2005 @@ -22,10 +22,33 @@ To parse an XML document into a DOM tree, use the SAX parser with a DOM builder as the SAX handler. Example: </p> - <pre>(cxml:parse-file "test.xml" (dom:make-dom-builder))</pre> + <pre>(cxml:parse-file "test.xml" (cxml-dom:make-dom-builder))</pre> <p> - <div class="def">Function DOM:MAKE-DOM-BUILDER ()</div> + <div class="def">Function CXML-DOM:MAKE-DOM-BUILDER ()</div> Create a SAX handler which builds a DOM document. + <p> + </p> + This functions returns a DOM builder that will work with the default + configuration of the SAX parser and is guaranteed to use + characters/strings instead of runes/rods, if that makes a + difference on the Lisp in question. + <p> + </p> + This is the same as <tt>rune-dom:make-dom-builder</tt> on Lisps + with Unicode support, and the same as + <tt>utf8-dom:make-dom-builder</tt> otherwise. + </p> + + <p> + <div class="def">Function RUNE-DOM:MAKE-DOM-BUILDER ()</div> + Create a SAX handler which builds a DOM document using runes and rods. + </p> + + <p> + <div class="def">Function UTF8-DOM:MAKE-DOM-BUILDER ()</div> + (Only on Lisps without Unicode support:) + Create a SAX handler which builds a DOM document using + UTF-8-encoded strings. </p> <a name="serialization"/> @@ -62,6 +85,12 @@ <li> <tt>include-default-values</tt> -- include attribute nodes with nil <tt>dom:specified</tt>. + </li> + <li> + <tt>recode</tt> -- (ignored on Lisps with Unicode support.) If + true, recode UTF-8 strings to rods. Defaults to true if used + with a UTF-8 DOM document. It can be set to false manually to + suppress recoding in this case. </li> </ul> Index: cxml/doc/quickstart.html diff -u cxml/doc/quickstart.html:1.1 cxml/doc/quickstart.html:1.2 --- cxml/doc/quickstart.html:1.1 Mon Dec 26 23:04:10 2005 +++ cxml/doc/quickstart.html Tue Dec 27 02:35:13 2005 @@ -33,7 +33,7 @@ <li><a href="using.html#parser">Parsing and Validating</a></li> <li><a href="using.html#serialization">Serialization</a></li> <li><a href="using.html#misc">Miscellaneous SAX handlers</a></li> - <li><a href="using.html#rods">Dealing with Rods</a></li> + <li><a href="using.html#rods">Recoders</a></li> <li><a href="using.html#dtdcache">Caching of DTD Objects</a></li> <li><a href="using.html#catalogs">XML Catalogs</a></li> <li><a href="using.html#sax">SAX Interface</a></li> @@ -67,7 +67,7 @@ <p>Parse <tt>example.xml</tt> into a DOM tree (<a href="using.html#parser">read more</a>):</p> - <pre>* <b>(cxml:parse-file "example.xml" (dom:make-dom-builder))</b> + <pre>* <b>(cxml:parse-file "example.xml" (cxml-dom:make-dom-builder))</b> #<DOM-IMPL::DOCUMENT @ #x72206172> ;; save result for later: * <b>(defparameter *example* *)</b> Index: cxml/doc/using.html diff -u cxml/doc/using.html:1.7 cxml/doc/using.html:1.8 --- cxml/doc/using.html:1.7 Tue Dec 27 01:21:30 2005 +++ cxml/doc/using.html Tue Dec 27 02:35:13 2005 @@ -69,6 +69,13 @@ <tt>disallow-internal-subset</tt> -- a boolean. If true, signal an error if the document contains an internal subset. </li> + <li> + <tt>recode</tt> -- a boolean. (Ignored on Lisps with Unicode + support.) Recode rods to UTF-8 strings. Defaults to true. + Make sure to use <tt>utf8-dom:make-dom-builder</tt> if this + option is enabled and <tt>rune-dom:make-dom-builder</tt> + otherwise. + </li> </ul> <p> @@ -258,7 +265,7 @@ ignored.<br/> Example: </p> - <pre>(let ((d (parse-file "~/test.xml" (dom:make-dom-builder))) + <pre>(let ((d (parse-file "~/test.xml" (cxml-dom:make-dom-builder))) (x (parse-dtd-file "~/test.dtd"))) (dom:map-document (cxml:make-validator x #"foo") d))</pre> @@ -287,40 +294,15 @@ </p> <a name="rods"/> - <h3>Dealing with Rods</h3> + <h3>Recoders</h3> <p> - As explained above, the XML parser handles character encoding and - uses 16bit strings internally. Instead of using characters and strings - it uses <em>runes</em> and <em>rods</em>. This is seen as a - feature, but can be inconvenient. + Recoders are a mechanism used by CXML internally on Lisp implementations + without Unicode support to recode UTF-16 vectors (rods) of + integers (runes) into UTF-8 strings. </p> - <ul> - <li> - If your Lisp supports 16 bit unicode strings, use feature - <tt>:rune-is-character</tt> and forget about runes and rods. - CXML will use ordinary Lisp characters and strings both - internally and externally. - </li> - <li> - If your Lisp does not support such strings and your application - needs Unicode support, use functions defined in the - <tt>runes</tt> package instead of ordinary string operators. - </li> - <li> - If your Lisp does not support such strings and your application - does not need Unicode support anyway, it will probably be more - convenient to let CXML convert rods into strings automatically. - To do that, use <tt>cxml:make-recoder</tt> to chain a special - sax handler between the parser and your application handler. - The recoder translates all rods using an application defined - function, which defaults to <tt>runes:rod-string</tt>. Although - the actual XML parser still uses rods internally, you SAX - handler will only see ordinary Lisp strings. - </li> - </ul> <p> - Note that the recoder approach does <em>not</em> work with the DOM - builder, since DOM is specified to use UTF-16. + User code does not usually need to deal with recoders in current + versions of CXML. </p> <p> <div class="def">Function CXML:MAKE-RECODER (chained-handler recoder-fn)</div> @@ -328,16 +310,6 @@ <tt>chained-handler</tt> after converting all strings and rods using <tt>recoder-fn</tt>, a function of one argument. </p> - <p> - <b>Example.</b> In a Lisp which ordinarily would use octet vector rods: - </p> - <pre>CL-USER(14): (cxml:parse-string "<test/>" (cxml-xmls:make-xmls-builder)) -(#(116 101 115 116) NIL)</pre> - <p> - Use a SAX recoder to get strings instead:: - </p> - <pre>CL-USER(17): (parse-string "<test/>" (cxml:make-recoder (cxml-xmls:make-xmls-builder) 'runes:rod-string)) -("test" NIL)</pre> <a name="dtdcache"/> <h3>Caching of DTD Objects</h3>

1 0

[cxml-cvs] CVS update: cxml/xml/recoder.lisp cxml/xml/unparse.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/xml In directory common-lisp.net:/tmp/cvs-serv11709/xml Modified Files: recoder.lisp unparse.lisp Log Message: utf8-dom Date: Tue Dec 27 01:21:45 2005 Author: dlichteblau Index: cxml/xml/recoder.lisp diff -u cxml/xml/recoder.lisp:1.2 cxml/xml/recoder.lisp:1.3 --- cxml/xml/recoder.lisp:1.2 Mon Nov 28 23:33:47 2005 +++ cxml/xml/recoder.lisp Tue Dec 27 01:21:38 2005 @@ -12,7 +12,7 @@ ((recoder :initarg :recoder :accessor recoder) (chained-handler :initarg :chained-handler :accessor chained-handler))) -(defun make-recoder (chained-handler &optional (recoder-fn #'rod-string)) +(defun make-recoder (chained-handler recoder-fn) (make-instance 'recoder :recoder recoder-fn :chained-handler chained-handler)) Index: cxml/xml/unparse.lisp diff -u cxml/xml/unparse.lisp:1.4 cxml/xml/unparse.lisp:1.5 --- cxml/xml/unparse.lisp:1.4 Sun Dec 4 19:44:06 2005 +++ cxml/xml/unparse.lisp Tue Dec 27 01:21:41 2005 @@ -639,6 +639,6 @@ (let* ((bytes (map '(vector (unsigned-byte 8)) #'char-code str)) (buffer (make-array (length bytes) :element-type '(unsigned-byte 16))) (n (decode-sequence :utf-8 bytes 0 (length bytes) buffer 0 0 nil)) - (result (make-array n :element-type 'rod))) + (result (make-array n :element-type 'rune))) (map-into result #'code-rune buffer) result))

1 0

[cxml-cvs] CVS update: cxml/test/domtest.lisp cxml/test/xmlconf.lisp
by dlichteblau＠common-lisp.net 27 Dec '05

27 Dec '05

Update of /project/cxml/cvsroot/cxml/test In directory common-lisp.net:/tmp/cvs-serv11709/test Modified Files: domtest.lisp xmlconf.lisp Log Message: utf8-dom Date: Tue Dec 27 01:21:37 2005 Author: dlichteblau Index: cxml/test/domtest.lisp diff -u cxml/test/domtest.lisp:1.12 cxml/test/domtest.lisp:1.13 --- cxml/test/domtest.lisp:1.12 Sun Dec 11 19:30:52 2005 +++ cxml/test/domtest.lisp Tue Dec 27 01:21:37 2005 @@ -174,7 +174,7 @@ (defun read-members (&optional (directory *directory*)) (let* ((pathname (merge-pathnames "build/dom2-interfaces.xml" directory)) - (builder (dom:make-dom-builder)) + (builder (rune-dom:make-dom-builder)) (library (dom:document-element (cxml:parse-file pathname builder))) (methods '()) (fields '())) @@ -209,9 +209,9 @@ (t (error "unknown condition: ~A" element)))) (defun equalsp (a b test) - (when (typep a 'dom-impl::named-node-map) + (when (dom:named-node-map-p a) (setf a (dom:items a))) - (when (typep b 'dom-impl::named-node-map) + (when (dom:named-node-map-p b) (setf b (dom:items b))) (if (and (typep a 'sequence) (typep b 'sequence)) (null (set-exclusive-or (coerce a 'list) (coerce b 'list) :test test)) @@ -368,7 +368,7 @@ (defun translate-implementation (elt) (with-attributes (|var|) elt - (maybe-setf (%intern |var|) `'dom-impl::implementation))) + (maybe-setf (%intern |var|) `'rune-dom:implementation))) (defun translate-length (load) ;; XXX Soweit ich sehe unterscheiden die Tests nicht zwischen @@ -406,7 +406,7 @@ (if (nullify |obj|) (translate-member element) (maybe-setf (%intern |var|) - `(dom:has-feature 'dom-impl::implementation + `(dom:has-feature 'rune-dom:implementation ,(parse-java-literal |feature|) ,(parse-java-literal |version|)))))) @@ -458,7 +458,7 @@ (defun translate-assert-size (element) (with-attributes (|collection| |size|) element `(let ((collection ,(%intern |collection|))) - (when (typep collection 'dom-impl::named-node-map) + (when (dom:named-node-map-p collection) (setf collection (dom:items collection))) (assert (eql (length collection) ,(parse-java-literal |size|)))))) @@ -493,9 +493,9 @@ (return `(block assert-domexception (handler-bind - ((dom-impl::dom-exception + ((rune-dom::dom-exception (lambda (c) - (when (eq (dom-impl::dom-exception-key c) + (when (eq (rune-dom::dom-exception-key c) ,(intern (tag-name c) :keyword)) (return-from assert-domexception))))) ,@(translate-body c) @@ -506,7 +506,7 @@ ,@(map-child-elements 'list (lambda (exception) - `(when (eq (dom-impl::dom-exception-key c) + `(when (eq (rune-dom::dom-exception-key c) ,(intern (runes:rod-string (dom:get-attribute exception "code")) :keyword)) ,@(translate-body exception) @@ -516,7 +516,7 @@ (defun translate-try (element) `(block try (handler-bind - ((dom-impl::dom-exception + ((rune-dom::dom-exception ,(translate-catch (do-child-elements (c element :name "catch") (return c)) '(return-from try)))) @@ -556,7 +556,7 @@ (defun translate-for-each (element) (with-attributes (|collection| |member|) element `(let ((collection ,(%intern |collection|))) - (when (typep collection 'dom-impl::named-node-map) + (when (dom:named-node-map-p collection) (setf collection (dom:items collection))) (map nil (lambda (,(%intern |member|)) ,@(translate-body element)) collection)))) @@ -582,7 +582,7 @@ (unless *fields* (multiple-value-setq (*methods* *fields*) (read-members))) (catch 'give-up - (let* ((builder (dom:make-dom-builder)) + (let* ((builder (rune-dom:make-dom-builder)) (cxml::*validate* nil) ;dom1.dtd is buggy (test (dom:document-element (cxml:parse-file pathname builder))) title @@ -631,7 +631,7 @@ (setf name (runes:rod-string name)) (cxml:parse-file (make-pathname :name name :type "xml" :defaults *files-directory*) - (dom:make-dom-builder))) + (rune-dom:make-dom-builder))) (defparameter *bad-tests* '("hc_elementnormalize2.xml" @@ -654,7 +654,7 @@ (nfailed 0)) (flet ((parse (test-directory) (let* ((all-tests (merge-pathnames "alltests.xml" test-directory)) - (builder (dom:make-dom-builder)) + (builder (rune-dom:make-dom-builder)) (suite (dom:document-element (cxml:parse-file all-tests builder))) (*files-directory* Index: cxml/test/xmlconf.lisp diff -u cxml/test/xmlconf.lisp:1.9 cxml/test/xmlconf.lisp:1.10 --- cxml/test/xmlconf.lisp:1.9 Sat Dec 3 22:24:21 2005 +++ cxml/test/xmlconf.lisp Tue Dec 27 01:21:37 2005 @@ -76,7 +76,7 @@ (defun run-all-tests (directory) (let* ((pathname (merge-pathnames "xmlconf.xml" directory)) - (builder (dom:make-dom-builder)) + (builder (rune-dom:make-dom-builder)) (xmlconf (cxml:parse-file pathname builder)) (ntried 0) (nfailed 0) @@ -124,7 +124,7 @@ (declare (ignore description)) (let ((document (apply #'cxml:parse-file pathname - (dom:make-dom-builder) + (rune-dom:make-dom-builder) args))) (cond ((null output) @@ -161,7 +161,7 @@ (handler-case (progn (format t " [validating:]") - (cxml:parse-file pathname (dom:make-dom-builder) :validate t) + (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate t) (error "validity error not detected") nil) (cxml:validity-error () @@ -174,7 +174,7 @@ (handler-case (progn (format t " [not validating:]") - (cxml:parse-file pathname (dom:make-dom-builder) :validate nil) + (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate nil) (error "well-formedness violation not detected") nil) (cxml:well-formedness-violation () @@ -183,7 +183,7 @@ (handler-case (progn (format t " [validating:]") - (cxml:parse-file pathname (dom:make-dom-builder) :validate t) + (cxml:parse-file pathname (rune-dom:make-dom-builder) :validate t) (error "well-formedness violation not detected") nil) (cxml:well-formedness-violation ()

1 0