cxml-cvs October 2007

cxml-cvs@common-lisp.net

1 participants
27 discussions

[cxml-cvs] CVS closure-common
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/closure-common In directory clnet:/tmp/cvs-serv5820 Modified Files: xstream.lisp Log Message: Allow non-simple strings in MAKE-ROD-XSTREAM, for the benefit of Drakma. * xstream.lisp (MAKE-ROD-XSTREAM): Coerce non-simple arrays to simple-string. --- /project/cxml/cvsroot/closure-common/xstream.lisp 2007/08/29 12:11:17 1.7 +++ /project/cxml/cvsroot/closure-common/xstream.lisp 2007/10/14 21:14:08 1.8 @@ -337,6 +337,8 @@ :name name)))) (defun make-rod-xstream (string &key name) + (unless (typep string 'simple-array) + (setf string (coerce string 'simple-string))) ;; XXX encoding is mis-handled by this kind of stream (let ((n (length string))) (let ((buffer (make-array (1+ n) :element-type 'buffer-byte)))

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv30396/xml Modified Files: sax-handler.lisp Log Message: HAX namespace stuff * xml/sax-handler.lisp (HAX:START-ELEMENT, HAX:END-ELEMENT): Declare and undeclare the xhtml namespace on elements called "HTML". --- /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2007/10/14 19:04:36 1.10 +++ /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2007/10/14 20:19:35 1.11 @@ -429,6 +429,15 @@ (defmethod hax:start-element ((handler abstract-handler) name attributes) (setf name (runes:rod-downcase name)) + (when (equal name "html") + (sax:start-prefix-mapping handler "" "http://www.w3.org/1999/xhtml") + (when *include-xmlns-attributes* + (push (make-attribute :namespace-uri "http://www.w3.org/2000/xmlns/" + :local-name nil + :qname "xmlns" + :value "http://www.w3.org/1999/xhtml" + :specified-p t) + attributes))) (sax:start-element handler "http://www.w3.org/1999/xhtml" name @@ -440,7 +449,9 @@ (sax:end-element handler "http://www.w3.org/1999/xhtml" name - name)) + name) + (when (equal name "html") + (sax:end-prefix-mapping handler ""))) (defmethod hax:characters ((handler abstract-handler) data) (sax:characters handler data))

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv20681/xml Modified Files: sax-handler.lisp Log Message: HAX integration buglet * xml/sax-handler.lisp (HAX:START-DOCUMENT): Write a doctype only if a system ID was given. --- /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2007/10/14 17:50:11 1.9 +++ /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2007/10/14 19:04:36 1.10 @@ -423,8 +423,9 @@ (defmethod hax:start-document ((handler abstract-handler) name pubid sysid) (sax:start-document handler) - (sax:start-dtd handler name pubid sysid) - (sax:end-dtd handler name pubid sysid)) + (when sysid + (sax:start-dtd handler name pubid sysid) + (sax:end-dtd handler))) (defmethod hax:start-element ((handler abstract-handler) name attributes) (setf name (runes:rod-downcase name))

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv17325 Modified Files: xml-parse.lisp Log Message: Fixed (parse xstream ...). * xml/xml-parse.lisp (PARSE): Call parse-xstream, not make-xstream. --- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2007/10/03 15:21:56 1.73 +++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2007/10/14 18:40:26 1.74 @@ -3102,7 +3102,7 @@ unless (eq name :pathname) append (list name value)))) (etypecase input - (xstream (apply #'make-xstream input handler args)) + (xstream (apply #'parse-xstream input handler args)) (pathname (apply #'parse-file input handler args)) (rod (apply #'parse-rod input handler args)) (array (apply #'parse-octets input handler args))

1 0

[cxml-cvs] CVS cxml/xml
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/cxml/xml In directory clnet:/tmp/cvs-serv8803/xml Modified Files: package.lisp sax-handler.lisp sax-proxy.lisp unparse.lisp Log Message: SAX overhaul for HAX integration. * dom/dom-builder.lisp (DOM-BUILDER): Inherit from sax:content-handler. * klacks/klacks-impl.lisp (KLACKS-DTD-HANDLER): Inherit from sax:default-handler. * klacks/klacks.lisp (KLACKS:SERIALIZE-EVENT): Bugfix -- call start-cdata and end-cdata on the handler, not the source. * xml/package.lisp: New export WITH-OUTPUT-SINK. * xml/sax-handler.lisp (SAX): New exports abstract-handler, content-handler, default-handler. (STANDARD-ATTRIBUTE): Renamed from attribute. (ATTRIBUTE-NAMESPACE-URI, ATTRIBUTE-LOCAL-NAME, ATTRIBUTE-QNAME, ATTRIBUTE-VALUE, ATTRIBUTE-SPECIFIED-P): Wrapper methods for standard-attribute. Wrapper methods for hax:standard-attribute. (all events): pulled into a common define-event form. New dummy method on null. Added a warning to the default method. New error method on abstract-handler. New dummy method on the respective default handler classes. * xml/sax-proxy.lisp (BROADCAST-HANDLER): Inherit from abstract-handler, not sax-parser-mixin. * xml/unparse.lisp (sink): Inherit from sax:content-handler. (WITH-OUTPUT-SINK): New macro. (INVOKE-WITH-OUTPUT-SINK): New function. --- /project/cxml/cvsroot/cxml/xml/package.lisp 2007/07/07 20:47:39 1.19 +++ /project/cxml/cvsroot/cxml/xml/package.lisp 2007/10/14 17:50:11 1.20 @@ -51,6 +51,7 @@ #:make-character-stream-sink/utf8 #:with-xml-output + #:with-output-sink #:with-namespace #:with-element #:with-element* --- /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2007/07/01 17:25:45 1.8 +++ /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2007/10/14 17:50:11 1.9 @@ -3,11 +3,12 @@ ;;; Title: A SAX2-like API for the xml parser ;;; Created: 2003-06-30 ;;; Author: Henrik Motakef <hmot(a)henrik-motakef.de> -;;; Author: David Lichteblau (DTD-related changes) +;;; Author: David Lichteblau ;;; License: BSD ;;; --------------------------------------------------------------------------- ;;; (c) copyright 2003 by Henrik Motakef ;;; (c) copyright 2004 knowledgeTools Int. GmbH +;;; (c) copyright 2005-2007 David Lichteblau ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions are @@ -34,15 +35,11 @@ ;;; TODO/ Open Questions: -;; o Should there be a predefined "handler" class, or even several -;; (like Java SAX' ContentHandler, DTDHandler, LexicalHandler etc? I -;; don't really see why. ;; o Missing stuff from Java SAX2: ;; * ignorable-whitespace ;; * skipped-entity ;; * The whole ErrorHandler class, this is better handled using ;; conditions (but isn't yet) -;; * The LexicalHandler (start-cdata etc) would be nice [-- partly done] (defpackage :sax (:use :common-lisp) @@ -50,6 +47,10 @@ #:*include-xmlns-attributes* #:*use-xmlns-namespace* + #:abstract-handler + #:content-handler + #:default-handler + #:make-attribute #:find-attribute #:find-attribute-ns @@ -98,7 +99,7 @@ (defclass sax-parser () ()) -(defclass sax-parser-mixin () +(defclass sax-parser-mixin () ;deprecated ((sax-parser :initform nil :reader sax-parser))) (defgeneric line-number (sax-parser) @@ -185,13 +186,75 @@ Setting this variable has no effect unless both `*namespace-processing*' and `*include-xmlns-attributes*' are non-nil.") -(defstruct attribute + +;;;; ATTRIBUTE + +(defstruct (standard-attribute (:constructor make-attribute)) namespace-uri local-name qname value specified-p) +(defmethod (setf attribute-namespace-uri) + (newval (attribute standard-attribute)) + (setf (standard-attribute-namespace-uri attribute) newval)) + +(defmethod (setf attribute-local-name) + (newval (attribute standard-attribute)) + (setf (standard-attribute-local-name attribute) newval)) + +(defmethod (setf attribute-qname) + (newval (attribute standard-attribute)) + (setf (standard-attribute-qname attribute) newval)) + +(defmethod (setf attribute-value) + (newval (attribute standard-attribute)) + (setf (standard-attribute-value attribute) newval)) + +(defmethod (setf attribute-specified-p) + (newval (attribute standard-attribute)) + (setf (standard-attribute-specified-p attribute) newval)) + +(defgeneric attribute-namespace-uri (attribute) + (:method ((attribute standard-attribute)) + (standard-attribute-namespace-uri attribute)) + (:method ((attribute hax:standard-attribute)) + "")) + +(defgeneric attribute-local-name (attribute) + (:method ((attribute standard-attribute)) + (standard-attribute-local-name attribute)) + (:method ((attribute hax:standard-attribute)) + (runes:rod-downcase (hax:attribute-name attribute)))) + +(defgeneric attribute-qname (attribute) + (:method ((attribute standard-attribute)) + (standard-attribute-qname attribute)) + (:method ((attribute hax:standard-attribute)) + (runes:rod-downcase (hax:attribute-name attribute)))) + +(defgeneric attribute-value (attribute) + (:method ((attribute standard-attribute)) + (standard-attribute-value attribute)) + (:method ((attribute hax:standard-attribute)) + (hax:attribute-value attribute))) + +(defgeneric attribute-specified-p (attribute) + (:method ((attribute standard-attribute)) + (standard-attribute-specified-p attribute)) + (:method ((attribute hax:standard-attribute)) + (hax:attribute-specified-p attribute))) + +(defmethod hax:attribute-name ((attribute standard-attribute)) + (attribute-local-name attribute)) + +(defmethod hax:attribute-value ((attribute standard-attribute)) + (attribute-value attribute)) + +(defmethod hax:attribute-specified-p ((attribute standard-attribute)) + (attribute-specified-p attribute)) + (defun %rod= (x y) ;; allow rods *and* strings *and* null (cond @@ -209,16 +272,197 @@ (%rod= lname (sax:attribute-local-name attr)))) attrs)) -(defgeneric start-document (handler) - (:documentation "Called at the beginning of the parsing process, + +;;;; ABSTRACT-HANDLER and DEFAULT-HANDLER + +(defclass abstract-handler (sax-parser-mixin) ()) +(defclass content-handler (abstract-handler) ()) +(defclass default-handler (content-handler) ()) + + +;;;; EVENTS + +(macrolet ((define-event ((name default-handler-class) + (&rest args) + &body hax-body) + `(defgeneric ,name (handler ,@args) + (:method ((handler null) ,@args) + (declare (ignore ,@args)) + nil) + (:method ((handler t) ,@args) + (declare (ignore ,@args)) + (error "deprecated SAX default method used by a handler ~ + that is not a subclass of SAX:ABSTRACT-HANDLER ~ + or HAX:ABSTRACT-HANDLER") + nil) + (:method ((handler abstract-handler) ,@args) + (declare (ignore ,@args)) + (error "SAX event ~A not implemented by this handler" + ',name)) + (:method ((handler ,default-handler-class) ,@args) + (declare (ignore ,@args)) + nil) + (:method ((handler hax:abstract-handler) ,@args) + (declare (ignorable ,@args)) + ,@hax-body)))) + (define-event (start-document default-handler) + () + nil) + + (define-event (start-element default-handler) + (namespace-uri local-name qname attributes) + (hax:start-element handler local-name attributes)) + + (define-event (start-prefix-mapping content-handler) + (prefix uri) + nil) + + (define-event (characters default-handler) + (data) + (hax:characters handler data)) + + (define-event (processing-instruction default-handler) + (target data) + nil) + + (define-event (end-prefix-mapping content-handler) + (prefix) + nil) + + (define-event (end-element default-handler) + (namespace-uri local-name qname) + (hax:end-element handler local-name)) + + (define-event (end-document default-handler) + () + (hax:end-document handler)) + + (define-event (comment content-handler) + (data) + (hax:comment handler data)) + + (define-event (start-cdata content-handler) + () + nil) + + (define-event (end-cdata content-handler) + () + nil) + + (define-event (start-dtd content-handler) + (name public-id system-id) + (hax:start-document handler name public-id system-id)) + + (define-event (end-dtd content-handler) + () + nil) + + (define-event (start-internal-subset content-handler) + () + nil) + + (define-event (end-internal-subset content-handler) + () + nil) + + (define-event (unparsed-internal-subset content-handler) + (str) + nil) + + (define-event (unparsed-entity-declaration content-handler) + (name public-id system-id notation-name) + nil) + + (define-event (external-entity-declaration content-handler) + (kind name public-id system-id) + nil) + + (define-event (internal-entity-declaration content-handler) + (kind name value) + nil) + + (define-event (notation-declaration content-handler) + (name public-id system-id) + nil) + + (define-event (element-declaration content-handler) + (name model) + nil) + + (define-event (attribute-declaration content-handler) + (element-name attribute-name type default) + nil) + + (define-event (entity-resolver content-handler) + (resolver) + nil) + + (define-event (dtd content-handler) + (dtd) + nil)) + +;;; special case: this method is defined on abstract-handler through +;;; sax-parser-mixin +(defgeneric register-sax-parser (handler sax-parser) + (:method ((handler null) sax-parser) + (declare (ignore sax-parser)) + nil) + (:method ((handler sax-parser-mixin) sax-parser) + (setf (slot-value handler 'sax-parser) sax-parser)) + (:method ((handler t) sax-parser) + (declare (ignore sax-parser)) + (error "deprecated sax default method used by a handler ~ + that is not a subclass of sax:abstract-handler ~ + or hax:abstract-handler") + nil) + (:method ((handler hax:abstract-handler) sax-parser) + (declare (ignorable sax-parser)) nil)) + + +;;;; HAX to SAX + +(defmethod hax:start-document ((handler abstract-handler) name pubid sysid) + (sax:start-document handler) + (sax:start-dtd handler name pubid sysid) + (sax:end-dtd handler name pubid sysid)) + +(defmethod hax:start-element ((handler abstract-handler) name attributes) + (setf name (runes:rod-downcase name)) + (sax:start-element handler + "http://www.w3.org/1999/xhtml" + name + name + attributes)) + +(defmethod hax:end-element ((handler abstract-handler) name) + (setf name (runes:rod-downcase name)) + (sax:end-element handler + "http://www.w3.org/1999/xhtml" + name + name)) + +(defmethod hax:characters ((handler abstract-handler) data) + (sax:characters handler data)) + +(defmethod hax:comment ((handler abstract-handler) str) + (sax:comment handler str)) + +(defmethod hax:end-document ((handler abstract-handler)) + (sax:end-document handler)) + + + +;;;; Documentation + +(setf (documentation 'start-document 'function) + "Called at the beginning of the parsing process, before any element, processing instruction or comment is reported. Handlers that need to maintain internal state may use this to perform any neccessary initializations.") - (:method ((handler t)) nil)) -(defgeneric start-element (handler namespace-uri local-name qname attributes) - (:documentation "Called to report the beginning of an element. +(setf (documentation 'start-element 'function) + "Called to report the beginning of an element. There will always be a corresponding call to end-element, even in the case of an empty element (i.e. <foo/>). @@ -235,12 +479,9 @@ apply. Additionally, namespace-declaring attributes (those whose name is \"xmlns\" or starts with \"xmlns:\") are only included if *include-xmlns-attributes* is non-nil.") - (:method ((handler t) namespace-uri local-name qname attributes) - (declare (ignore namespace-uri local-name qname attributes)) - nil)) -(defgeneric start-prefix-mapping (handler prefix uri) - (:documentation "Called when the scope of a new prefix -> namespace-uri mapping begins. +(setf (documentation 'start-prefix-mapping 'function) + "Called when the scope of a new prefix -> namespace-uri mapping begins. This will always be called immediatly before the `start-element' event for the element on which the namespaces are declared. @@ -249,24 +490,21 @@ circumstances, for example when they have to deal with qualified names in textual content. The parser will handle namespaces of elements and attributes on its own.") - (:method ((handler t) prefix uri) (declare (ignore prefix uri)) nil)) -(defgeneric characters (handler data) - (:documentation "Called for textual element content. +(setf (documentation 'characters 'function) + "Called for textual element content. The data is passed as a rod, with all entity references resolved. It is possible that the character content of an element is reported via multiple subsequent calls to this generic function.") - (:method ((handler t) data) (declare (ignore data)) nil)) -(defgeneric processing-instruction (handler target data) - (:documentation "Called when a processing instruction is read. +(setf (documentation 'processing-instruction 'function) + "Called when a processing instruction is read. Both target and data are rods.") - (:method ((handler t) target data) (declare (ignore target data)) nil)) -(defgeneric end-prefix-mapping (handler prefix) - (:documentation "Called when a prefix -> namespace-uri mapping goes out of scope. +(setf (documentation 'end-prefix-mapping 'function) + "Called when a prefix -> namespace-uri mapping goes out of scope. This will always be called immediatly after the `end-element' event for the element on which the namespace is declared. The order of the @@ -276,147 +514,83 @@ circumstances, for example when they have to deal with qualified names in textual content. The parser will handle namespaces of elements and attributes on its own.") - (:method ((handler t) prefix) prefix nil)) -(defgeneric end-element (handler namespace-uri local-name qname) - (:documentation "Called to report the end of an element. +(setf (documentation 'end-element 'function) + "Called to report the end of an element. See the documentation for `start-element' for a description of the parameters.") - (:method ((handler t) namespace-uri local-name qname) - (declare (ignore namespace-uri local-name qname)) - nil)) -(defgeneric end-document (handler) - (:documentation "Called at the end of parsing a document. +(setf (documentation 'end-document 'function) + "Called at the end of parsing a document. This is always the last function called in the parsing process. [160 lines skipped] --- /project/cxml/cvsroot/cxml/xml/sax-proxy.lisp 2007/05/20 09:38:35 1.6 +++ /project/cxml/cvsroot/cxml/xml/sax-proxy.lisp 2007/10/14 17:50:11 1.7 @@ -8,7 +8,7 @@ (in-package :cxml) -(defclass broadcast-handler (sax:sax-parser-mixin) +(defclass broadcast-handler (sax:abstract-handler) ((handlers :initform nil :initarg :handlers :accessor broadcast-handler-handlers))) --- /project/cxml/cvsroot/cxml/xml/unparse.lisp 2007/08/05 11:16:15 1.20 +++ /project/cxml/cvsroot/cxml/xml/unparse.lisp 2007/10/14 17:50:12 1.21 @@ -69,7 +69,7 @@ ;;;; SINK: an xml output sink -(defclass sink () +(defclass sink (sax:content-handler) ((ystream :initarg :ystream :accessor sink-ystream) (width :initform 79 :initarg :width :accessor width) (canonical :initform nil :initarg :canonical :accessor canonical) @@ -561,6 +561,9 @@ (defmacro with-xml-output (sink &body body) `(invoke-with-xml-output (lambda () ,@body) ,sink)) +(defmacro with-output-sink ((var) &body body) + `(invoke-with-output-sink (lambda (,var) ,@body))) + (defun invoke-with-xml-output (fn sink) (let ((*sink* sink) (*current-element* nil) @@ -570,6 +573,10 @@ (funcall fn) (sax:end-document *sink*))) +(defun invoke-with-output-sink (fn) + (maybe-emit-start-tag) + (funcall fn *sink*)) + (defmacro with-element (qname &body body) `(invoke-with-element (lambda () ,@body) ,qname))

1 0

[cxml-cvs] CVS cxml/dom
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/cxml/dom In directory clnet:/tmp/cvs-serv8803/dom Modified Files: dom-builder.lisp Log Message: SAX overhaul for HAX integration. * dom/dom-builder.lisp (DOM-BUILDER): Inherit from sax:content-handler. * klacks/klacks-impl.lisp (KLACKS-DTD-HANDLER): Inherit from sax:default-handler. * klacks/klacks.lisp (KLACKS:SERIALIZE-EVENT): Bugfix -- call start-cdata and end-cdata on the handler, not the source. * xml/package.lisp: New export WITH-OUTPUT-SINK. * xml/sax-handler.lisp (SAX): New exports abstract-handler, content-handler, default-handler. (STANDARD-ATTRIBUTE): Renamed from attribute. (ATTRIBUTE-NAMESPACE-URI, ATTRIBUTE-LOCAL-NAME, ATTRIBUTE-QNAME, ATTRIBUTE-VALUE, ATTRIBUTE-SPECIFIED-P): Wrapper methods for standard-attribute. Wrapper methods for hax:standard-attribute. (all events): pulled into a common define-event form. New dummy method on null. Added a warning to the default method. New error method on abstract-handler. New dummy method on the respective default handler classes. * xml/sax-proxy.lisp (BROADCAST-HANDLER): Inherit from abstract-handler, not sax-parser-mixin. * xml/unparse.lisp (sink): Inherit from sax:content-handler. (WITH-OUTPUT-SINK): New macro. (INVOKE-WITH-OUTPUT-SINK): New function. --- /project/cxml/cvsroot/cxml/dom/dom-builder.lisp 2007/10/03 15:17:08 1.14 +++ /project/cxml/cvsroot/cxml/dom/dom-builder.lisp 2007/10/14 17:50:11 1.15 @@ -15,7 +15,7 @@ (in-package :utf8-dom) -(defclass dom-builder () +(defclass dom-builder (sax:content-handler) ((document :initform nil :accessor document) (element-stack :initform '() :accessor element-stack) (internal-subset :accessor internal-subset)

1 0

[cxml-cvs] CVS cxml/klacks
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/cxml/klacks In directory clnet:/tmp/cvs-serv8803/klacks Modified Files: klacks-impl.lisp klacks.lisp Log Message: SAX overhaul for HAX integration. * dom/dom-builder.lisp (DOM-BUILDER): Inherit from sax:content-handler. * klacks/klacks-impl.lisp (KLACKS-DTD-HANDLER): Inherit from sax:default-handler. * klacks/klacks.lisp (KLACKS:SERIALIZE-EVENT): Bugfix -- call start-cdata and end-cdata on the handler, not the source. * xml/package.lisp: New export WITH-OUTPUT-SINK. * xml/sax-handler.lisp (SAX): New exports abstract-handler, content-handler, default-handler. (STANDARD-ATTRIBUTE): Renamed from attribute. (ATTRIBUTE-NAMESPACE-URI, ATTRIBUTE-LOCAL-NAME, ATTRIBUTE-QNAME, ATTRIBUTE-VALUE, ATTRIBUTE-SPECIFIED-P): Wrapper methods for standard-attribute. Wrapper methods for hax:standard-attribute. (all events): pulled into a common define-event form. New dummy method on null. Added a warning to the default method. New error method on abstract-handler. New dummy method on the respective default handler classes. * xml/sax-proxy.lisp (BROADCAST-HANDLER): Inherit from abstract-handler, not sax-parser-mixin. * xml/unparse.lisp (sink): Inherit from sax:content-handler. (WITH-OUTPUT-SINK): New macro. (INVOKE-WITH-OUTPUT-SINK): New function. --- /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/08/23 23:16:00 1.12 +++ /project/cxml/cvsroot/cxml/klacks/klacks-impl.lisp 2007/10/14 17:50:11 1.13 @@ -413,7 +413,7 @@ ;;;; terrible kludges -(defclass klacks-dtd-handler () +(defclass klacks-dtd-handler (sax:default-handler) ((handler-source :initarg :source :reader handler-source) (internal-subset-p :initform nil :accessor handler-internal-subset-p))) --- /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/10/03 15:22:57 1.9 +++ /project/cxml/cvsroot/cxml/klacks/klacks.lisp 2007/10/14 17:50:11 1.10 @@ -96,9 +96,9 @@ (:characters (cond ((klacks:current-cdata-section-p source) - (sax:start-cdata source) + (sax:start-cdata handler) (sax:characters handler a) - (sax:end-cdata source)) + (sax:end-cdata handler)) (T (sax:characters handler a)))) (:processing-instruction

1 0

[cxml-cvs] CVS closure-common
by dlichteblau 14 Oct '07

14 Oct '07

Update of /project/cxml/cvsroot/closure-common In directory clnet:/tmp/cvs-serv5860 Modified Files: closure-common.asd Added Files: hax.lisp Log Message: New package HAX. * closure-common.asd: Added hax.lisp * hax.lisp: New. --- /project/cxml/cvsroot/closure-common/closure-common.asd 2007/10/09 13:08:49 1.1 +++ /project/cxml/cvsroot/closure-common/closure-common.asd 2007/10/14 17:29:43 1.2 @@ -53,5 +53,5 @@ #-x&y-streams-are-stream (:file "xstream") #-x&y-streams-are-stream (:file "ystream") #+x&y-streams-are-stream (:file #+scl "stream-scl") - ) + (:file "hax")) :depends-on (#-scl :trivial-gray-streams)) --- /project/cxml/cvsroot/closure-common/hax.lisp 2007/10/14 17:29:43 NONE +++ /project/cxml/cvsroot/closure-common/hax.lisp 2007/10/14 17:29:43 1.1 ;;; -*- show-trailing-whitespace: t; indent-tabs: nil -*- ;;; --------------------------------------------------------------------------- ;;; Title: An event API for the HTML parser, inspired by SAX ;;; Created: 2007-10-14 ;;; Author: David Lichteblau ;;; License: BSD ;;; --------------------------------------------------------------------------- ;;; (c) copyright 2005,2007 David Lichteblau ;;; Redistribution and use in source and binary forms, with or without ;;; modification, are permitted provided that the following conditions are ;;; met: ;;; ;;; 1. Redistributions of source code must retain the above copyright ;;; notice, this list of conditions and the following disclaimer. ;;; ;;; 2. Redistributions in binary form must reproduce the above copyright ;;; notice, this list of conditions and the following disclaimer in the ;;; documentation and/or other materials provided with the distribution ;;; ;;; THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED ;;; WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ;;; MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ;;; IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, ;;; INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ;;; (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ;;; SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ;;; HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, ;;; STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING ;;; IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ;;; POSSIBILITY OF SUCH DAMAGE. (defpackage :hax (:use :common-lisp) (:export #:abstract-handler #:default-handler #:make-attribute #:standard-attribute #:find-attribute #:attribute-name #:attribute-value #:attribute-specified-p #:start-document #:start-element #:characters #:end-element #:end-document #:comment)) (in-package :hax) ;;;; ATTRIBUTE (defgeneric attribute-name (attribute)) (defgeneric attribute-value (attribute)) (defgeneric attribute-specified-p (attribute)) (defclass standard-attribute () ((name :initarg :name :accessor attribute-name) (value :initarg :value :accessor attribute-value) (specified-p :initarg :specified-p :accessor attribute-specified-p))) (defun make-attribute (name value &optional (specified-p t)) (make-instance 'standard-attribute :name name :value value :specified-p specified-p)) (defun %rod= (x y) ;; allow rods *and* strings *and* null (cond ((zerop (length x)) (zerop (length y))) ((zerop (length y)) nil) ((stringp x) (string= x y)) (t (runes:rod= x y)))) (defun find-attribute (name attrs) (find name attrs :key #'attribute-name :test #'%rod=)) ;;;; ABSTRACT-HANDLER and DEFAULT-HANDLER (defclass abstract-handler () ()) (defclass default-handler (abstract-handler) ()) (defgeneric start-document (handler name public-id system-id) (:method ((handler null) name public-id system-id) (declare (ignore name public-id system-id)) nil) (:method ((handler default-handler) name public-id system-id) (declare (ignore name public-id system-id)) nil)) (defgeneric start-element (handler name attributes) (:method ((handler null) name attributes) (declare (ignore name attributes)) nil) (:method ((handler default-handler) name attributes) (declare (ignore name attributes)) nil)) (defgeneric characters (handler data) (:method ((handler null) data) (declare (ignore data)) nil) (:method ((handler default-handler) data) (declare (ignore data)) nil)) (defgeneric end-element (handler name) (:method ((handler null) name) (declare (ignore name)) nil) (:method ((handler default-handler) name) (declare (ignore name)) nil)) (defgeneric end-document (handler) (:method ((handler null)) nil) (:method ((handler default-handler)) nil)) (defgeneric comment (handler data) (:method ((handler null) data) (declare (ignore data)) nil) (:method ((handler default-handler) data) (declare (ignore data)) nil))

1 0

[cxml-cvs] CVS closure-common
by dlichteblau 09 Oct '07

09 Oct '07

Update of /project/cxml/cvsroot/closure-common In directory clnet:/tmp/cvs-serv20249 Added Files: closure-common.asd Log Message: added missing .asd file --- /project/cxml/cvsroot/closure-common/closure-common.asd 2007/10/09 13:08:49 NONE +++ /project/cxml/cvsroot/closure-common/closure-common.asd 2007/10/09 13:08:49 1.1 (defpackage :closure-common-system (:use :asdf :cl) (:export #:*utf8-runes-readtable*)) (in-package :closure-common-system) (defvar *utf8-runes-readtable*) (defclass closure-source-file (cl-source-file) ()) #+sbcl (defmethod perform :around ((o compile-op) (s closure-source-file)) ;; shut up already. Correctness first. (handler-bind ((sb-ext:compiler-note #'muffle-warning)) (let (#+sbcl (*compile-print* nil)) (call-next-method)))) #-(or rune-is-character rune-is-integer) (progn (format t "~&;;; Checking for wide character support...") (force-output) (pushnew (dotimes (x 65536 (progn (format t " ok, characters have at least 16 bits.~%") :rune-is-character)) (unless (or (<= #xD800 x #xDFFF) (and (< x char-code-limit) (code-char x))) (print (code-char x)) (format t " no, reverting to octet strings.~%") (return :rune-is-integer))) *features*)) #-rune-is-character (format t "~&;;; Building Closure with (UNSIGNED-BYTE 16) RUNES~%") #+rune-is-character (format t "~&;;; Building Closure with CHARACTER RUNES~%") (defsystem :closure-common :default-component-class closure-source-file :serial t :components ((:file "package") (:file "definline") (:file runes :pathname #-rune-is-character "runes" #+rune-is-character "characters") #+rune-is-integer (:file "utf8") (:file "syntax") #-x&y-streams-are-stream (:file "encodings") #-x&y-streams-are-stream (:file "encodings-data") #-x&y-streams-are-stream (:file "xstream") #-x&y-streams-are-stream (:file "ystream") #+x&y-streams-are-stream (:file #+scl "stream-scl") ) :depends-on (#-scl :trivial-gray-streams))

1 0

[cxml-cvs] CVS cxml
by dlichteblau 07 Oct '07

07 Oct '07

Update of /project/cxml/cvsroot/cxml In directory clnet:/tmp/cvs-serv26052 Removed Files: runes.asd Log Message: removed runes.asd

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

cxml-cvs October 2007