From 190f472657249c8d307bc40eb12c4bfca359ea92 Mon Sep 17 00:00:00 2001
From: dlichteblau <dlichteblau>
Date: Thu, 5 Jul 2007 20:58:15 +0000
Subject: [PATCH] Fixed build on non-Unicode lisps. Fixed parsing on
 non-Unicode lisps. Fixed Unicode detection on OpenMCL.

---
 GNUmakefile        | 3 +--
 cxml.asd           | 3 +++
 doc/index.xml      | 6 ++++++
 runes.asd          | 4 +++-
 xml/xml-parse.lisp | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index d9c60d6..8c3624c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,5 +4,4 @@ all:
 
 .PHONY: clean
 clean:
-	touch dummy.fasl
-	find . \( -name \*.fasl -o -name \*.x86f \) -print0 | xargs -0 rm
+	find . \( -name \*.fasl -o -name \*.x86f -o -name \*.lx64fsl \) -print0 | xargs -0 rm -f
diff --git a/cxml.asd b/cxml.asd
index 13fe474..2989ecf 100644
--- a/cxml.asd
+++ b/cxml.asd
@@ -2,6 +2,9 @@
   (:use :asdf :cl))
 (in-package :cxml-system)
 
+;; force loading of runes.asd, which installs *features* this file depends on
+(find-system :runes)
+
 (defclass closure-source-file (cl-source-file) ())
 
 #+scl
diff --git a/doc/index.xml b/doc/index.xml
index 84d80c1..86df9a0 100644
--- a/doc/index.xml
+++ b/doc/index.xml
@@ -59,6 +59,10 @@
     <h3>Recent Changes</h3>
     <p class="nomargin"><tt>rel-2007-mm-dd</tt></p>
     <ul class="nomargin">
+      <li>
+	Fixed build on non-Unicode lisps.  Fixed parsing on
+	non-Unicode lisps.  Fixed Unicode detection on OpenMCL.
+      </li>
       <li>Serialization no longer defaults to canonical form.</li>
       <li>Fixed octet array argument to make-source.</li>
       <li>
@@ -74,6 +78,8 @@
 	where normal streams are used instead of xstreams and ystreams
 	(albeit both SCL-specific at this point).
       </li>
+      <li>new convenience serialization function cxml:doctype.  Various
+	DTD serialization fixes.</li>
     </ul>
     <p class="nomargin"><tt>rel-2007-05-26</tt></p>
     <ul class="nomargin">
diff --git a/runes.asd b/runes.asd
index 858f554..a49ccca 100644
--- a/runes.asd
+++ b/runes.asd
@@ -26,7 +26,9 @@
                       (progn
                         (format t " ok, characters have at least 16 bits.~%")
                         :rune-is-character))
-             (unless (and (< x char-code-limit) (code-char x))
+             (unless (or (<= #xD800 x #xDFFF)
+			 (and (< x char-code-limit) (code-char x)))
+	       (print (code-char x))
                (format t " no, reverting to octet strings.~%")
                (return :rune-is-integer)))
            *features*))
diff --git a/xml/xml-parse.lisp b/xml/xml-parse.lisp
index db27f72..25939d8 100644
--- a/xml/xml-parse.lisp
+++ b/xml/xml-parse.lisp
@@ -2771,7 +2771,7 @@
 		(write-char c out))))))
 
 (defun compute-base (attrs)
-  (let ((new (sax:find-attribute "xml:base" attrs))
+  (let ((new (sax:find-attribute #"xml:base" attrs))
 	(current (car (base-stack *ctx*))))
     (if new
 	(puri:merge-uris (escape-uri (sax:attribute-value new)) current)