From 938dca13b5d49edd6f7e20be8fe840ed77a85a9d Mon Sep 17 00:00:00 2001
From: dlichteblau <dlichteblau>
Date: Mon, 28 Nov 2005 22:33:29 +0000
Subject: [PATCH] +      <li>Gilbert Baumann has clarified the license as
 Lisp-LGPL.</li>

---
 runes/COPYING => COPYING |   0
 README.html              |   3 +-
 dom/COPYING              | 459 ---------------------------------------
 dom/dom-builder.lisp     |   2 +-
 dom/dom-impl.lisp        |   2 +-
 dom/dom-sax.lisp         |  35 ++-
 dom/package.lisp         |   9 +-
 runes/characters.lisp    |   2 +-
 runes/definline.lisp     |   2 +-
 runes/runes.lisp         |   2 +-
 runes/syntax.lisp        |  17 +-
 runes/xstream.lisp       |   2 +-
 xml/COPYING              | 459 ---------------------------------------
 xml/catalog.lisp         | 374 +++++++++++++++++++++++--------
 xml/characters.lisp      |  82 ++++---
 xml/package.lisp         |   2 +-
 xml/recoder.lisp         |   8 +
 xml/sax-proxy.lisp       |   2 +-
 xml/unparse.lisp         |   2 +-
 xml/util.lisp            |   2 +-
 xml/xml-name-rune-p.lisp |   2 +-
 xml/xml-parse.lisp       |   2 +-
 xml/xmls-compat.lisp     | 103 ++++++---
 23 files changed, 456 insertions(+), 1117 deletions(-)
 rename runes/COPYING => COPYING (100%)
 delete mode 100644 dom/COPYING
 delete mode 100644 xml/COPYING

diff --git a/runes/COPYING b/COPYING
similarity index 100%
rename from runes/COPYING
rename to COPYING
diff --git a/README.html b/README.html
index 3688054..cbbee55 100644
--- a/README.html
+++ b/README.html
@@ -75,7 +75,7 @@
     </p>
 
     <p>
-      CXML is licensed under (L)LGPL.
+      CXML is licensed under Lisp-LGPL.
     </p>
 
     <p>
@@ -96,6 +96,7 @@
         reported as instances of <tt>well-formedness-violation</tt>.  We
         also print line number information.
       </li>
+      <li>Gilbert Baumann has clarified the license as Lisp-LGPL.</li>
     </ul>
     <p class="nomargin"><tt>rel-2005-06-25</tt></p>
     <ul class="nomargin">
diff --git a/dom/COPYING b/dom/COPYING
deleted file mode 100644
index 5615459..0000000
--- a/dom/COPYING
+++ /dev/null
@@ -1,459 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
diff --git a/dom/dom-builder.lisp b/dom/dom-builder.lisp
index 7a8cdce..dc16c04 100644
--- a/dom/dom-builder.lisp
+++ b/dom/dom-builder.lisp
@@ -1,6 +1,6 @@
 ;;;; dom-builder.lisp -- DOM-building SAX handler
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 ;;;;
 ;;;; Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
diff --git a/dom/dom-impl.lisp b/dom/dom-impl.lisp
index e06e1d5..385eb95 100644
--- a/dom/dom-impl.lisp
+++ b/dom/dom-impl.lisp
@@ -1,6 +1,6 @@
 ;;;; dom-impl.lisp -- Implementation of DOM 1 Core
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 ;;;;
 ;;;; Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
