From 21cc616218dd3f429050acbef5c01be71fb6ad05 Mon Sep 17 00:00:00 2001 From: Chris Hanson Date: Mon, 28 Jun 2004 03:26:20 +0000 Subject: [PATCH] Implement XML-MISC-CONTENT-ITEM?. --- v7/src/xml/xml-struct.scm | 13 +++++++------ v7/src/xml/xml.pkg | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/v7/src/xml/xml-struct.scm b/v7/src/xml/xml-struct.scm index bf460b0f6..e68a12824 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.41 2004/06/27 06:26:33 cph Exp $ +$Id: xml-struct.scm,v 1.42 2004/06/28 03:26:20 cph Exp $ Copyright 2001,2002,2003 Massachusetts Institute of Technology @@ -111,11 +111,12 @@ USA. (misc-3 xml-misc-content?)) (define (xml-misc-content? object) - (list-of-type? object - (lambda (object) - (or (xml-comment? object) - (xml-whitespace-string? object) - (xml-processing-instructions? object))))) + (list-of-type? object xml-misc-content-item?)) + +(define (xml-misc-content-item? object) + (or (xml-comment? object) + (xml-whitespace-string? object) + (xml-processing-instructions? object))) (define (xml-whitespace-string? object) (string-composed-of? object char-set:xml-whitespace)) diff --git a/v7/src/xml/xml.pkg b/v7/src/xml/xml.pkg index b905c0dab..989123a60 100644 --- a/v7/src/xml/xml.pkg +++ b/v7/src/xml/xml.pkg @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: xml.pkg,v 1.40 2004/06/27 06:26:13 cph Exp $ +$Id: xml.pkg,v 1.41 2004/06/28 03:25:57 cph Exp $ Copyright 2001,2002,2003,2004 Massachusetts Institute of Technology @@ -235,6 +235,7 @@ USA. xml-external-id-id xml-external-id-iri xml-external-id? + xml-misc-content-item? xml-misc-content? xml-parameter-!entity-name xml-parameter-!entity-value @@ -275,7 +276,8 @@ USA. char-set:xml-whitespace read-xml read-xml-file - string->xml) + string->xml + xml-processing-instructions-handlers) (export (runtime xml) alphabet:name-initial alphabet:name-subsequent -- 2.25.1