cxml-cvs August 2006

cxml-cvs@common-lisp.net

1 participants
16 discussions

[cxml-cvs] CVS cxml/xml
by dlichteblau 28 Aug '06

28 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv28965 Modified Files: sax-handler.lisp unparse.lisp Log Message: Sonderzeichen raus --- /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2005/12/29 00:31:36 1.4 +++ /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2006/08/28 13:41:41 1.5 @@ -6,8 +6,8 @@ ;;; Author: David Lichteblau (DTD-related changes) ;;; License: BSD ;;; --------------------------------------------------------------------------- -;;; © copyright 2003 by Henrik Motakef -;;; © copyright 2004 knowledgeTools Int. GmbH +;;; (c) copyright 2003 by Henrik Motakef +;;; (c) copyright 2004 knowledgeTools Int. GmbH ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions are --- /project/cxml/cvsroot/cxml/xml/unparse.lisp 2006/05/05 09:05:22 1.10 +++ /project/cxml/cvsroot/cxml/xml/unparse.lisp 2006/08/28 13:41:41 1.11 @@ -7,9 +7,9 @@ ;;; Author: David Lichteblau <david(a)lichteblau.com> ;;; License: Lisp-LGPL (See file COPYING for details). ;;; --------------------------------------------------------------------------- -;;; Â© copyright 1999 by Gilbert Baumann -;;; Â© copyright 2004 by knowledgeTools Int. GmbH -;;; Â© copyright 2004 by David Lichteblau (for headcraft.de) +;;; (c) copyright 1999 by Gilbert Baumann +;;; (c) copyright 2004 by knowledgeTools Int. GmbH +;;; (c) copyright 2004 by David Lichteblau (for headcraft.de) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 28 Aug '06

28 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv7505/dom Modified Files: dom-impl.lisp Log Message: fix importing attributes to -really- copy all their slots --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/27 17:29:39 1.40 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/28 09:04:51 1.41 @@ -1349,6 +1349,7 @@ (import-node-internal 'attribute document node t + :specified-p (dom:specified node) :name (dom:name node) :namespace-uri (dom:namespace-uri node) :local-name (dom:local-name node) @@ -1371,14 +1372,10 @@ (setf (slot-value attributes 'element) result) (dolist (attribute (dom:items (dom:attributes node))) (when (or (dom:specified attribute) *clone-not-import*) - (if (dom:namespace-uri attribute) - (dom:set-attribute-ns result - (dom:namespace-uri attribute) - (dom:local-name attribute) - (dom:value attribute)) - (dom:set-attribute result - (dom:name attribute) - (dom:value attribute))))) + (let ((attr (dom:import-node document attribute t))) + (if (dom:namespace-uri attribute) + (dom:set-attribute-node-ns result attr) + (dom:set-attribute-node result attr))))) (add-default-attributes result) result))

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 27 Aug '06