diff --git a/dom/dom-sax.lisp b/dom/dom-sax.lisp
index 75a90e6..97fbce0 100644
--- a/dom/dom-sax.lisp
+++ b/dom/dom-sax.lisp
@@ -1,3 +1,11 @@
+;;;; dom-sax.lisp -- DOM walker
+;;;;
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
+;;;; See file COPYING for details.
+;;;;
+;;;; Author: David Lichteblau <david@lichteblau.com>
+;;;; Copyright (c) 2004 knowledgeTools Int. GmbH
+
 (in-package :dom-impl)
 
 (defun dom:map-document
@@ -8,15 +16,20 @@
   (let ((doctype (dom:doctype document)))
     (when doctype
       (sax:start-dtd handler (dom:name doctype) nil nil)
-      (let ((ns (dom:notations doctype)))
+      ;; need notations for canonical mode 2
+      (let* ((ns (dom:notations doctype))
+             (a (make-array (dom:length ns))))
+        ;; get them
         (dotimes (k (dom:length ns))
-          (let ((n (dom:item ns k)))
-            (sax:notation-declaration handler
-                                      (dom:name n)
-                                      (dom:public-id n)
-                                      (dom:system-id n)))
-          ;; fixme: entities!
-          )
+          (setf (elt a k) (dom:item ns k)))
+        ;; sort them 
+        (setf a (sort a #'rod< :key #'dom:name))
+        (loop for n across a do
+              (sax:notation-declaration handler
+                                        (dom:name n)
+                                        (dom:public-id n)
+                                        (dom:system-id n)))
+        ;; fixme: entities!
         (sax:end-dtd handler))))
   (labels ((walk (node)
              (dom:do-node-list (child (dom:child-nodes node))
@@ -53,8 +66,8 @@
       (when (and (or defaultp (dom:specified a))
                  (or xmlnsp (not (cxml::xmlns-attr-p (dom:name a)))))
         (push
-         (cxml::make-attribute :qname (dom:name a)
-                               :value (dom:value a)
-                               :specified-p (dom:specified a))
+         (sax:make-attribute :qname (dom:name a)
+                             :value (dom:value a)
+                             :specified-p (dom:specified a))
          results)))
     (reverse results)))
diff --git a/dom/package.lisp b/dom/package.lisp
index 971ed0c..eb5cc52 100644
--- a/dom/package.lisp
+++ b/dom/package.lisp
@@ -1,3 +1,8 @@
+;;;; package.lisp -- Paketdefinition
+;;;;
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
+;;;; See file COPYING for details.
+
 (in-package :cl-user)
 
 (defpackage :dom
@@ -108,4 +113,6 @@
    #:named-node-map-p
 
    #:map-node-list
-   #:do-node-list))
+   #:do-node-list
+   #:create-document
+   #:map-document))
diff --git a/runes/characters.lisp b/runes/characters.lisp
index 58674f5..11195b3 100644
--- a/runes/characters.lisp
+++ b/runes/characters.lisp
@@ -3,7 +3,7 @@
 ;;;
 ;;; derived from runes.lisp, (c) copyright 1998,1999 by Gilbert Baumann
 ;;;
-;;; License: LLGPL (See file COPYING for details).
+;;; License: Lisp-LGPL (See file COPYING for details).
 ;;;
 ;;; This code is free software; you can redistribute it and/or modify it
 ;;; under the terms of the version 2.1 of the GNU Lesser General Public
diff --git a/runes/definline.lisp b/runes/definline.lisp
index 34d2644..696cc15 100644
--- a/runes/definline.lisp
+++ b/runes/definline.lisp
@@ -3,7 +3,7 @@
 ;;;     Title: definline
 ;;;   Created: 1999-05-25 22:32
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
-;;;   License: LLGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  (c) copyright 1999 by Gilbert Baumann
 
diff --git a/runes/runes.lisp b/runes/runes.lisp
index 94b8f81..4f7f2be 100644
--- a/runes/runes.lisp
+++ b/runes/runes.lisp
@@ -3,7 +3,7 @@
 ;;;     Title: Unicode strings (called RODs)
 ;;;   Created: 1999-05-25 22:29
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
-;;;   License: LLGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  (c) copyright 1998,1999 by Gilbert Baumann
 
diff --git a/runes/syntax.lisp b/runes/syntax.lisp
index 1c35251..34ccfbe 100644
--- a/runes/syntax.lisp
+++ b/runes/syntax.lisp
@@ -3,7 +3,7 @@
 ;;;     Title: Unicode strings (called RODs)
 ;;;   Created: 1999-05-25 22:29
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
-;;;   License: LLGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  (c) copyright 1998,1999 by Gilbert Baumann
 
@@ -178,19 +178,4 @@
                (format stream "\\u~4,'0X" x))))
   (princ #\" stream))
 
-#-rune-is-character
-(set-pprint-dispatch '(satisfies really-rod-p) #'rod-printer)
-
 (set-dispatch-macro-character #\# #\" 'rod-reader)
-
-#||
-(defun longish-array-p (arr)
-  (and (arrayp arr)
-       (> (array-total-size arr) 10)))
-
-(set-pprint-dispatch '(satisfies longish-array-p)
-                     #'(lambda (stream object)
-                         (let ((*print-array* nil)
-                               (*print-pretty* nil))
-                           (prin1 object stream))))
-||#
diff --git a/runes/xstream.lisp b/runes/xstream.lisp
index ea5049e..5798ecd 100644
--- a/runes/xstream.lisp
+++ b/runes/xstream.lisp
@@ -3,7 +3,7 @@
 ;;;     Title: Fast streams
 ;;;   Created: 1999-07-17
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
-;;;   License: LGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  © copyright 1999 by Gilbert Baumann
 
diff --git a/xml/COPYING b/xml/COPYING
deleted file mode 100644
index 5615459..0000000
--- a/xml/COPYING
+++ /dev/null
@@ -1,459 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
diff --git a/xml/catalog.lisp b/xml/catalog.lisp
index 3c752e8..5e576dd 100644
--- a/xml/catalog.lisp
+++ b/xml/catalog.lisp
@@ -1,6 +1,6 @@
 ;;;; catalogs.lisp -- XML Catalogs  -*- Mode: Lisp; readtable: runes -*-
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 ;;;;
 ;;;; Developed 2004 for headcraft - http://headcraft.de/
@@ -15,27 +15,208 @@
 ;;;     and will will fail to parse files using other parser's extensions.
 ;;;     (Jedenfalls behauptet das die Spec.)
 ;;;     A long-term solution might be an XML Schema validator.
-;;;
-;;; XXX Das mit dem :dtd geht natuerlich gar nicht.  Die Option muss weg. 
 
-(defvar *prefer* nil)
-(defvar *catalog*
+(defvar *prefer* :public)
+(defvar *default-catalog*
     '(;; libxml standard
       "/etc/xml/catalog"
       ;; FreeBSD
       "/usr/local/share/xml/catalog.ports"))
 
-(defparameter *catalog-dtd* nil)
+(defstruct (catalog (:constructor %make-catalog ()))
+  main-files
+  (dtd-cache (make-dtd-cache))
+  (file-table (puri:make-uri-space)))
 
-(defun parse-catalog (files)
+(defstruct (entry-file (:conc-name ""))
+  (system-entries)                      ;extid 2
+  (rewrite-system-entries)              ;      3
+  (delegate-system-entries)             ;      4
+  (public-entries)                      ;      5
+  (delegate-public-entries)             ;      6
+  (uri-entries)                         ;uri 2
+  (rewrite-uri-entries)                 ;    3
+  (delegate-uri-entries)                ;    4
+  (next-catalog-entries)                ;    5/7
+  )
+
+(defun starts-with-p (string prefix)
+  (let ((mismatch (mismatch string prefix)))
+    (or (null mismatch) (= mismatch (length prefix)))))
+
+(defun normalize-public (str)
+  (setf str (rod-to-utf8-string (rod str)))
+  (flet ((whitespacep (c)
+           (find c #.(map 'string #'code-char '(#x9 #xa #xd #x20)))))
+    (let ((start (position-if-not #'whitespacep str))
+          (end (position-if-not #'whitespacep str :from-end t))
+          (spacep nil))
+      (with-output-to-string (out)
+        (when start
+          (loop for i from start to end do
+                (let ((c (char str i)))
+                  (cond
+                    ((whitespacep c)
+                      (unless spacep
+                        (setf spacep t)
+                        (write-char #\space out)))
+                    (t
+                      (setf spacep nil)
+                      (write-char c out))))))))))
+
+(defun normalize-uri (str)
+  (when (typep str 'puri:uri)
+    (setf str (puri:render-uri str nil)))
+  (setf str (rod-to-utf8-string (rod str)))
+  (with-output-to-string (out)
+    (loop for ch across str do
+          (let ((c (char-code ch)))
+            (if (< c 15)
+                (write-string (string-upcase (format nil "%~2,'0X" c)) out)
+                (write-char ch out))))))
+
+(defun unwrap-publicid (str)
+  (normalize-public
+   (with-output-to-string (out)
+     (let ((i (length "urn:publicid:"))
+           (n (length str)))
+       (while (< i n)
+         (let ((c (char str i)))
+           (case c
+             (#\+ (write-char #\space out))
+             (#\: (write-string "//" out))
+             (#\; (write-string "::" out))
+             (#\%
+               (let ((code
+                      (parse-integer str
+                                     :start (+ i 1)
+                                     :end (+ i 3)
+                                     :radix 16)))
+                 (write-char (code-char code) out))
+               (incf i 2))
+             (t (write-char c out))))
+         (incf i))))))
+
+(defun match-exact (key table &optional check-prefer)
+  (dolist (pair table)
+    (destructuring-bind (from to &optional prefer) pair
+      (when (and (equal key from) (or (not check-prefer) (eq prefer :public)))
+        (return to)))))
+
+(defun match-prefix/rewrite (key table &optional check-prefer)
+  (let ((match nil)
+        (match-length -1))
+    (dolist (pair table)
+      (destructuring-bind (from to &optional prefer) pair
+        (when (and (or (not check-prefer) (eq prefer :public))
+                   (starts-with-p key from)
+                   (> (length from) match-length))
+          (setf match-length (length from))
+          (setf match to))))
+    (if match
+        (concatenate 'string
+          match
+          (subseq key match-length))
+        nil)))
+
+(defun match-prefix/sorted (key table &optional check-prefer)
   (let ((result '()))
-    (loop
+    (dolist (pair table)
+      (destructuring-bind (from to &optional prefer) pair
+        (when (and (or (not check-prefer) (eq prefer :public))
+                   (starts-with-p key from))
+          (push (cons (length from) to) result))))
+    (mapcar #'cdr (sort result #'> :key #'car))))
+
+(defun resolve-extid (public system catalog)
+  (when public (setf public (normalize-public public)))
+  (when system (setf system (normalize-uri system)))
+  (when (and system (starts-with-p system "urn:publicid:"))
+    (let ((new-public (unwrap-publicid system)))
+      (assert (or (null public) (equal public new-public)))
+      (setf public new-public
+            system nil)))
+  (let ((files (catalog-main-files catalog))
+        (seen '()))
+    (while files
+      (let ((file (pop files))
+            (delegates nil))
+        (unless (typep file 'entry-file)
+          (setf file (find-catalog-file file catalog)))
+        (unless (or (null file) (member file seen))
+          (push file seen)
+          (when system
+            (let ((result
+                   (or (match-exact system (system-entries file))
+                       (match-prefix/rewrite
+                        system
+                        (rewrite-system-entries file)))))
+              (when result
+                (return result))
+              (setf delegates
+                    (match-prefix/sorted
+                     system
+                     (delegate-system-entries file)))))
+          (when (and public (not delegates))
+            (let* ((check-prefer (and system t))
+                   (result
+                    (match-exact public
+                                 (public-entries file)
+                                 check-prefer)))
+              (when result
+                (return result))
+              (setf delegates
+                    (match-prefix/sorted
+                     public
+                     (delegate-public-entries file)
+                     check-prefer))))
+          (if delegates
+              (setf files delegates)
+              (setf files (append (next-catalog-entries file) files))))))))
+
+(defun resolve-uri (uri catalog)
+  (setf uri (normalize-uri uri))
+  (when (starts-with-p uri "urn:publicid:")
+    (return-from resolve-uri
+      (resolve-extid (unwrap-publicid uri) nil catalog)))
+  (let ((files (catalog-main-files catalog))
+        (seen '()))
+    (while files
       (let ((file (pop files)))
-        (unless file
-          (return))
-        (multiple-value-bind (entries next) (parse-catalog-file file)
-          (setf result (append result entries))
-          (setf files (append next files)))))
+        (unless (typep file 'entry-file)
+          (setf file (find-catalog-file file catalog)))
+        (unless (or (null file) (member file seen))
+          (push file seen)
+          (let ((result
+                 (or (match-exact uri (uri-entries file))
+                     (match-prefix/rewrite uri (rewrite-uri-entries file)))))
+            (when result
+              (return result))
+            (let* ((delegate-entries
+                    (delegate-uri-entries file))
+                   (delegates
+                    (match-prefix/sorted uri delegate-entries)))
+              (if delegates
+                  (setf files delegates)
+                  (setf files (append (next-catalog-entries file) files))))))))))
+
+(defun find-catalog-file (uri catalog)
+  (setf uri (if (stringp uri) (safe-parse-uri uri) uri))
+  (let* ((*dtd-cache* (catalog-dtd-cache catalog))
+         (*cache-all-dtds* t)
+         (file (parse-catalog-file uri)))
+    (when file
+      (let ((interned (puri:intern-uri uri (catalog-file-table catalog))))
+        (setf (getf (puri:uri-plist interned) 'catalog) file)))
+    file))
+
+(defun make-catalog (&optional (uris *default-catalog*))
+  (let ((result (%make-catalog)))
+    (setf (catalog-main-files result)
+          (loop
+              for uri in uris
+              for file = (find-catalog-file uri result)
+              when file collect file))
     result))
 
 (defun parse-catalog-file (uri)
@@ -44,25 +225,38 @@
     (file-error () nil)
     (parser-error () nil)))
 
+(defparameter *catalog-dtd*
+    (let* ((cxml
+            (slot-value (asdf:find-system :cxml) 'asdf::relative-pathname))
+           (dtd (merge-pathnames "catalog.dtd" cxml)))
+      (with-open-file (s dtd :element-type '(unsigned-byte 8))
+        (let ((bytes
+               (make-array (file-length s) :element-type '(unsigned-byte 8))))
+          (read-sequence bytes s)
+          bytes))))
+
 (defun parse-catalog-file/strict (uri)
-  (when (stringp uri)
-    (setf uri (puri:parse-uri uri)))
-  (unless *catalog-dtd*
-    (let ((cxml
-           (slot-value (asdf:find-system :cxml) 'asdf::relative-pathname)))
-      (setf *catalog-dtd*
-            (parse-dtd-file (merge-pathnames "catalog.dtd" cxml)))))
-  (with-open-stream (s (open (uri-to-pathname uri)
-                             :element-type '(unsigned-byte 8)
-                             :direction :input))
-    (parse-stream s
-                  (make-instance 'catalog-parser :uri uri)
-                  :validate t
-                  ;; XXX das geht nicht
-                  :dtd *catalog-dtd*)))
+  (let* ((*catalog* nil)
+         (dtd-sysid
+          (puri:parse-uri "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd")))
+    (flet ((entity-resolver (public system)
+             (declare (ignore public))
+             (if (puri:uri= system dtd-sysid)
+                 (make-octet-input-stream *catalog-dtd*)
+                 nil)))
+      (with-open-stream (s (open (uri-to-pathname uri)
+                                 :element-type '(unsigned-byte 8)
+                                 :direction :input))
+        (parse-stream s
+                      (make-recoder (make-instance 'catalog-parser :uri uri)
+                                    #'rod-to-utf8-string)
+                      :validate t
+                      :dtd (make-extid nil dtd-sysid)
+                      :root #"catalog"
+                      :entity-resolver #'entity-resolver)))))
 
 (defclass catalog-parser ()
-  ((entries :initform '() :accessor entries)
+  ((result :initform (make-entry-file) :accessor result)
    (next :initform '() :accessor next)
    (prefer-stack :initform (list *prefer*) :accessor prefer-stack)
    (base-stack :accessor base-stack)))
@@ -78,79 +272,69 @@
   (car (base-stack handler)))
 
 (defun get-attribute/lname (name attributes)
-  (member name attributes
-          :key (lambda (a)
-                 (or (sax:attribute-local-name a)
-                     (sax:attribute-qname a)))
-          :test #'rod=))
+  (let ((a (find name attributes
+                 :key (lambda (a)
+                        (or (sax:attribute-local-name a)
+                            (sax:attribute-qname a)))
+                 :test #'string=)))
+    (and a (sax:attribute-value a))))
 
 (defmethod sax:start-element ((handler catalog-parser) uri lname qname attrs)
   (declare (ignore uri))
   (setf lname (or lname qname))
   ;; we can dispatch on lnames only because we validate against the DTD,
   ;; which disallows other namespaces.
-  (push (string-or (get-attribute/lname #"prefer" attrs) (prefer handler))
+  (push (string-or (get-attribute/lname "prefer" attrs) (prefer handler))
         (prefer-stack handler))
-  (push (string-or (get-attribute/lname #"base" attrs) (base handler))
+  (push (string-or (get-attribute/lname "base" attrs) (base handler))
         (base-stack handler))
-  (cond
-    ((rod= lname #"public")
-      (push (list :public
-                  (get-attribute/lname #"publicId" attrs)
-                  (puri:merge-uris
-                   (puri:parse-uri (get-attribute/lname #"uri" attrs))
-                   (base handler)))
-            (entries handler)))
-    ((rod= lname #"system")
-      (push (list :system
-                  (get-attribute/lname #"systemId" attrs)
-                  (puri:merge-uris
-                   (puri:parse-uri (get-attribute/lname #"uri" attrs))
-                   (base handler)))
-            (entries handler)))
-    ((rod= lname #"uri")
-      (push (list :uri
-                  (get-attribute/lname #"name" attrs)
-                  (puri:merge-uris
-                   (puri:parse-uri (get-attribute/lname #"uri" attrs))
-                   (base handler)))
-            (entries handler)))
-    ((rod= lname #"rewriteSystem")
-      (push (list :rewrite-system
-                  (get-attribute/lname #"systemIdStartString" attrs)
-                  (get-attribute/lname #"rewritePrefix" attrs))
-            (entries handler)))
-    ((rod= lname #"rewriteURI")
-      (push (list :rewrite-uri
-                  (get-attribute/lname #"uriStartString" attrs)
-                  (get-attribute/lname #"rewritePrefix" attrs))
-            (entries handler)))
-    ((rod= lname #"delegatePublic")
-      (push (list :delegate-public
-                  (get-attribute/lname #"publicIdStartString" attrs)
-                  (puri:merge-uris
-                   (puri:parse-uri (get-attribute/lname #"catalog" attrs))
-                   (base handler)))
-            (entries handler)))
-    ((rod= lname #"delegateSystem")
-      (push (list :delegate-system
-                  (get-attribute/lname #"systemIdStartString" attrs)
-                  (puri:merge-uris
-                   (puri:parse-uri (get-attribute/lname #"catalog" attrs))
-                   (base handler)))
-            (entries handler)))
-    ((rod= lname #"delegateURI")
-      (push (list :delegate-uri
-                  (get-attribute/lname #"uriStartString" attrs)
-                  (puri:merge-uris
-                   (puri:parse-uri (get-attribute/lname #"catalog" attrs))
-                   (base handler)))
-            (entries handler)))
-    ((rod= lname #"nextCatalog")
-      (push (puri:merge-uris
-             (puri:parse-uri (get-attribute/lname #"catalog" attrs))
-             (base handler))
-            (next handler)))))
+  (flet ((geturi (lname)
+           (puri:merge-uris
+            (safe-parse-uri (get-attribute/lname lname attrs))
+            (base handler))))
+    (cond
+      ((string= lname "public")
+        (push (list (normalize-public (get-attribute/lname "publicId" attrs))
+                    (geturi "uri")
+                    (prefer handler))
+              (public-entries (result handler))))
+      ((string= lname "system")
+        (push (list (normalize-uri (get-attribute/lname "systemId" attrs))
+                    (geturi "uri"))
+              (system-entries (result handler))))
+      ((string= lname "uri")
+        (push (list (normalize-uri (get-attribute/lname "name" attrs))
+                    (geturi "uri"))
+              (uri-entries (result handler))))
+      ((string= lname "rewriteSystem")
+        (push (list (normalize-uri
+                     (get-attribute/lname "systemIdStartString" attrs))
+                    (get-attribute/lname "rewritePrefix" attrs))
+              (rewrite-system-entries (result handler))))
+      ((string= lname "rewriteURI")
+        (push (list (normalize-uri
+                     (get-attribute/lname "uriStartString" attrs))
+                    (get-attribute/lname "rewritePrefix" attrs))
+              (rewrite-uri-entries (result handler))))
+      ((string= lname "delegatePublic")
+        (push (list (normalize-public
+                     (get-attribute/lname "publicIdStartString" attrs))
+                    (geturi "catalog")
+                    (prefer handler))
+              (delegate-public-entries (result handler))))
+      ((string= lname "delegateSystem")
+        (push (list (normalize-uri
+                     (get-attribute/lname "systemIdStartString" attrs))
+                    (geturi "catalog"))
+              (delegate-system-entries (result handler))))
+      ((string= lname "delegateURI")
+        (push (list (normalize-uri
+                     (get-attribute/lname "uriStartString" attrs))
+                    (geturi "catalog"))
+              (delegate-uri-entries (result handler))))
+      ((string= lname "nextCatalog")
+        (push (geturi "catalog")
+              (next-catalog-entries (result handler)))))))
 
 (defmethod sax:end-element ((handler catalog-parser) uri lname qname)
   (declare (ignore uri lname qname))
@@ -158,4 +342,4 @@
   (pop (prefer-stack handler)))
 
 (defmethod sax:end-document ((handler catalog-parser))
-  (values (reverse (entries handler)) (reverse (next handler))))
+  (result handler))
diff --git a/xml/characters.lisp b/xml/characters.lisp
index b17bb6e..5caa40b 100644
--- a/xml/characters.lisp
+++ b/xml/characters.lisp
@@ -1,37 +1,20 @@
-;;; XXX wird derzeit in DOM:CREATE-ATTRIBUTE verwendet.  Muesste aber wohl vom
-;;; Parser auch schon geprueft werden.  Vorher sollte man allerdings die
-;;; Geschwindigkeit der Sache mal untersuchen.
+;;;; characters.lisp -- character class definitions
+;;;;
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
+;;;; See file COPYING for details.
+;;;;
+;;;; Author: David Lichteblau
+;;;; Copyright (C) 2004 knowledgeTools Int. GmbH
 
-(in-package :xml)
+;;; XXX xml-name-rune-p.lisp habe ich erst nach dem Schreiben dieses
+;;; Files gefunden...
 
-(defun valid-name-p (rod)
-  (and (not (zerop (length rod)))
-       (let ((initial (elt rod 0)))
-         (or (rune-in-range-p initial *base-char-ranges*)
-             (rune-in-range-p initial *ideographic-ranges*)
-             (eql initial #.(char-code #\_))
-             (eql initial #.(char-code #\:))))
-       (every #'rune-name-char-p rod)))
+;;; XXX wird derzeit in DOM:CREATE-ATTRIBUTE verwendet.  Muesste aber
+;;; wohl vom Parser auch schon geprueft werden (oder tut der das
+;;; schon?).  Vorher sollte man allerdings die Geschwindigkeit der Sache
+;;; mal untersuchen.
 
-(defun rune-name-char-p (rune)
-  (or (rune-in-range-p rune *base-char-ranges*)
-      (rune-in-range-p rune *ideographic-ranges*)
-      (eql rune #.(char-code #\.))
-      (eql rune #.(char-code #\-))
-      (eql rune #.(char-code #\_))
-      (eql rune #.(char-code #\:))
-      (rune-in-range-p rune *combining-char-ranges*)
-      (rune-in-range-p rune *extender-ranges*)))
-
-(defun rune-in-range-p (rune range)
-  ;; XXX FIXME, das geht doch besser
-  (block nil
-    (map nil (lambda (range)
-               (when (< rune (car range))
-                 (return nil))
-               (when (<= rune (cadr range))
-                 (return t)))
-         range)))
+(in-package :cxml)
 
 (defparameter *base-char-ranges*
     #((#x0041 #x005A) (#x0061 #x007A) (#x00C0 #x00D6) (#x00D8 #x00F6)
@@ -87,7 +70,7 @@
       (#x3105 #x312C) (#xAC00 #xD7A3)))
 
 (defparameter *ideographic-ranges*
-    #((#x4E00 #x9FA5) (#x3007 #x3007) (#x3021 #x3029)))
+    #((#x3007 #x3007) (#x3021 #x3029)(#x4E00 #x9FA5)))
 
 (defparameter *combining-char-ranges*
   #((#x0300 #x0345) (#x0360 #x0361) (#x0483 #x0486) (#x0591 #x05A1)
@@ -125,3 +108,38 @@
     #((#x00B7 #x00B7) (#x02D0 #x02D0) (#x02D1 #x02D1) (#x0387 #x0387)
       (#x0640 #x0640) (#x0E46 #x0E46) (#x0EC6 #x0EC6) (#x3005 #x3005)
       (#x3031 #x3035) (#x309D #x309E) (#x30FC #x30FE)))
+
+(defun valid-name-p (rod)
+  (and (not (zerop (length rod)))
+       (let ((initial (elt rod 0)))
+         (or (rune-in-range-p initial *base-char-ranges*)
+             (rune-in-range-p initial *ideographic-ranges*)
+             (rune= initial #/_)
+             (eql initial #/:)))
+       (every #'rune-name-char-p rod)))
+
+(defun valid-nmtoken-p (rod)
+  (and (not (zerop (length rod)))
+       (every #'rune-name-char-p rod)))
+
+(defun rune-name-char-p (rune)
+  (or (rune-in-range-p rune *base-char-ranges*)
+      (rune-in-range-p rune *ideographic-ranges*)
+      (rune-in-range-p rune *digit-ranges*)
+      (eql rune #/.)
+      (eql rune #/-)
+      (eql rune #/_)
+      (eql rune #/:)
+      (rune-in-range-p rune *combining-char-ranges*)
+      (rune-in-range-p rune *extender-ranges*)))
+
+(defun rune-in-range-p (rune range)
+  ;; XXX FIXME, das geht doch besser
+  (let ((code (rune-code rune)))
+    (block nil
+      (map nil (lambda (range)
+                 (when (< code (car range))
+                   (return nil))
+                 (when (<= code (cadr range))
+                   (return t)))
+           range))))
diff --git a/xml/package.lisp b/xml/package.lisp
index ae96013..1cebd5d 100644
--- a/xml/package.lisp
+++ b/xml/package.lisp
@@ -1,6 +1,6 @@
 ;;;; package.lisp -- Paketdefinition
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 
 (in-package :cl-user)
diff --git a/xml/recoder.lisp b/xml/recoder.lisp
index e8c5093..6ff3253 100644
--- a/xml/recoder.lisp
+++ b/xml/recoder.lisp
@@ -1,3 +1,11 @@
+;;;; recoder.lisp -- SAX handler for string conversion
+;;;;
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
+;;;; See file COPYING for details.
+;;;;
+;;;; Developed 2004 for headcraft - http://headcraft.de/
+;;;; Copyright: David Lichteblau
+
 (in-package :cxml)
 
 (defclass recoder ()
diff --git a/xml/sax-proxy.lisp b/xml/sax-proxy.lisp
index a6a9915..4fff4cb 100644
--- a/xml/sax-proxy.lisp
+++ b/xml/sax-proxy.lisp
@@ -1,6 +1,6 @@
 ;;;; sax-proxy.lisp
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 ;;;;
 ;;;; Copyright (c) 2004 David Lichteblau
diff --git a/xml/unparse.lisp b/xml/unparse.lisp
index cf9c57b..7e642c7 100644
--- a/xml/unparse.lisp
+++ b/xml/unparse.lisp
@@ -5,7 +5,7 @@
 ;;;   Created: 1999-09-09
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
 ;;;    Author: David Lichteblau <david@lichteblau.com>
-;;;   License: LGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  © copyright 1999 by Gilbert Baumann
 ;;;  © copyright 2004 by knowledgeTools Int. GmbH
diff --git a/xml/util.lisp b/xml/util.lisp
index abd5305..c48a177 100644
--- a/xml/util.lisp
+++ b/xml/util.lisp
@@ -3,7 +3,7 @@
 ;;;     Title: Some common utilities for the Closure browser
 ;;;   Created: 1997-12-27
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
-;;;   License: LLGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  (c) copyright 1997-1999 by Gilbert Baumann
 
diff --git a/xml/xml-name-rune-p.lisp b/xml/xml-name-rune-p.lisp
index 77b9cce..077064e 100644
--- a/xml/xml-name-rune-p.lisp
+++ b/xml/xml-name-rune-p.lisp
@@ -1,6 +1,6 @@
 ;;;; xml-name-rune-p -- character class definitions
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 ;;;;
 ;;;; Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
diff --git a/xml/xml-parse.lisp b/xml/xml-parse.lisp
index ad42b9c..6bf463f 100644
--- a/xml/xml-parse.lisp
+++ b/xml/xml-parse.lisp
@@ -5,7 +5,7 @@
 ;;;    Author: Gilbert Baumann <unk6@rz.uni-karlsruhe.de>
 ;;;    Author: Henrik Motakef <hmot@henrik-motakef.de>
 ;;;    Author: David Lichteblau <david@lichteblau.com>
-;;;   License: LGPL (See file COPYING for details).
+;;;   License: Lisp-LGPL (See file COPYING for details).
 ;;; ---------------------------------------------------------------------------
 ;;;  © copyright 1999 by Gilbert Baumann
 ;;;  © copyright 2003 by Henrik Motakef
diff --git a/xml/xmls-compat.lisp b/xml/xmls-compat.lisp
index e2d6537..e8306bf 100644
--- a/xml/xmls-compat.lisp
+++ b/xml/xmls-compat.lisp
@@ -1,14 +1,17 @@
 ;;;; xml-compat.lisp -- XMLS-compatible data structures
 ;;;;
-;;;; This file is part of the CXML parser, released under (L)LGPL.
+;;;; This file is part of the CXML parser, released under Lisp-LGPL.
 ;;;; See file COPYING for details.
 ;;;;
-;;;; Copyright (c) 2004 headcraft GmbH
-;;;; Author: David Lichteblau
+;;;; Developed 2004 for headcraft - http://headcraft.de/
+;;;; Copyright: David Lichteblau
+
+;;;; XXX Der namespace-Support in xmls kommt mir zweifelhaft vor.
+;;;; Wir immitieren das soweit es gebraucht wurde bisher.
 
 (defpackage cxml-xmls
-  (:use :cl)
-  (:export #:make-node #:node-name #:node-attrs #:node-children
+  (:use :cl :runes)
+  (:export #:make-node #:node-name #:node-ns #:node-attrs #:node-children
            #:make-xmls-builder #:map-node))
 
 (in-package :cxml-xmls)
@@ -16,16 +19,35 @@
 
 ;;;; Knoten
 
-;; XXX Wie namespaces in xmls funktionieren nsollen verstehe ich noch nicht so
-;; ganz.  Daher verzichte ich vorerst auf NODE-NS und verwende durchweg QNAMEs.
-(defun make-node (&key name attrs children)
-  `(,name ,attrs ,@children))
+(defun make-node (&key name ns attrs children)
+  `(,(if ns (cons name ns) name)
+       ,attrs
+       ,@children))
 
 (defun node-name (node)
-  (car node))
+  (let ((car (car node)))
+    (if (consp car)
+        (car car)
+        car)))
 
 (defun (setf node-name) (newval node)
-  (setf (car node) newval))
+  (let ((car (car node)))
+    (if (consp car)
+        (setf (car car) newval)
+        (setf (car node) newval))))
+
+(defun node-ns (node)
+  (let ((car (car node)))
+    (if (consp car)
+        (cdr car)
+        nil)))
+
+(defun (setf node-ns) (newval node)
+  (let ((car (car node)))
+    (if (consp car)
+        (setf (cdr car) newval)
+        (setf (car node) (cons car newval)))
+    newval))
 
 (defun node-attrs (node)
   (cadr node))
@@ -44,23 +66,36 @@
 
 (defclass xmls-builder ()
     ((element-stack :initform nil :accessor element-stack)
-     (root :initform nil :accessor root)))
+     (root :initform nil :accessor root)
+     (include-default-values :initform t
+                             :initarg :include-default-values
+                             :accessor include-default-values)))
 
-(defun make-xmls-builder ()
-  (make-instance 'xmls-builder))
+(defun make-xmls-builder (&key (include-default-values t))
+  (make-instance 'xmls-builder :include-default-values include-default-values))
 
 (defmethod sax:end-document ((handler xmls-builder))
   (root handler))
 
 (defmethod sax:start-element
     ((handler xmls-builder) namespace-uri local-name qname attributes)
-  (declare (ignore namespace-uri local-name))
+  (declare (ignore namespace-uri))
+  (setf local-name (or local-name qname))
   (let* ((attributes
-          (mapcar (lambda (attr)
-                    (list (sax:attribute-qname attr)
-                          (sax:attribute-value attr)))
-                  attributes))
-         (node (make-node :name qname :attrs attributes))
+          (loop
+              for attr in attributes
+              when (or (sax:attribute-specified-p attr)
+                       (include-default-values handler))
+              collect
+                (list (sax:attribute-qname attr)
+                      (sax:attribute-value attr))))
+         (node (make-node :name local-name
+                          :ns (let ((lq (length qname))
+                                    (ll (length local-name)))
+                                (if (eql lq ll)
+                                    nil
+                                    (subseq qname 0 (- lq ll 1))))
+                          :attrs attributes))
          (parent (car (element-stack handler))))
     (if parent
         (push node (node-children parent))
@@ -76,13 +111,17 @@
 (defmethod sax:characters ((handler xmls-builder) data)
   (let* ((parent (car (element-stack handler)))
          (prev (car (node-children parent))))
-    (if (stringp prev)
+    ;; Be careful to accept both rods and strings here, so that xmls can be
+    ;; used with strings even if cxml is configured to use octet string rods.
+    (if (typep prev '(or rod string))
         ;; um entities herum wird SAX:CHARACTERS mehrfach aufgerufen fuer
         ;; den gleichen Textknoten.  Hier muessen wir den bestehenden Knoten
         ;; erweitern, sonst ist das Dokument nicht normalisiert.
         ;; (XXX Oder sollte man besser den Parser entsprechend aendern?)
         (setf (car (node-children parent))
-              (concatenate 'runes:rod prev data))
+              (concatenate `(vector ,(array-element-type prev))
+                           prev
+                           data))
         (push data (node-children parent)))))
 
 
@@ -93,16 +132,18 @@
      &key (include-xmlns-attributes sax:*include-xmlns-attributes*))
   (sax:start-document handler)
   (labels ((walk (node)
-             (let ((attlist
-                    (compute-attributes node include-xmlns-attributes))
-                   (qname (node-name node)))
+             (let* ((attlist
+                     (compute-attributes node include-xmlns-attributes))
+                    (lname (rod (node-name node)))
+                    (ns (rod (node-ns node)))
+                    (qname (concatenate 'rod ns (rod ":") lname)))
                ;; fixme: namespaces
-               (sax:start-element handler nil nil qname attlist)
+               (sax:start-element handler nil lname qname attlist)
                (dolist (child (node-children node))
                  (typecase child
                    (list (walk child))
-                   (string (sax:characters handler child))))
-               (sax:end-element handler nil nil qname))))
+                   ((or string rod) (sax:characters handler (rod child)))))
+               (sax:end-element handler nil lname qname))))
     (walk node))
   (sax:end-document handler))
 
@@ -110,9 +151,9 @@
   (remove nil
           (mapcar (lambda (a)
                     (destructuring-bind (name value) a
-                      (if (or xmlnsp (not (cxml::xmlns-attr-p name)))
-                          (sax:make-attribute :qname name
-                                              :value value
+                      (if (or xmlnsp (not (cxml::xmlns-attr-p (rod name))))
+                          (sax:make-attribute :qname (rod name)
+                                              :value (rod value)
                                               :specified-p t)
                           nil)))
                   (node-attrs node))))