From dlichteblau at common-lisp.net Sat Sep 9 10:06:17 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sat, 9 Sep 2006 06:06:17 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060909100617.7B8C279000@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv13931
Modified Files:
sax-handler.lisp
Log Message:
typo in start-element docstring
--- /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2006/08/28 13:41:41 1.5
+++ /project/cxml/cvsroot/cxml/xml/sax-handler.lisp 2006/09/09 10:06:17 1.6
@@ -181,7 +181,7 @@
local-name properties, the same rules as for the element name
apply. Additionally, namespace-declaring attributes (those whose name
is \"xmlns\" or starts with \"xmlns:\") are only included if
-*namespace-prefixes* is non-nil.")
+*include-xmlns-attributes* is non-nil.")
(:method ((handler t) namespace-uri local-name qname attributes)
(declare (ignore namespace-uri local-name qname attributes))
nil))
From dlichteblau at common-lisp.net Sun Sep 10 14:52:44 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sun, 10 Sep 2006 10:52:44 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/dom
Message-ID: <20060910145244.9ACAA2F0C1@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/dom
In directory clnet:/tmp/cvs-serv3686/dom
Modified Files:
dom-impl.lisp
Log Message:
ANSI conformance fixes
--- /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/08/28 09:04:51 1.41
+++ /project/cxml/cvsroot/cxml/dom/dom-impl.lisp 2006/09/10 14:52:44 1.42
@@ -587,9 +587,11 @@
(setf (slot-value new-child 'parent) node)
new-child))
-(defmethod dom:insert-before ((node node) (fragment document-fragment) ref-child)
- (dovector (child (dom:child-nodes fragment))
- (dom:insert-before node child ref-child))
+(defmethod dom:insert-before
+ ((node node) (fragment document-fragment) ref-child)
+ (let ((children (dom:child-nodes fragment)))
+ (cxml::while (plusp (length children))
+ (dom:insert-before node (elt children 0) ref-child)))
fragment)
(defmethod dom:replace-child ((node node) (new-child node) (old-child node))
@@ -631,8 +633,9 @@
(defmethod dom:append-child ((node node) (new-child document-fragment))
(assert-writeable node)
- (dovector (child (dom:child-nodes new-child))
- (dom:append-child node child))
+ (let ((children (dom:child-nodes new-child)))
+ (cxml::while (plusp (length children))
+ (dom:append-child node (elt children 0))))
new-child)
;; was auf node noch implemetiert werden muss:
From dlichteblau at common-lisp.net Sun Sep 10 14:52:44 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sun, 10 Sep 2006 10:52:44 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060910145244.CE84830010@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv3686/xml
Modified Files:
xml-name-rune-p.lisp
Log Message:
ANSI conformance fixes
--- /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp 2006/08/20 11:56:11 1.7
+++ /project/cxml/cvsroot/cxml/xml/xml-name-rune-p.lisp 2006/09/10 14:52:44 1.8
@@ -105,15 +105,19 @@
(declare (type simple-vector range-vector))
;;we were always dealing with a sorted vector... bin search it
- (loop with start = 0
- with end = (length range-vector)
- while (< start end)
- for mid-index = (+ start (floor (- end start) 2))
- for (mid-item-low mid-item-high) = (aref range-vector mid-index)
- if (< mid-item-high code) do (setf start (1+ mid-index))
- else if (< code mid-item-low) do (setf end mid-index)
- else do (return T)
- finally (return nil)))
+ (let ((start 0)
+ (end (length range-vector)))
+ (while (< start end)
+ (let ((mid-index (+ start (floor (- end start) 2))))
+ (destructuring-bind (mid-item-low mid-item-high)
+ (aref range-vector mid-index)
+ (cond
+ ((< mid-item-high code)
+ (setf start (1+ mid-index)))
+ ((< code mid-item-low)
+ (setf end mid-index))
+ (t
+ (return t))))))))
(name-start-rune-p (rune)
(or (letter-rune-p rune)
From dlichteblau at common-lisp.net Sun Sep 10 14:55:29 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sun, 10 Sep 2006 10:55:29 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml
Message-ID: <20060910145529.6D62330010@common-lisp.net>
Update of /project/cxml/cvsroot/cxml
In directory clnet:/tmp/cvs-serv4145
Modified Files:
README.html
Log Message:
die letzten paar nicht-ascii zeichen raus, macht das leben einfacher
--- /project/cxml/cvsroot/cxml/README.html 2006/08/20 14:59:34 1.25
+++ /project/cxml/cvsroot/cxml/README.html 2006/09/10 14:55:29 1.26
@@ -114,7 +114,8 @@
Namespace normalizer bugfixes.
Minor changes: clone-node on document as an extension. DOM
class hierarchy reworked. New function parse-empty-document.
- Fixed the DOM serializer to not throw away local names.
+ Fixed the DOM serializer to not throw away local names.
+ ANSI conformance fixes.
rel-2006-01-05
From dlichteblau at common-lisp.net Sun Sep 10 14:55:29 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sun, 10 Sep 2006 10:55:29 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/doc
Message-ID: <20060910145529.9BA59431BD@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/doc
In directory clnet:/tmp/cvs-serv4145/doc
Modified Files:
installation.html
Log Message:
die letzten paar nicht-ascii zeichen raus, macht das leben einfacher
--- /project/cxml/cvsroot/cxml/doc/installation.html 2006/01/23 21:53:24 1.10
+++ /project/cxml/cvsroot/cxml/doc/installation.html 2006/09/10 14:55:29 1.11
@@ -85,11 +85,6 @@
-
- SBCL and CLISP will trip over cxml's non-ASCII source files
- unless run using a suitable locale configuration
- (LC_CTYPE=en_US.ISO-8859-1 should help).
-
- -
The SBCL port uses 16 bit surrogate characters instead of taking
advantage of SBCL's full 21 bit character support.
From dlichteblau at common-lisp.net Sun Sep 10 14:55:29 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sun, 10 Sep 2006 10:55:29 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/runes
Message-ID: <20060910145529.E8B4744055@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/runes
In directory clnet:/tmp/cvs-serv4145/runes
Modified Files:
xstream.lisp
Log Message:
die letzten paar nicht-ascii zeichen raus, macht das leben einfacher
--- /project/cxml/cvsroot/cxml/runes/xstream.lisp 2005/12/30 14:21:47 1.5
+++ /project/cxml/cvsroot/cxml/runes/xstream.lisp 2006/09/10 14:55:29 1.6
@@ -5,7 +5,7 @@
;;; Author: Gilbert Baumann
;;; License: Lisp-LGPL (See file COPYING for details).
;;; ---------------------------------------------------------------------------
-;;; ?? copyright 1999 by Gilbert Baumann
+;;; (c) copyright 1999 by Gilbert Baumann
;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
From dlichteblau at common-lisp.net Sun Sep 10 14:55:30 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sun, 10 Sep 2006 10:55:30 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060910145530.48ACD44058@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv4145/xml
Modified Files:
xml-parse.lisp
Log Message:
die letzten paar nicht-ascii zeichen raus, macht das leben einfacher
--- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/08/20 13:58:31 1.62
+++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/09/10 14:55:30 1.63
@@ -7,11 +7,11 @@
;;; Author: David Lichteblau
;;; License: Lisp-LGPL (See file COPYING for details).
;;; ---------------------------------------------------------------------------
-;;; ?? copyright 1999 by Gilbert Baumann
-;;; ?? copyright 2003 by Henrik Motakef
-;;; ?? copyright 2004 knowledgeTools Int. GmbH
-;;; ?? copyright 2004 David Lichteblau
-;;; ?? copyright 2005 David Lichteblau
+;;; (c) copyright 1999 by Gilbert Baumann
+;;; (c) copyright 2003 by Henrik Motakef
+;;; (c) copyright 2004 knowledgeTools Int. GmbH
+;;; (c) copyright 2004 David Lichteblau
+;;; (c) copyright 2005 David Lichteblau
;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
@@ -3177,7 +3177,7 @@
(cond ((%= rptr fptr)
;; underflow -- hmm inject the scratch-pad with what we
;; read and continue, while using read-rune and collecting
- ;; d.h. besser w??re hier auch while-reading zu benutzen.
+ ;; d.h. besser waere hier auch while-reading zu benutzen.
(setf (xstream-read-ptr ,input) rptr)
(multiple-value-setq (,res ,res-start ,res-end)
(with-rune-collector/raw (collect)
From dlichteblau at common-lisp.net Wed Sep 13 15:58:37 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Wed, 13 Sep 2006 11:58:37 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml
Message-ID: <20060913155837.5782619000@common-lisp.net>
Update of /project/cxml/cvsroot/cxml
In directory clnet:/tmp/cvs-serv4835
Modified Files:
cxml.asd
Log Message:
xml-name-rune-p.lisp depends on util.lisp now
--- /project/cxml/cvsroot/cxml/cxml.asd 2006/08/20 11:56:11 1.12
+++ /project/cxml/cvsroot/cxml/cxml.asd 2006/09/13 15:58:36 1.13
@@ -62,7 +62,7 @@
((:file "package")
(:file "util" :depends-on ("package"))
(:file "sax-handler")
- (:file "xml-name-rune-p" :depends-on ("package"))
+ (:file "xml-name-rune-p" :depends-on ("package" "util"))
(:file "split-sequence" :depends-on ("package"))
(:file "xml-parse" :depends-on ("package" "util" "sax-handler" "split-sequence" "xml-name-rune-p"))
(:file "unparse" :depends-on ("xml-parse"))
From dlichteblau at common-lisp.net Sat Sep 16 07:52:59 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sat, 16 Sep 2006 03:52:59 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml
Message-ID: <20060916075259.C838B70210@common-lisp.net>
Update of /project/cxml/cvsroot/cxml
In directory clnet:/tmp/cvs-serv18383
Modified Files:
README.html
Log Message:
fixed the long-standing bug with start tags in :DTD behaviour
--- /project/cxml/cvsroot/cxml/README.html 2006/09/10 14:55:29 1.26
+++ /project/cxml/cvsroot/cxml/README.html 2006/09/16 07:52:59 1.27
@@ -115,7 +115,8 @@
- Minor changes: clone-node on document as an extension. DOM
class hierarchy reworked. New function parse-empty-document.
Fixed the DOM serializer to not throw away local names.
- ANSI conformance fixes.
+ Fixed a long-standing bug in the parser for documents without a
+ doctype. ANSI conformance fixes.
rel-2006-01-05
From dlichteblau at common-lisp.net Sat Sep 16 07:53:00 2006
From: dlichteblau at common-lisp.net (dlichteblau)
Date: Sat, 16 Sep 2006 03:53:00 -0400 (EDT)
Subject: [cxml-cvs] CVS cxml/xml
Message-ID: <20060916075300.6705372080@common-lisp.net>
Update of /project/cxml/cvsroot/cxml/xml
In directory clnet:/tmp/cvs-serv18383/xml
Modified Files:
xml-parse.lisp
Log Message:
fixed the long-standing bug with start tags in :DTD behaviour
--- /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/09/10 14:55:30 1.63
+++ /project/cxml/cvsroot/cxml/xml/xml-parse.lisp 2006/09/16 07:52:59 1.64
@@ -1278,6 +1278,11 @@
(mu target)))
(t
(values :PI (cons target content))))))
+ ((eq *data-behaviour* :DTD)
+ (unread-rune d input)
+ (unless (or (rune= #// d) (name-start-rune-p d))
+ (wf-error zinput "Expected '!' or '?' after '<' in DTD."))
+ (values :seen-< nil))
((rune= #// d)
(let ((c (peek-rune input)))
(cond ((name-start-rune-p c)
@@ -2605,6 +2610,11 @@
(setf (model-stack *ctx*) (list (make-root-model root))))
;; element
(let ((*data-behaviour* :DOC))
+ (when (eq (peek-token input) :seen-<)
+ (multiple-value-bind (c s)
+ (read-token-after-|<| input (car (zstream-input-stack input)))
+ (setf (zstream-token-category input) c
+ (zstream-token-semantic input) s)))
(p/element input))
;; optional Misc*
(p/misc*-2 input)