27 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv30679 Modified Files: dom-impl.lisp Log Message: repaired clone-node of a document without an internal subset --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:55:30 1.39 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/27 17:29:39 1.40 @@ -1452,7 +1452,7 @@ (slot-value node 'entity-resolver)) (setf (slot-value (dom:entities doctype) 'read-only-p) t) (setf (slot-value (dom:notations doctype) 'read-only-p) t) - (when doctype + (when (and doctype (slot-boundp doctype 'dom::%internal-subset)) (setf (dom::%internal-subset doctype) (dom::%internal-subset original-doctype))) (when (and (dom:document-element node) deep)

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv15190/xml Modified Files: xmlns-normalizer.lisp Log Message: namespace fixes --- /project/cxml/cvsroot/cxml/xml/xmlns-normalizer.lisp 2005/12/27 20:01:32 1.2 +++ /project/cxml/cvsroot/cxml/xml/xmlns-normalizer.lisp 2006/08/20 14:59:35 1.3 @@ -38,6 +38,8 @@ :chained-handler chained-handler)) (defun normalizer-find-prefix (handler prefix) + (when (zerop (length prefix)) + (setf prefix #"xmlns")) (block t (dolist (bindings (xmlns-stack handler)) (dolist (attribute bindings) @@ -54,7 +56,7 @@ (return-from t attribute)))))) (defun make-xmlns-attribute (prefix uri) - (if prefix + (if (and (plusp (length prefix)) (not (equal prefix #"xmlns"))) (sax:make-attribute :qname (concatenate 'rod #"xmlns:" prefix) :namespace-uri *xmlns-namespace* @@ -112,7 +114,7 @@ (rename-attribute a (sax:attribute-local-name uri-binding))) - ((null prefix-binding) + ((and prefix (null prefix-binding)) (push-namespace prefix u)) (t (loop

1 0

[cxml-cvs] CVS cxml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv15190 Modified Files: README.html Log Message: namespace fixes --- /project/cxml/cvsroot/cxml/README.html 2006/08/20 13:58:30 1.24 +++ /project/cxml/cvsroot/cxml/README.html 2006/08/20 14:59:34 1.25 @@ -111,8 +111,10 @@ <ul class="nomargin"> <li>Serialization fixes (thanks to Nathan Bird, Donavon Keithley).</li> <li>characters.lisp cleanup (thanks to Nathan Bird).</li> + <li>Namespace normalizer bugfixes.</li> <li>Minor changes: clone-node on document as an extension. DOM - class hierarchy reworked. New function parse-empty-document.</li> + class hierarchy reworked. New function parse-empty-document. + Fixed the DOM serializer to not throw away local names.</li> </ul> <p class="nomargin"><tt>rel-2006-01-05</tt></p> <ul class="nomargin">

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv15190/dom Modified Files: dom-sax.lisp Log Message: namespace fixes --- /project/cxml/cvsroot/cxml/dom/dom-sax.lisp 2005/12/27 20:01:13 1.6 +++ /project/cxml/cvsroot/cxml/dom/dom-sax.lisp 2006/08/20 14:59:34 1.7 @@ -88,6 +88,7 @@ (push (sax:make-attribute :qname (dom:name a) :value (dom:value a) + :local-name (dom:local-name a) :namespace-uri (dom:namespace-uri a) :specified-p (dom:specified a)) results)))

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv6540/xml Modified Files: package.lisp xml-parse.lisp Log Message: new function parse-empty-document --- /project/cxml/cvsroot/cxml/xml/package.lisp 2005/12/29 00:31:36 1.11 +++ /project/cxml/cvsroot/cxml/xml/package.lisp 2006/08/20 13:58:31 1.12 @@ -36,6 +36,7 @@ #:parse-stream #:parse-rod #:parse-octets + #:parse-empty-document #:make-octet-vector-sink #:make-octet-stream-sink --- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/05/18 10:08:36 1.61 +++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/08/20 13:58:31 1.62 @@ -3005,6 +3005,64 @@ :initial-speed 1))) (apply #'parse-xstream xstream handler args))) +(defun parse-empty-document + (uri qname handler &key public-id system-id entity-resolver (recode t)) + (check-type uri (or null rod)) + (check-type qname (or null rod)) + (check-type public-id (or null rod)) + (check-type system-id (or null puri:uri)) + (check-type entity-resolver (or null function symbol)) + (check-type recode boolean) + #+rune-is-integer + (when recode + (setf handler (make-recoder handler #'rod-to-utf8-string))) + (let ((*ctx* + (make-context :handler handler :entity-resolver entity-resolver)) + (*validate* nil) + (extid + (when (or public-id system-id) + (extid-using-catalog (make-extid public-id system-id))))) + (sax:start-document handler) + (when extid + (sax:start-dtd handler + qname + (and public-id) + (and system-id (uri-rod system-id))) + (setf (dtd *ctx*) (getdtd (extid-system extid) *dtd-cache*)) + (unless (dtd *ctx*) + (with-scratch-pads () + (let ((*data-behaviour* :DTD)) + (let* ((xi2 (xstream-open-extid extid)) + (zi2 (make-zstream :input-stack (list xi2)))) + (ensure-dtd) + (p/ext-subset zi2))))) + (sax:end-dtd handler) + (let ((dtd (dtd *ctx*))) + (sax:entity-resolver handler (lambda (n h) (resolve-entity n h dtd))) + (sax::dtd handler dtd))) + (ensure-dtd) + (when (or uri qname) + (let* ((attrs + (when uri + (list (sax:make-attribute :qname #"xmlns" + :value (rod uri) + :specified-p t)))) + (*namespace-bindings* *namespace-bindings*) + new-namespaces) + (when sax:*namespace-processing* + (setf new-namespaces (declare-namespaces attrs)) + (mapc #'set-attribute-namespace attrs)) + (multiple-value-bind (uri prefix local-name) + (if sax:*namespace-processing* (decode-qname qname) nil) + (declare (ignore prefix)) + (unless (or sax:*include-xmlns-attributes* + (null sax:*namespace-processing*)) + (setf attrs nil)) + (sax:start-element (handler *ctx*) uri local-name qname attrs) + (sax:end-element (handler *ctx*) uri local-name qname)) + (undeclare-namespaces new-namespaces))) + (sax:end-document handler))) + (defun parse-dtd-file (filename &optional handler) (with-open-file (s filename :element-type '(unsigned-byte 8)) (parse-dtd-stream s handler)))

1 0

[cxml-cvs] CVS cxml
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv6540 Modified Files: README.html Log Message: new function parse-empty-document --- /project/cxml/cvsroot/cxml/README.html 2006/08/20 12:55:30 1.23 +++ /project/cxml/cvsroot/cxml/README.html 2006/08/20 13:58:30 1.24 @@ -112,7 +112,7 @@ <li>Serialization fixes (thanks to Nathan Bird, Donavon Keithley).</li> <li>characters.lisp cleanup (thanks to Nathan Bird).</li> <li>Minor changes: clone-node on document as an extension. DOM - class hierarchy reworked.</li> + class hierarchy reworked. New function parse-empty-document.</li> </ul> <p class="nomargin"><tt>rel-2006-01-05</tt></p> <ul class="nomargin">

1 0

[cxml-cvs] CVS cxml/doc
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/doc In directory clnet:/tmp/cvs-serv6540/doc Modified Files: using.html Log Message: new function parse-empty-document --- /project/cxml/cvsroot/cxml/doc/using.html 2006/01/23 21:53:24 1.14 +++ /project/cxml/cvsroot/cxml/doc/using.html 2006/08/20 13:58:31 1.15 @@ -133,6 +133,18 @@ </p> <p> + <div class="def">Function CXML:PARSE-FILE (uri qname handler &key public-id system-id entity-resolver recode)</div> + </p> + <p> + Simulate parsing a document with a document element <tt>qname</tt> + having no attributes except for an optional namespace + declaration to <tt>uri</tt>. If an external ID is specified + (<tt>system-id</tt>, <tt>public-id</tt>), find, parse, and report + this DTD as if with <tt>parse-file</tt>, using the specified + entity resolver. + </p> + + <p> <div class="def">Function CXML:PARSE-DTD-FILE (pathname)</div> <div class="def">Function CXML:PARSE-DTD-STREAM (stream)</div> Parse <a

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 20 Aug '06

20 Aug '06

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv30752/dom Modified Files: dom-impl.lisp Log Message: new feature: clone-node von document bugfix: entities und notations auch in create-document-type readonly --- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:19:01 1.38 +++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/20 12:55:30 1.39 @@ -282,7 +282,10 @@ (defmethod dom:create-document-type ((factory (eql 'implementation)) name publicid systemid) (safe-split-qname name #"") - (%create-document-type name publicid systemid)) + (let ((result (%create-document-type name publicid systemid))) + (setf (slot-value (dom:entities result) 'read-only-p) t) + (setf (slot-value (dom:notations result) 'read-only-p) t) + result)) (defmethod dom:create-document ((factory (eql 'implementation)) uri qname doctype) @@ -1422,6 +1425,42 @@ (let ((*clone-not-import* t)) (dom:import-node (dom:owner-document node) node deep))) +;; extension: +(defmethod dom:clone-node ((node document) deep) + (let* ((document (make-instance 'document)) + (original-doctype (dom:doctype node)) + (doctype + (when original-doctype + (make-instance 'document-type + :owner document + :name (dom:name original-doctype) + :public-id (dom:public-id original-doctype) + :system-id (dom:system-id original-doctype) + :notations (make-instance 'named-node-map + :element-type :notation + :owner document + :items (dom:items (dom:notations original-doctype))) + :entities (make-instance 'named-node-map + :element-type :entity + :owner document + :items (dom:items + (dom:entities original-doctype))))))) + (setf (slot-value document 'owner) nil) + (setf (slot-value document 'doc-type) doctype) + (setf (slot-value document 'dtd) (dtd node)) + (setf (slot-value document 'entity-resolver) + (slot-value node 'entity-resolver)) + (setf (slot-value (dom:entities doctype) 'read-only-p) t) + (setf (slot-value (dom:notations doctype) 'read-only-p) t) + (when doctype + (setf (dom::%internal-subset doctype) + (dom::%internal-subset original-doctype))) + (when (and (dom:document-element node) deep) + (let* ((*clone-not-import* t) + (clone (dom:import-node document (dom:document-element node) t))) + (dom:append-child document clone))) + document)) + ;;; Erweiterung

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs August 2006