cxml-cvs December 2005

cxml-cvs@common-lisp.net

1 participants
138 discussions

[cxml-cvs] CVS update: cxml/runes/ystream.lisp cxml/runes/package.lisp
by dlichteblau＠common-lisp.net 29 Dec '05

29 Dec '05

Update of /project/cxml/cvsroot/cxml/runes In directory common-lisp.net:/tmp/cvs-serv577/runes Modified Files: package.lisp Added Files: ystream.lisp Log Message: sink reorganization Date: Thu Dec 29 00:11:34 2005 Author: dlichteblau Index: cxml/runes/package.lisp diff -u cxml/runes/package.lisp:1.4 cxml/runes/package.lisp:1.5 --- cxml/runes/package.lisp:1.4 Tue Dec 27 01:21:36 2005 +++ cxml/runes/package.lisp Thu Dec 29 00:11:32 2005 @@ -59,7 +59,21 @@ #:xstream-plist #:xstream-encoding #:set-to-full-speed - #:xstream-name)) + #:xstream-name + + ;; ystream.lisp + #:ystream + #:close-ystream + #:write-rune + #:write-rod + #:ystream-column + #:make-octet-vector-ystream + #:make-octet-stream-ystream + #:make-rod-ystream + #+rune-is-character #:make-character-stream-ystream + #+rune-is-integer #:make-string-ystream/utf8 + #+rune-is-integer #:make-character-stream-ystream/utf8 + #:runes-to-utf8/adjustable-string)) (defpackage :utf8-runes (:use :cl)

1 0

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

29 Dec '05

