From b45a82d355263eef64c2a301e141aea07ded45b4 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 13 Jul 2003 03:45:04 +0000
Subject: [PATCH] Export predicates for some key data structures.  Allow use of
 wide strings wherever they make sense.

---
 v7/src/xml/xml-struct.scm | 11 ++++++-----
 v7/src/xml/xml.pkg        |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/v7/src/xml/xml-struct.scm b/v7/src/xml/xml-struct.scm
index 9730d0ff3..ccc144cfd 100644
--- a/v7/src/xml/xml-struct.scm
+++ b/v7/src/xml/xml-struct.scm
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml-struct.scm,v 1.14 2003/07/13 03:41:29 cph Exp $
+$Id: xml-struct.scm,v 1.15 2003/07/13 03:45:04 cph Exp $
 
 Copyright 2001,2002,2003 Massachusetts Institute of Technology
 
@@ -172,10 +172,11 @@ USA.
 
 (define (xml-attribute-value? object)
   (and (pair? object)
-       (list-of-type? object
-	 (lambda (object)
-	   (or (xml-char-data? object)
-	       (xml-entity-ref? object))))))
+       (list-of-type? object xml-attribute-value-item?)))
+
+(define (xml-attribute-value-item? object)
+  (or (xml-char-data? object)
+      (xml-entity-ref? object)))
 
 (define (xml-content? object)
   (list-of-type? object xml-content-item?))
diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg
index 0864ec89a..ec5004dea 100644
--- a/v7/src/xml/xml.pkg
+++ b/v7/src/xml/xml.pkg
@@ -1,6 +1,6 @@
 #| -*-Scheme-*-
 
-$Id: xml.pkg,v 1.20 2003/07/13 03:41:25 cph Exp $
+$Id: xml.pkg,v 1.21 2003/07/13 03:45:01 cph Exp $
 
 Copyright 2001,2002,2003 Massachusetts Institute of Technology
 
@@ -114,6 +114,7 @@ USA.
 	  xml-!notation-name
 	  xml-!notation?
 	  xml-attribute-list?
+	  xml-attribute-value-item?
 	  xml-attribute-value?
 	  xml-attribute?
 	  xml-char-data?
-- 
2.25.1