Update of /project/cxml/cvsroot/cxml/dom In directory common-lisp.net:/tmp/cvs-serv577/dom Modified Files: dom-impl.lisp Removed Files: unparse.lisp Log Message: sink reorganization Date: Thu Dec 29 00:11:24 2005 Author: dlichteblau Index: cxml/dom/dom-impl.lisp diff -u cxml/dom/dom-impl.lisp:1.34 cxml/dom/dom-impl.lisp:1.35 --- cxml/dom/dom-impl.lisp:1.34 Tue Dec 27 02:35:14 2005 +++ cxml/dom/dom-impl.lisp Thu Dec 29 00:11:22 2005 @@ -973,7 +973,7 @@ (rod-stream-buf stream))) (defmethod write-attribute-child ((node node) stream) - (write-rod (dom:node-value node) stream)) + (put-rod (dom:node-value node) stream)) (defmethod write-attribute-child ((node entity-reference) stream) (dovector (child (dom:child-nodes node)) @@ -988,7 +988,7 @@ (buf nil) (position 0)) -(defun write-rod (rod rod-stream) +(defun put-rod (rod rod-stream) (let ((buf (rod-stream-buf rod-stream))) (when buf (move rod buf 0 (rod-stream-position rod-stream) (length rod))) @@ -1210,10 +1210,12 @@ ;; dass ein leeres internal subset nicht vorhanden ist und ;; wir daher nil liefern sollen. bittesehr! (dom::%internal-subset node)) - (with-output-to-string (stream) - (let ((sink (cxml:make-character-stream-sink stream))) - (dolist (def (dom::%internal-subset node)) - (apply (car def) sink (cdr def))))) + (let ((sink + #+rune-is-character (cxml:make-string-sink) + #-rune-is-character (cxml:make-string-sink/utf8))) + (dolist (def (dom::%internal-subset node)) + (apply (car def) sink (cdr def))) + (sax:end-document sink)) nil)) ;;; NOTATION -- nix

1 0

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

29 Dec '05

Update of /project/cxml/cvsroot/cxml/doc In directory common-lisp.net:/tmp/cvs-serv577/doc Modified Files: dom.html installation.html quickstart.html using.html xmls-compat.html Log Message: sink reorganization Date: Thu Dec 29 00:11:19 2005 Author: dlichteblau Index: cxml/doc/dom.html diff -u cxml/doc/dom.html:1.4 cxml/doc/dom.html:1.5 --- cxml/doc/dom.html:1.4 Tue Dec 27 21:17:33 2005 +++ cxml/doc/dom.html Thu Dec 29 00:11:19 2005 @@ -7,6 +7,52 @@ </head> <body> <div class="sidebar"> + <p> + <a href="../README.html">CXML Homepage</a> + </p> + <ul class="main"> + <li> + <a href="installation.html">Installing Closure XML</a> + <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">Compilation</a></li> + <li><a href="installation.html#tests">Tests</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li> + <a href="using.html#quickstart"><b>Quick-Start Example</b></a> + </li> + </ul> + </li> + <li> + <a href="using.html">SAX parser</a> + <ul class="sub"> + <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">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> + </ul> + </li> + <li> + <a href="using.html">DOM implementation</a> + <ul class="sub"> + <li><a href="dom.html#parser">Parsing with the DOM builder</a></li> + <li><a href="dom.html#serialization">Serialization</a></li> + <li><a href="dom.html#mapping">DOM/Lisp mapping</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li><a href="xmls-compat.html">XMLS Builder</a></li> + </ul> + </li> + </ul> </div> <h1>The DOM implementation</h1> @@ -54,14 +100,9 @@ <a name="serialization"/> <h3>Serializing DOM</h3> <p> - The technique used to serialize a DOM document is to use a SAX - serialization sink as the argument to <tt>dom:map-document</tt>, - which generates SAX events for the DOM tree. - </p> - <p> - In addition, there are convenience functions like - <tt>unparse-document</tt> as a thin wrapper around - <tt>map-document</tt>. + To serialize a DOM document, use a SAX serialization sink as the + argument to <tt>dom:map-document</tt>, which generates SAX events + for the DOM tree. </p> <p> Applications dealing with namespaces might want to inject a @@ -98,34 +139,6 @@ suppress recoding in this case. </li> </ul> - - <p> - <div class="def">Function CXML:UNPARSE-DOCUMENT (document stream &rest keys)</div> - <div class="def">Function CXML:UNPARSE-DOCUMENT-TO-OCTETS (document &rest keys) => vector</div> - </p> - <p> - Serialize a DOM document object. These convenience functions are - wrappers around <tt>dom:map-document</tt>. - </p> - <p>Keyword arguments are passed on to the sink. C.f. <a - href="using.html#serialization">cxml:make-octet-vector-sink</a>.</p> - <p>Notes:</p> - <ul> - <li> - If keyword argument <tt>canonical</tt> is specified as 2, a - doctype declaration will be written that includes notations - declared in the document. - </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.6 cxml/doc/installation.html:1.7 --- cxml/doc/installation.html:1.6 Tue Dec 27 21:01:12 2005 +++ cxml/doc/installation.html Thu Dec 29 00:11:19 2005 @@ -7,6 +7,52 @@ </head> <body> <div class="sidebar"> + <p> + <a href="../README.html">CXML Homepage</a> + </p> + <ul class="main"> + <li> + <a href="installation.html">Installing Closure XML</a> + <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">Compilation</a></li> + <li><a href="installation.html#tests">Tests</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li> + <a href="using.html#quickstart"><b>Quick-Start Example</b></a> + </li> + </ul> + </li> + <li> + <a href="using.html">SAX parser</a> + <ul class="sub"> + <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">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> + </ul> + </li> + <li> + <a href="using.html">DOM implementation</a> + <ul class="sub"> + <li><a href="dom.html#parser">Parsing with the DOM builder</a></li> + <li><a href="dom.html#serialization">Serialization</a></li> + <li><a href="dom.html#mapping">DOM/Lisp mapping</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li><a href="xmls-compat.html">XMLS Builder</a></li> + </ul> + </li> + </ul> </div> <h1>Installation of Closure XML</h1> Index: cxml/doc/quickstart.html diff -u cxml/doc/quickstart.html:1.3 cxml/doc/quickstart.html:1.4 --- cxml/doc/quickstart.html:1.3 Tue Dec 27 21:01:12 2005 +++ cxml/doc/quickstart.html Thu Dec 29 00:11:19 2005 @@ -83,10 +83,10 @@ * <b>(dom:get-attribute (dom:document-element *example*) "a")</b> "b"</pre> - <p>Serialize the DOM document back into a stream (<a + <p>Serialize the DOM document back into a file (<a href="using.html#serialization">read more</a>):</p> - <pre><b>(cxml:unparse-document *example* *standard-output*)</b> -<test a="b"><child></child></test></pre> + <pre><b>(with-open-file (out "example.out" :direction :output :element-type '(unsigned-byte 8)) + (dom:map-document (cxml:make-octet-stream-sink out) *example*))</b></pre> <p>As an alternative to DOM, parse into xmls-compatible list structure (<a href="xmls-compat.html">read more</a>):</p> Index: cxml/doc/using.html diff -u cxml/doc/using.html:1.9 cxml/doc/using.html:1.10 --- cxml/doc/using.html:1.9 Tue Dec 27 21:01:12 2005 +++ cxml/doc/using.html Thu Dec 29 00:11:19 2005 @@ -7,6 +7,52 @@ </head> <body> <div class="sidebar"> + <p> + <a href="../README.html">CXML Homepage</a> + </p> + <ul class="main"> + <li> + <a href="installation.html">Installing Closure XML</a> + <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">Compilation</a></li> + <li><a href="installation.html#tests">Tests</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li> + <a href="using.html#quickstart"><b>Quick-Start Example</b></a> + </li> + </ul> + </li> + <li> + <a href="using.html">SAX parser</a> + <ul class="sub"> + <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">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> + </ul> + </li> + <li> + <a href="using.html">DOM implementation</a> + <ul class="sub"> + <li><a href="dom.html#parser">Parsing with the DOM builder</a></li> + <li><a href="dom.html#serialization">Serialization</a></li> + <li><a href="dom.html#mapping">DOM/Lisp mapping</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li><a href="xmls-compat.html">XMLS Builder</a></li> + </ul> + </li> + </ul> </div> <h1>Using the SAX parser</h1> @@ -137,12 +183,70 @@ <tt>with-xml-output</tt>, <tt>with-element</tt>, etc). </p> + <div style="background-color: #ddddff"> + Portable sinks:<br/> + <span class="def">Function CXML:MAKE-OCTET-VECTOR-SINK (&rest keys) => sink</span><br/> + <span class="def">Function CXML:MAKE-OCTET-STREAM-SINK (stream &rest keys) => sink</span><br/> + <span class="def">Function CXML:MAKE-ROD-SINK (&rest keys) => sink</span><br/> + <br/> + Only on Lisps with Unicode support:<br/> + <span class="def">Function CXML:MAKE-STRING-SINK</span> -- alias for <tt>cxml:make-rod-sink</tt><br/> + <span class="def">Function CXML:MAKE-CHARACTER-STREAM-SINK (stream &rest keys) => sink</span><br/> + <br/> + Only on Lisps <em>without</em> Unicode support:<br/> + <span class="def">Function CXML:MAKE-STRING-SINK/UTF8 (&rest keys) => sink</span><br/> + <span class="def">Function CXML:MAKE-CHARACTER-STREAM-SINK/UTF8 (stream &rest keys) => sink</span><br/> + </div> <p> - <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> - <div class="def">Function CXML:MAKE-CHARACTER-STREAM-SINK (stream &rest keys) => sink</div> Return a SAX serialization handle. </p> + <ul> + <li> + The <tt>-octet-</tt> functions write the document encoded into + UTF-8. + <tt>make-octet-stream-sink</tt> works with Lisp streams of + element-type <tt>(unsigned-byte 8)</tt>. + <tt>make-octet-vector-sink</tt> returns a vector of + <tt>(unsigned-byte 8)</tt>. + </li> + <li> + <tt>make-character-stream-sink</tt> works with character + streams. It serializes the document into characters <em>without + encoding it into an external format</em>. When using these + functions, <em>take care to avoid encoding the result into + an incorrect external format</em>. (Note that characters undergo + external format conversion when written to a character stream. + If the document's XML declaration specifies an encoding, make + sure to specify this encoding as the external format if and when + writing the serialized document to a character stream. If the + document does not specify an encoding, either UTF-8 or UTF-16 + must be used.) This function is available only on Lisps with + unicode support. + </li> + <li> + <tt>make-rod-sink</tt> serializes the document into a vector of + runes <em>without encoding it into an external format</em>. + (On Lisp with unicode support, the result will be a string; + otherwise, a vector of character codes will be returned.) + The warnings given for <tt>make-character-stream-sink</tt> + apply to this function as well. + </li> + <li> + The <tt>/utf8</tt> functions write the document encoded into + characters representing a UTF-8 encoding. + When using these functions, <em>take care to avoid encoding the + result</em> into an external format for a second time. (Note + that characters undergo external format conversion when written + to a character stream. Since these functions already perform + external format conversion, make sure to specify an external + format that does "nothing" if and when writing the serialized document + to a character stream. ISO-8859-1 external formats usually + achieve the desired effect.) + <tt>make-character-stream-sink/utf8</tt> works with character streams. + <tt>make-string-sink/utf8</tt> returns a string. + These functions are available only on Lisps without unicode support. + </li> + </ul> <p>Keyword arguments:</p> <ul> <li> @@ -170,6 +274,16 @@ <tt>NIL</tt>: Use a more readable non-canonical representation. </li> </ul> + <p> + An internal subset will be included in the result regardless of + the <tt>canonical</tt> setting. It is the responsibility of the + caller to not report an internal subset for + canonical <= 1, or only notations as required for + canonical = 2. For example, the + <tt>include-doctype</tt> argument to <tt>dom:map-document</tt> + should be set to <tt>nil</tt> for the former behaviour and + <tt>:canonical-notations</tt> for the latter. + </p> <p> With an <tt>indentation</tt> level, pretty-print the XML by inserting additional whitespace.  Note that indentation Index: cxml/doc/xmls-compat.html diff -u cxml/doc/xmls-compat.html:1.1 cxml/doc/xmls-compat.html:1.2 --- cxml/doc/xmls-compat.html:1.1 Mon Dec 26 23:04:10 2005 +++ cxml/doc/xmls-compat.html Thu Dec 29 00:11:19 2005 @@ -7,6 +7,52 @@ </head> <body> <div class="sidebar"> + <p> + <a href="../README.html">CXML Homepage</a> + </p> + <ul class="main"> + <li> + <a href="installation.html">Installing Closure XML</a> + <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">Compilation</a></li> + <li><a href="installation.html#tests">Tests</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li> + <a href="using.html#quickstart"><b>Quick-Start Example</b></a> + </li> + </ul> + </li> + <li> + <a href="using.html">SAX parser</a> + <ul class="sub"> + <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">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> + </ul> + </li> + <li> + <a href="using.html">DOM implementation</a> + <ul class="sub"> + <li><a href="dom.html#parser">Parsing with the DOM builder</a></li> + <li><a href="dom.html#serialization">Serialization</a></li> + <li><a href="dom.html#mapping">DOM/Lisp mapping</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li><a href="xmls-compat.html">XMLS Builder</a></li> + </ul> + </li> + </ul> </div> <h1>XMLS Builder</h1>

1 0

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

29 Dec '05

Update of /project/cxml/cvsroot/cxml In directory common-lisp.net:/tmp/cvs-serv577 Modified Files: README.html cxml.asd Log Message: sink reorganization Date: Thu Dec 29 00:11:18 2005 Author: dlichteblau Index: cxml/README.html diff -u cxml/README.html:1.14 cxml/README.html:1.15 --- cxml/README.html:1.14 Tue Dec 27 21:01:10 2005 +++ cxml/README.html Thu Dec 29 00:11:18 2005 @@ -10,6 +10,49 @@ <p> <a href="README.html">CXML Homepage</a> </p> + <ul class="main"> + <li> + <a href="doc/installation.html">Installing Closure XML</a> + <ul class="sub"> + <li><a href="doc/installation.html#download"><b>Download</b></a></li> + <li><a href="doc/installation.html#implementations">Implementation-specific notes</a></li> + <li><a href="doc/installation.html#compilation">Compilation</a></li> + <li><a href="doc/installation.html#tests">Tests</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li> + <a href="doc/using.html#quickstart"><b>Quick-Start Example</b></a> + </li> + </ul> + </li> + <li> + <a href="doc/using.html">SAX parser</a> + <ul class="sub"> + <li><a href="doc/using.html#parser">Parsing and Validating</a></li> + <li><a href="doc/using.html#serialization">Serialization</a></li> + <li><a href="doc/using.html#misc">Miscellaneous SAX handlers</a></li> + <li><a href="doc/using.html#rods">Recoders</a></li> + <li><a href="doc/using.html#dtdcache">Caching of DTD Objects</a></li> + <li><a href="doc/using.html#catalogs">XML Catalogs</a></li> + <li><a href="doc/using.html#sax">SAX Interface</a></li> + </ul> + </li> + <li> + <a href="doc/using.html">DOM implementation</a> + <ul class="sub"> + <li><a href="doc/dom.html#parser">Parsing with the DOM builder</a></li> + <li><a href="doc/dom.html#serialization">Serialization</a></li> + <li><a href="doc/dom.html#mapping">DOM/Lisp mapping</a></li> + </ul> + </li> + <li> + <ul class="hack"> + <li><a href="doc/xmls-compat.html">XMLS Builder</a></li> + </ul> + </li> + </ul> </div> <h1>Closure XML Parser</h1> @@ -67,6 +110,7 @@ <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>Sink API has been changed.</li> <li>Support internal subset serialization.</li> <li>Gilbert Baumann has clarified the license as Lisp-LGPL.</li> <li>Use trivial-gray-streams.</li> Index: cxml/cxml.asd diff -u cxml/cxml.asd:1.8 cxml/cxml.asd:1.9 --- cxml/cxml.asd:1.8 Tue Dec 27 01:21:27 2005 +++ cxml/cxml.asd Thu Dec 29 00:11:18 2005 @@ -51,7 +51,8 @@ (:file "encodings" :depends-on ("package")) (:file "encodings-data" :depends-on ("package" "encodings")) (:file "xstream" - :depends-on ("package" "definline" "syntax" "encodings-data")))) + :depends-on ("package" "definline" "syntax" "encodings-data")) + (:file "ystream" :depends-on (runes)))) (asdf:defsystem :cxml-xml :default-component-class closure-source-file @@ -106,7 +107,6 @@ (utf8dom-file utf8-impl :pathname "dom-impl" :depends-on ("package")) #+rune-is-integer (utf8dom-file utf8-builder :pathname "dom-builder" :depends-on (utf8-impl)) - (:file "unparse" :depends-on ("package")) (:file "dom-sax" :depends-on ("package"))) :depends-on (:cxml-xml))

1 0

[cxml-cvs] CVS update: cxml/dom/unparse.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-serv6956/dom Modified Files: unparse.lisp Log Message: namespace-normalizer lieber doch nicht per default Date: Tue Dec 27 21:17:34 2005 Author: dlichteblau Index: cxml/dom/unparse.lisp diff -u cxml/dom/unparse.lisp:1.3 cxml/dom/unparse.lisp:1.4 --- cxml/dom/unparse.lisp:1.3 Mon Dec 12 00:56:51 2005 +++ cxml/dom/unparse.lisp Tue Dec 27 21:17:34 2005 @@ -1,8 +1,6 @@ (in-package :cxml) (defun %unparse-document (sink doc canonical) - (when sax:*namespace-processing* - (setf sink (cxml:make-namespace-normalizer sink))) (dom:map-document sink doc :include-doctype (if (and canonical (>= canonical 2)) @@ -15,8 +13,7 @@ doc canonical)) -(defun unparse-document (doc character-stream &rest initargs &key canonical) - (%unparse-document - (apply #'make-character-stream-sink character-stream initargs) - doc - canonical)) +(defun unparse-document (doc stream &rest initargs &key canonical) + (%unparse-document (apply #'make-character-stream-sink stream initargs) + doc + canonical))

1 0

[cxml-cvs] CVS update: cxml/doc/dom.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-serv6956/doc Modified Files: dom.html Log Message: namespace-normalizer lieber doch nicht per default Date: Tue Dec 27 21:17:33 2005 Author: dlichteblau Index: cxml/doc/dom.html diff -u cxml/doc/dom.html:1.3 cxml/doc/dom.html:1.4 --- cxml/doc/dom.html:1.3 Tue Dec 27 21:01:12 2005 +++ cxml/doc/dom.html Tue Dec 27 21:17:33 2005 @@ -64,6 +64,11 @@ <tt>map-document</tt>. </p> <p> + Applications dealing with namespaces might want to inject a + <a href="using.html#misc">namespace normalizer</a> into the + sink chain. + </p> + <p> <div class="def">Function DOM:MAP-DOCUMENT (handler document &key include-xmlns-attributes include-default-values include-doctype)</div> Traverse a DOM document and call SAX functions as if an XML representation of the document was processed by a SAX parser. @@ -110,11 +115,6 @@ If keyword argument <tt>canonical</tt> is specified as 2, a doctype declaration will be written that includes notations declared in the document. - </li> - <li> - If namespace processing is enabled - (<tt>sax:*namespace-processing*</tt>), a <a - href="using.html#misc">namespace normalizer</a> is used. </li> </ul> <p>

1 0

[cxml-cvs] CVS update: cxml/xml/xml-parse.lisp cxml/xml/xmlns-normalizer.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-serv5367/xml Modified Files: xml-parse.lisp xmlns-normalizer.lisp Log Message: sb-unicode backport namespace-korrekturen noch documentation Date: Tue Dec 27 21:01:33 2005 Author: dlichteblau Index: cxml/xml/xml-parse.lisp diff -u cxml/xml/xml-parse.lisp:1.55 cxml/xml/xml-parse.lisp:1.56 --- cxml/xml/xml-parse.lisp:1.55 Tue Dec 27 02:35:20 2005 +++ cxml/xml/xml-parse.lisp Tue Dec 27 21:01:19 2005 @@ -116,11 +116,7 @@ ;; ;; o better extensibility wrt character representation, one may want to ;; have -;; - UTF-8 in standard CL strings -;; - UCS-2 in RODs -;; - UTF-16 in RODs ;; - UCS-4 in vectoren -;; [habe ich eigentlich nicht vor--david] ;; ;; o xstreams auslagern, documententieren und dann auch in SGML und ;; CSS parser verwenden. (halt alles was zeichen liest). @@ -1210,10 +1206,10 @@ (values :nmtoken (read-name-token input))) ((rune= #/# c) (let ((q (read-name-token input))) - (cond ((equalp q '#.(string-rod "REQUIRED")) :|#REQUIRED|) - ((equalp q '#.(string-rod "IMPLIED")) :|#IMPLIED|) - ((equalp q '#.(string-rod "FIXED")) :|#FIXED|) - ((equalp q '#.(string-rod "PCDATA")) :|#PCDATA|) + (cond ((rod= q '#.(string-rod "REQUIRED")) :|#REQUIRED|) + ((rod= q '#.(string-rod "IMPLIED")) :|#IMPLIED|) + ((rod= q '#.(string-rod "FIXED")) :|#FIXED|) + ((rod= q '#.(string-rod "PCDATA")) :|#PCDATA|) (t (wf-error zinput "Unknown token: ~S." q))))) ((or (rune= c #/U+0020) @@ -1821,15 +1817,15 @@ ;; [59] Enumeration ::= '(' S? Nmtoken (S? '|' S? Nmtoken)* S? ')' /* VC: Enumeration */ (multiple-value-bind (cat sem) (read-token input) (cond ((eq cat :nmtoken) - (cond ((equalp sem '#.(string-rod "CDATA")) :CDATA) - ((equalp sem '#.(string-rod "ID")) :ID) - ((equalp sem '#.(string-rod "IDREF")) :IDREFS) - ((equalp sem '#.(string-rod "IDREFS")) :IDREFS) - ((equalp sem '#.(string-rod "ENTITY")) :ENTITY) - ((equalp sem '#.(string-rod "ENTITIES")) :ENTITIES) - ((equalp sem '#.(string-rod "NMTOKEN")) :NMTOKEN) - ((equalp sem '#.(string-rod "NMTOKENS")) :NMTOKENS) - ((equalp sem '#.(string-rod "NOTATION")) + (cond ((rod= sem '#.(string-rod "CDATA")) :CDATA) + ((rod= sem '#.(string-rod "ID")) :ID) + ((rod= sem '#.(string-rod "IDREF")) :IDREFS) + ((rod= sem '#.(string-rod "IDREFS")) :IDREFS) + ((rod= sem '#.(string-rod "ENTITY")) :ENTITY) + ((rod= sem '#.(string-rod "ENTITIES")) :ENTITIES) + ((rod= sem '#.(string-rod "NMTOKEN")) :NMTOKEN) + ((rod= sem '#.(string-rod "NMTOKENS")) :NMTOKENS) + ((rod= sem '#.(string-rod "NOTATION")) (let (names) (p/S input) (expect input :\() @@ -1923,15 +1919,15 @@ (cond ((member cat '(:\" :\')) (make-internal-entdef (p/entity-value input))) ((and (eq cat :nmtoken) - (or (equalp sem '#.(string-rod "SYSTEM")) - (equalp sem '#.(string-rod "PUBLIC")))) + (or (rod= sem '#.(string-rod "SYSTEM")) + (rod= sem '#.(string-rod "PUBLIC")))) (let (extid ndata) (setf extid (p/external-id input nil)) (when (eq kind :general) ;NDATA allowed at all? (cond ((eq (peek-token input) :S) (p/S? input) (when (and (eq (peek-token input) :nmtoken) - (equalp (nth-value 1 (peek-token input)) + (rod= (nth-value 1 (peek-token input)) '#.(string-rod "NDATA"))) (consume-token input) (p/S input) @@ -1961,10 +1957,10 @@ (defun p/external-id (input &optional (public-only-ok-p nil)) ;; xxx public-only-ok-p (multiple-value-bind (cat sem) (read-token input) - (cond ((and (eq cat :nmtoken) (equalp sem '#.(string-rod "SYSTEM"))) + (cond ((and (eq cat :nmtoken) (rod= sem '#.(string-rod "SYSTEM"))) (p/S input) (make-extid nil (p/system-literal input))) - ((and (eq cat :nmtoken) (equalp sem '#.(string-rod "PUBLIC"))) + ((and (eq cat :nmtoken) (rod= sem '#.(string-rod "PUBLIC"))) (let (pub sys) (p/S input) (setf pub (p/pubid-literal input)) @@ -3390,9 +3386,7 @@ (dolist (ns-decl ns-decls) ;; check some namespace validity constraints (let ((prefix (car ns-decl)) - (uri (if (rod= #"" (cdr ns-decl)) - nil - (cdr ns-decl)))) + (uri (cdr ns-decl))) (cond ((and (rod= prefix #"xml") (not (rod= uri #"http://www.w3.org/XML/1998/namespace"))) @@ -3425,7 +3419,8 @@ may be bound to an empty namespace URI, thus ~ undeclaring it.")) (t - (push (cons prefix uri) *namespace-bindings*) + (push (cons prefix (if (rod= #"" uri) nil uri)) + *namespace-bindings*) (sax:start-prefix-mapping (handler *ctx*) (car ns-decl) (cdr ns-decl)))))) Index: cxml/xml/xmlns-normalizer.lisp diff -u cxml/xml/xmlns-normalizer.lisp:1.1 cxml/xml/xmlns-normalizer.lisp:1.2 --- cxml/xml/xmlns-normalizer.lisp:1.1 Mon Dec 12 00:56:52 2005 +++ cxml/xml/xmlns-normalizer.lisp Tue Dec 27 21:01:32 2005 @@ -90,7 +90,8 @@ (let ((binding (normalizer-find-prefix handler prefix))) (cond ((null binding) - (push-namespace prefix uri)) + (unless (and (null prefix) (zerop (length uri))) + (push-namespace prefix uri))) ((rod= (sax:attribute-value binding) uri)) ((member binding (car (xmlns-stack handler))) (setf (sax:attribute-value binding) uri))

1 0

[cxml-cvs] CVS update: cxml/test/domtest.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-serv5367/test Modified Files: domtest.lisp Log Message: sb-unicode backport namespace-korrekturen noch documentation Date: Tue Dec 27 21:01:17 2005 Author: dlichteblau Index: cxml/test/domtest.lisp diff -u cxml/test/domtest.lisp:1.14 cxml/test/domtest.lisp:1.15 --- cxml/test/domtest.lisp:1.14 Tue Dec 27 02:35:16 2005 +++ cxml/test/domtest.lisp Tue Dec 27 21:01:17 2005 @@ -151,7 +151,7 @@ (#/n (vector-push-extend #/newline v (length v))) ((#/\\ #/\") (vector-push-extend #/\\ v (length v))))) (vector-push-extend c v (length v)))) - (coerce v 'runes::simple-rod))) + (make-array (length v) :element-type 'runes:rune :initial-contents v))) (t (%intern str)))) @@ -680,7 +680,7 @@ (dom:get-attribute member "href")))) (unless (or (runes:rod= (dom:tag-name member) #"metadata") (member href *bad-tests* :test 'equal)) - (format t "~&~D/~D ~A~%" i n href) + (format t "~&~D/~D ~A~%" i #+nil n 808 href) (let ((lisp (slurp-test (merge-pathnames href test-directory)))) (when verbose

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/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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs December 2005