diff --git a/collects/html/html-mod.ss b/collects/html/html-mod.ss
new file mode 100644
index 0000000000..49a6f71b9e
--- /dev/null
+++ b/collects/html/html-mod.ss
@@ -0,0 +1,137 @@
+#lang scheme
+;; copyright by Paul Graunke June 2000 AD
+
+(require mzlib/file
+ mzlib/list
+ mzlib/etc
+ mzlib/include
+ "html-spec.ss"
+ "html-sig.ss"
+ (prefix-in sgml: "sgml-reader.ss")
+ xml)
+
+(provide-signature-elements html^)
+
+ ;; Html-content = Html-element | Pc-data | Entity
+
+ (include "html-structs.ss")
+ (include "case.ss")
+
+ ;; xml->html : Document -> Html
+ (define (xml->html doc)
+ (let ([root (document-element doc)])
+ (unless (eq? 'html (element-name root))
+ (error 'xml->html "This is not an html document. Expected 'html, given ~a" (element-name root)))
+ (make-html (element-attributes root) (xml-contents->html (element-content root)))))
+
+
+ ;; xml-content->html : (listof Content) -> (listof Html-element)
+ (define (xml-contents->html contents)
+ (foldr xml-single-content->html
+ null
+ contents))
+
+ ;; read-xhtml : [Input-port] -> Html
+ (define read-xhtml (compose xml->html read-xml))
+
+ ;; peel-f : (Html-content -> Bool) (listof Html-content) (listof Html-content) -> (listof Html-content)
+ (define (peel-f toss? to-toss acc0)
+ (foldr (lambda (x acc)
+ (if (toss? x)
+ (append (html-full-content x) acc)
+ (cons x acc)))
+ acc0
+ to-toss))
+
+ ;; repackage-html : (listof Html-content) -> Html
+ (define (repackage-html contents)
+ (let* ([html (memf html? contents)]
+ [peeled (peel-f html? contents null)]
+ [body (memf body? peeled)])
+ (make-html (if html
+ (html-element-attributes (car html))
+ null)
+ (append (filter head? peeled)
+ (list (make-body (if body
+ (html-element-attributes (car body))
+ null)
+ (filter (compose not head?) (peel-f body? peeled null))))))))
+
+ ;; clean-up-pcdata : (listof Content) -> (listof Content)
+ ;; Each pcdata inside a tag that isn't supposed to contain pcdata is either
+ ;; a) appended to the end of the previous subelement, if that subelement may contain pcdata
+ ;; b) prepended to the front of the next subelement, if that subelement may contain pcdata
+ ;; c) discarded
+ ;; unknown tags may contain pcdata
+ ;; the top level may contain pcdata
+ (define clean-up-pcdata
+ ;; clean-up-pcdata : (listof Content) -> (listof Content)
+ (letrec ([clean-up-pcdata
+ (lambda (content)
+ (map (lambda (to-fix)
+ (cond
+ [(element? to-fix)
+ (recontent-xml to-fix
+ (let ([possible (may-contain (element-name to-fix))]
+ [content (element-content to-fix)])
+ (if (or (not possible) (memq 'pcdata possible))
+ (clean-up-pcdata content)
+ (eliminate-pcdata content))))]
+ [else to-fix]))
+ content))]
+ [eliminate-pcdata
+ ;: (listof Content) -> (listof Content)
+ (lambda (content)
+ (let ([non-elements (first-non-elements content)]
+ [more (memf element? content)])
+ (if more
+ (let* ([el (car more)]
+ [possible (may-contain (element-name el))])
+ (if (or (not possible) (memq 'pcdata possible))
+ (cons (recontent-xml el (append non-elements (clean-up-pcdata (element-content el)) (eliminate-pcdata (first-non-elements (cdr more)))))
+ (or (memf element? (cdr more)) null))
+ (cons (recontent-xml el (eliminate-pcdata (element-content el)))
+ (eliminate-pcdata (cdr more)))))
+ null)))])
+ clean-up-pcdata))
+
+ ;; first-non-elements : (listof Content) -> (listof Content)
+ (define (first-non-elements content)
+ (cond
+ [(null? content) null]
+ [else (if (element? (car content))
+ null
+ (cons (car content) (first-non-elements (cdr content))))]))
+
+ ;; recontent-xml : Element (listof Content) -> Element
+ (define (recontent-xml e c)
+ (make-element (source-start e) (source-stop e) (element-name e) (element-attributes e) c))
+
+ ;; implicit-starts : Symbol Symbol -> (U #f Symbol)
+ (define (implicit-starts parent child)
+ (or (and (eq? child 'tr) (eq? parent 'table) 'tbody)
+ (and (eq? child 'td) (memq parent '(table tbody tfoot thead)) 'tr)))
+
+ ;; may-contain : Kid-lister
+ (define may-contain
+ (sgml:gen-may-contain html-spec))
+
+ (define may-contain-anything
+ (sgml:gen-may-contain null))
+
+ (define use-html-spec (make-parameter #t))
+
+ ;; read-html-as-xml : [Input-port] -> (listof Content)
+ (define read-html-as-xml
+ (case-lambda
+ [(port)
+ ((if (use-html-spec) clean-up-pcdata values)
+ ((sgml:gen-read-sgml (if (use-html-spec)
+ may-contain
+ may-contain-anything)
+ implicit-starts) port))]
+ [() (read-html-as-xml (current-input-port))]))
+
+ ;; read-html : [Input-port] -> Html
+ (define read-html
+ (compose repackage-html xml-contents->html read-html-as-xml))
\ No newline at end of file
diff --git a/collects/html/html-sig.ss b/collects/html/html-sig.ss
index d0b57a7e23..600cff884a 100644
--- a/collects/html/html-sig.ss
+++ b/collects/html/html-sig.ss
@@ -1,11 +1,9 @@
;; copyright by Paul Graunke June 2000 AD
+#lang scheme
-(module html-sig mzscheme
- (require mzlib/unitsig)
+(define-signature html-structs^ ((struct html-element (attributes)) (struct html-full (content)) (struct html ()) (struct div ()) (struct center ()) (struct blockquote ()) (struct ins ()) (struct del ()) (struct dd ()) (struct li ()) (struct th ()) (struct td ()) (struct iframe ()) (struct noframes ()) (struct noscript ()) (struct style ()) (struct script ()) (struct basefont ()) (struct br ()) (struct area ()) (struct link ()) (struct img ()) (struct param ()) (struct hr ()) (struct input ()) (struct col ()) (struct isindex ()) (struct base ()) (struct meta ()) (struct option ()) (struct textarea ()) (struct title ()) (struct head ()) (struct tr ()) (struct colgroup ()) (struct thead ()) (struct tfoot ()) (struct tbody ()) (struct tt ()) (struct i ()) (struct b ()) (struct u ()) (struct s ()) (struct strike ()) (struct big ()) (struct small ()) (struct em ()) (struct strong ()) (struct dfn ()) (struct code ()) (struct samp ()) (struct kbd ()) (struct var ()) (struct cite ()) (struct abbr ()) (struct acronym ()) (struct sub ()) (struct sup ()) (struct span ()) (struct bdo ()) (struct font ()) (struct p ()) (struct h1 ()) (struct h2 ()) (struct h3 ()) (struct h4 ()) (struct h5 ()) (struct h6 ()) (struct q ()) (struct dt ()) (struct legend ()) (struct caption ()) (struct table ()) (struct button ()) (struct fieldset ()) (struct optgroup ()) (struct select ()) (struct label ()) (struct form ()) (struct ol ()) (struct ul ()) (struct dir ()) (struct menu ()) (struct dl ()) (struct pre ()) (struct object ()) (struct applet ()) (struct -map ()) (struct a ()) (struct address ()) (struct body ())))
- (define-signature html-structs^ ((struct html-element (attributes)) (struct html-full (content)) (struct html ()) (struct div ()) (struct center ()) (struct blockquote ()) (struct ins ()) (struct del ()) (struct dd ()) (struct li ()) (struct th ()) (struct td ()) (struct iframe ()) (struct noframes ()) (struct noscript ()) (struct style ()) (struct script ()) (struct basefont ()) (struct br ()) (struct area ()) (struct link ()) (struct img ()) (struct param ()) (struct hr ()) (struct input ()) (struct col ()) (struct isindex ()) (struct base ()) (struct meta ()) (struct option ()) (struct textarea ()) (struct title ()) (struct head ()) (struct tr ()) (struct colgroup ()) (struct thead ()) (struct tfoot ()) (struct tbody ()) (struct tt ()) (struct i ()) (struct b ()) (struct u ()) (struct s ()) (struct strike ()) (struct big ()) (struct small ()) (struct em ()) (struct strong ()) (struct dfn ()) (struct code ()) (struct samp ()) (struct kbd ()) (struct var ()) (struct cite ()) (struct abbr ()) (struct acronym ()) (struct sub ()) (struct sup ()) (struct span ()) (struct bdo ()) (struct font ()) (struct p ()) (struct h1 ()) (struct h2 ()) (struct h3 ()) (struct h4 ()) (struct h5 ()) (struct h6 ()) (struct q ()) (struct dt ()) (struct legend ()) (struct caption ()) (struct table ()) (struct button ()) (struct fieldset ()) (struct optgroup ()) (struct select ()) (struct label ()) (struct form ()) (struct ol ()) (struct ul ()) (struct dir ()) (struct menu ()) (struct dl ()) (struct pre ()) (struct object ()) (struct applet ()) (struct -map ()) (struct a ()) (struct address ()) (struct body ())))
+(define-signature html^ (read-xhtml read-html read-html-as-xml (open html-structs^)
+ use-html-spec))
- (define-signature html^ (read-xhtml read-html read-html-as-xml (open html-structs^)
- use-html-spec))
-
- (provide html^))
+(provide html^)
\ No newline at end of file
diff --git a/collects/html/html-unit.ss b/collects/html/html-unit.ss
index ce4927b3dc..ae540f38cb 100644
--- a/collects/html/html-unit.ss
+++ b/collects/html/html-unit.ss
@@ -1,142 +1,141 @@
+#lang scheme
;; copyright by Paul Graunke June 2000 AD
-(module html-unit mzscheme
- (require mzlib/unitsig
- mzlib/file
- mzlib/list
- mzlib/etc
- mzlib/include
- "html-spec.ss"
- "html-sig.ss"
- "sgml-reader-sig.ss"
- xml/xml-sig)
+(require mzlib/file
+ mzlib/list
+ mzlib/etc
+ mzlib/include
+ "html-spec.ss"
+ "html-sig.ss"
+ "sgml-reader-sig.ss"
+ xml/private/sig)
- (provide html@)
+(provide html@)
- (define html@
- (unit/sig html^
- (import xml^ (sgml : sgml-reader^))
-
- ;; Html-content = Html-element | Pc-data | Entity
-
- (include "html-structs.ss")
- (include "case.ss")
-
- ;; xml->html : Document -> Html
- (define (xml->html doc)
- (let ([root (document-element doc)])
- (unless (eq? 'html (element-name root))
- (error 'xml->html "This is not an html document. Expected 'html, given ~a" (element-name root)))
- (make-html (element-attributes root) (xml-contents->html (element-content root)))))
-
-
- ;; xml-content->html : (listof Content) -> (listof Html-element)
- (define (xml-contents->html contents)
- (foldr xml-single-content->html
- null
- contents))
-
- ;; read-xhtml : [Input-port] -> Html
- (define read-xhtml (compose xml->html read-xml))
-
- ;; peel-f : (Html-content -> Bool) (listof Html-content) (listof Html-content) -> (listof Html-content)
- (define (peel-f toss? to-toss acc0)
- (foldr (lambda (x acc)
- (if (toss? x)
- (append (html-full-content x) acc)
- (cons x acc)))
- acc0
- to-toss))
-
- ;; repackage-html : (listof Html-content) -> Html
- (define (repackage-html contents)
- (let* ([html (memf html? contents)]
- [peeled (peel-f html? contents null)]
- [body (memf body? peeled)])
- (make-html (if html
- (html-element-attributes (car html))
- null)
- (append (filter head? peeled)
- (list (make-body (if body
- (html-element-attributes (car body))
- null)
- (filter (compose not head?) (peel-f body? peeled null))))))))
-
- ;; clean-up-pcdata : (listof Content) -> (listof Content)
- ;; Each pcdata inside a tag that isn't supposed to contain pcdata is either
- ;; a) appended to the end of the previous subelement, if that subelement may contain pcdata
- ;; b) prepended to the front of the next subelement, if that subelement may contain pcdata
- ;; c) discarded
- ;; unknown tags may contain pcdata
- ;; the top level may contain pcdata
- (define clean-up-pcdata
- ;; clean-up-pcdata : (listof Content) -> (listof Content)
- (letrec ([clean-up-pcdata
- (lambda (content)
- (map (lambda (to-fix)
- (cond
- [(element? to-fix)
- (recontent-xml to-fix
- (let ([possible (may-contain (element-name to-fix))]
- [content (element-content to-fix)])
- (if (or (not possible) (memq 'pcdata possible))
- (clean-up-pcdata content)
- (eliminate-pcdata content))))]
- [else to-fix]))
- content))]
- [eliminate-pcdata
- ;: (listof Content) -> (listof Content)
- (lambda (content)
- (let ([non-elements (first-non-elements content)]
- [more (memf element? content)])
- (if more
- (let* ([el (car more)]
- [possible (may-contain (element-name el))])
- (if (or (not possible) (memq 'pcdata possible))
- (cons (recontent-xml el (append non-elements (clean-up-pcdata (element-content el)) (eliminate-pcdata (first-non-elements (cdr more)))))
- (or (memf element? (cdr more)) null))
- (cons (recontent-xml el (eliminate-pcdata (element-content el)))
- (eliminate-pcdata (cdr more)))))
- null)))])
- clean-up-pcdata))
-
- ;; first-non-elements : (listof Content) -> (listof Content)
- (define (first-non-elements content)
- (cond
- [(null? content) null]
- [else (if (element? (car content))
- null
- (cons (car content) (first-non-elements (cdr content))))]))
-
- ;; recontent-xml : Element (listof Content) -> Element
- (define (recontent-xml e c)
- (make-element (source-start e) (source-stop e) (element-name e) (element-attributes e) c))
-
- ;; implicit-starts : Symbol Symbol -> (U #f Symbol)
- (define (implicit-starts parent child)
- (or (and (eq? child 'tr) (eq? parent 'table) 'tbody)
- (and (eq? child 'td) (memq parent '(table tbody tfoot thead)) 'tr)))
-
- ;; may-contain : Kid-lister
- (define may-contain
- (sgml:gen-may-contain html-spec))
-
- (define may-contain-anything
- (sgml:gen-may-contain null))
-
- (define use-html-spec (make-parameter #t))
-
- ;; read-html-as-xml : [Input-port] -> (listof Content)
- (define read-html-as-xml
- (case-lambda
- [(port)
- ((if (use-html-spec) clean-up-pcdata values)
- ((sgml:gen-read-sgml (if (use-html-spec)
- may-contain
- may-contain-anything)
- implicit-starts) port))]
- [() (read-html-as-xml (current-input-port))]))
-
- ;; read-html : [Input-port] -> Html
- (define read-html
- (compose repackage-html xml-contents->html read-html-as-xml)))))
+(define-unit html@
+ (import xml-structs^ reader^ (prefix sgml: sgml-reader^))
+ (export html^)
+
+ ;; Html-content = Html-element | Pc-data | Entity
+
+ (include "html-structs.ss")
+ (include "case.ss")
+
+ ;; xml->html : Document -> Html
+ (define (xml->html doc)
+ (let ([root (document-element doc)])
+ (unless (eq? 'html (element-name root))
+ (error 'xml->html "This is not an html document. Expected 'html, given ~a" (element-name root)))
+ (make-html (element-attributes root) (xml-contents->html (element-content root)))))
+
+
+ ;; xml-content->html : (listof Content) -> (listof Html-element)
+ (define (xml-contents->html contents)
+ (foldr xml-single-content->html
+ null
+ contents))
+
+ ;; read-xhtml : [Input-port] -> Html
+ (define read-xhtml (compose xml->html read-xml))
+
+ ;; peel-f : (Html-content -> Bool) (listof Html-content) (listof Html-content) -> (listof Html-content)
+ (define (peel-f toss? to-toss acc0)
+ (foldr (lambda (x acc)
+ (if (toss? x)
+ (append (html-full-content x) acc)
+ (cons x acc)))
+ acc0
+ to-toss))
+
+ ;; repackage-html : (listof Html-content) -> Html
+ (define (repackage-html contents)
+ (let* ([html (memf html? contents)]
+ [peeled (peel-f html? contents null)]
+ [body (memf body? peeled)])
+ (make-html (if html
+ (html-element-attributes (car html))
+ null)
+ (append (filter head? peeled)
+ (list (make-body (if body
+ (html-element-attributes (car body))
+ null)
+ (filter (compose not head?) (peel-f body? peeled null))))))))
+
+ ;; clean-up-pcdata : (listof Content) -> (listof Content)
+ ;; Each pcdata inside a tag that isn't supposed to contain pcdata is either
+ ;; a) appended to the end of the previous subelement, if that subelement may contain pcdata
+ ;; b) prepended to the front of the next subelement, if that subelement may contain pcdata
+ ;; c) discarded
+ ;; unknown tags may contain pcdata
+ ;; the top level may contain pcdata
+ (define clean-up-pcdata
+ ;; clean-up-pcdata : (listof Content) -> (listof Content)
+ (letrec ([clean-up-pcdata
+ (lambda (content)
+ (map (lambda (to-fix)
+ (cond
+ [(element? to-fix)
+ (recontent-xml to-fix
+ (let ([possible (may-contain (element-name to-fix))]
+ [content (element-content to-fix)])
+ (if (or (not possible) (memq 'pcdata possible))
+ (clean-up-pcdata content)
+ (eliminate-pcdata content))))]
+ [else to-fix]))
+ content))]
+ [eliminate-pcdata
+ ;: (listof Content) -> (listof Content)
+ (lambda (content)
+ (let ([non-elements (first-non-elements content)]
+ [more (memf element? content)])
+ (if more
+ (let* ([el (car more)]
+ [possible (may-contain (element-name el))])
+ (if (or (not possible) (memq 'pcdata possible))
+ (cons (recontent-xml el (append non-elements (clean-up-pcdata (element-content el)) (eliminate-pcdata (first-non-elements (cdr more)))))
+ (or (memf element? (cdr more)) null))
+ (cons (recontent-xml el (eliminate-pcdata (element-content el)))
+ (eliminate-pcdata (cdr more)))))
+ null)))])
+ clean-up-pcdata))
+
+ ;; first-non-elements : (listof Content) -> (listof Content)
+ (define (first-non-elements content)
+ (cond
+ [(null? content) null]
+ [else (if (element? (car content))
+ null
+ (cons (car content) (first-non-elements (cdr content))))]))
+
+ ;; recontent-xml : Element (listof Content) -> Element
+ (define (recontent-xml e c)
+ (make-element (source-start e) (source-stop e) (element-name e) (element-attributes e) c))
+
+ ;; implicit-starts : Symbol Symbol -> (U #f Symbol)
+ (define (implicit-starts parent child)
+ (or (and (eq? child 'tr) (eq? parent 'table) 'tbody)
+ (and (eq? child 'td) (memq parent '(table tbody tfoot thead)) 'tr)))
+
+ ;; may-contain : Kid-lister
+ (define may-contain
+ (sgml:gen-may-contain html-spec))
+
+ (define may-contain-anything
+ (sgml:gen-may-contain null))
+
+ (define use-html-spec (make-parameter #t))
+
+ ;; read-html-as-xml : [Input-port] -> (listof Content)
+ (define read-html-as-xml
+ (case-lambda
+ [(port)
+ ((if (use-html-spec) clean-up-pcdata values)
+ ((sgml:gen-read-sgml (if (use-html-spec)
+ may-contain
+ may-contain-anything)
+ implicit-starts) port))]
+ [() (read-html-as-xml (current-input-port))]))
+
+ ;; read-html : [Input-port] -> Html
+ (define read-html
+ (compose repackage-html xml-contents->html read-html-as-xml)))
diff --git a/collects/html/html.scrbl b/collects/html/html.scrbl
index 9b7564591b..6dc7c7b514 100644
--- a/collects/html/html.scrbl
+++ b/collects/html/html.scrbl
@@ -78,7 +78,7 @@ Reads HTML from a port, producing an @xexpr compatible with the
(code:comment #, @t{Pulls out the pcdata strings from an-html-element.})
(define (extract-pcdata-from-element an-html-element)
(match an-html-element
- [(struct h:html-full (content))
+ [(struct h:html-full (attributes content))
(apply append (map extract-pcdata content))]
[(struct h:html-element (attributes))
diff --git a/collects/html/html.ss b/collects/html/html.ss
index de547502d4..381e05f8f7 100644
--- a/collects/html/html.ss
+++ b/collects/html/html.ss
@@ -1,30 +1,22 @@
+#lang scheme
;; copyright by Paul Graunke June 2000 AD
-(module html mzscheme
- (require mzlib/unitsig
- "html-sig.ss"
- "html-unit.ss"
- "sgml-reader-sig.ss"
- "sgml-reader-unit.ss"
- xml/xml
- xml/xml-sig
- xml/private/sig
- xml/xml-unit)
+(require "html-mod.ss" "html-sig.ss" "sgml-reader.ss")
- ;; To get read-comments from sgml-reader, we have to
- ;; avoid the read-comments from XML, so we rename it
- ;; to read-html-comments.
+#;(require "html-sig.ss"
+ "html-unit.ss"
+ "sgml-reader-sig.ss"
+ "sgml-reader-unit.ss"
+ xml/private/structures
+ xml/private/reader
+ xml/private/sig)
- (define-values/invoke-unit/sig
- ((open html^) read-html-comments)
- (compound-unit/sig
- (import [x : xml^])
- (link
- [s : sgml-reader^ (sgml-reader@ (x : xml-structs^))]
- [h : html^ (html@ x s)])
- (export (open h) (var (s read-comments) read-html-comments)))
- #f
- xml^)
+#;(define-compound-unit/infer the-html@
+ (import)
+ (export html^ sgml-reader^)
+ (link html@ sgml-reader@ xml-structs@ reader@))
- (provide-signature-elements html^)
- (provide read-html-comments))
+#;(define-values/invoke-unit/infer the-html@)
+
+(provide-signature-elements html^)
+(provide read-html-comments)
diff --git a/collects/html/sgml-reader-sig.ss b/collects/html/sgml-reader-sig.ss
index 9ac150c2ac..3454b2ea4e 100644
--- a/collects/html/sgml-reader-sig.ss
+++ b/collects/html/sgml-reader-sig.ss
@@ -1,8 +1,6 @@
;; copyright by Paul Graunke June 2000 AD
+#lang scheme
-(module sgml-reader-sig mzscheme
- (require mzlib/unitsig)
+(define-signature sgml-reader^ (read-html-comments trim-whitespace gen-may-contain gen-read-sgml))
- (define-signature sgml-reader^ (read-comments trim-whitespace gen-may-contain gen-read-sgml))
-
- (provide sgml-reader^))
+(provide sgml-reader^)
diff --git a/collects/html/sgml-reader-unit.ss b/collects/html/sgml-reader-unit.ss
index 30be92f0b7..ee8403d257 100644
--- a/collects/html/sgml-reader-unit.ss
+++ b/collects/html/sgml-reader-unit.ss
@@ -1,296 +1,294 @@
;; copyright by Paul Graunke June 2000 AD
;; warning - this was copied from the XML collection.
;; It needs to be abstracted back in.
+#lang scheme
+(require mzlib/list
+ mzlib/string
+ "sgml-reader-sig.ss"
+ xml/private/sig)
-(module sgml-reader-unit mzscheme
- (require mzlib/unitsig
- mzlib/list
- mzlib/string
- "sgml-reader-sig.ss"
- xml/private/sig)
+(provide sgml-reader@)
- (provide sgml-reader@)
-
- (define sgml-reader@
- (unit/sig sgml-reader^
- (import xml-structs^)
-
- ;; Start-tag ::= (make-start-tag Location Location Symbol (listof Attribute))
- (define-struct (start-tag source) (name attrs))
-
- ;; End-tag ::= (make-end-tag Location Location Symbol)
- (define-struct (end-tag source) (name))
-
- ;; Token ::= Contents | Start-tag | End-tag | Eof
-
- (define read-comments (make-parameter #f))
- (define trim-whitespace (make-parameter #f))
-
- ;; Kid-lister : (Symbol -> (U (listof Symbol) #f))
-
- ;; gen-may-contain : Spec -> Kid-lister
- (define (gen-may-contain spec)
- (let ([table (make-hash-table)])
- (for-each (lambda (def)
- (let ([rhs (cdr def)])
- (for-each (lambda (name) (hash-table-put! table name rhs))
- (car def))))
- spec)
- (lambda (name)
- (hash-table-get table name (lambda () #f)))))
-
- ;; gen-read-sgml : Kid-lister (Symbol Symbol -> (U #f Symbol)) -> [Input-port] -> (listof Content)
- (define (gen-read-sgml may-contain auto-insert)
- (case-lambda
- [(in) (read-from-port may-contain auto-insert in)]
- [() (read-from-port may-contain auto-insert (current-input-port))]))
-
- ;; read-from-port : Kid-lister (Symbol Symbol -> (U #f Symbol)) Input-port -> (listof Content)
- (define (read-from-port may-contain auto-insert in)
- (let loop ([tokens (let read-tokens ()
- (let ([tok (lex in)])
- (cond
- [(eof-object? tok) null]
- [else (cons tok (read-tokens))])))])
- (cond
- [(null? tokens) null]
- [else
- (let ([tok (car tokens)] [rest-tokens (cdr tokens)])
- (cond
- [(start-tag? tok)
- (let-values ([(el more-tokens) (read-element tok null may-contain auto-insert rest-tokens)])
- (cons el (loop more-tokens)))]
- [(end-tag? tok) (loop rest-tokens)]
- [else (let ([rest-contents (loop rest-tokens)])
- (expand-content tok rest-contents))]))])))
-
- ;; read-element : Start-tag (listof Symbol) Kid-lister (Symbol Symbol -> (U #f Symbol)) (listof Token) -> Element (listof Token)
- ;; Note: How elements nest depends on their content model.
- ;; If a kind of element can't contain anything, then its start tags are implicitly ended, and
- ;; end tags are implicitly started.
- ;; Unknown elements can contain anything and can go inside anything.
- ;; Otherwise, only the subelements listed in the content model can go inside an element.
- ;; more here - may-contain shouldn't be used to decide if an element is known or not.
- ;; The edgar dtd puts tags in may-contain's range that aren't in its domain.
- ;; more here (or not) - the (memq name context) test leaks for a worst case of O(n^2) in the
- ;; tag nesting depth. However, this only should be a problem when the tag is there,
- ;; but far back. That shouldn't happen often. I'm guessing n will be about 3.
- (define (read-element start-tag context may-contain auto-insert tokens)
- (let read-el ([start-tag start-tag] [context (cons (start-tag-name start-tag) context)] [tokens tokens])
- (let* ([start-name (start-tag-name start-tag)]
- [ok-kids (may-contain start-name)])
- (let-values ([(content remaining)
- (cond
- [(null? ok-kids) (values null tokens)]
- [else
- ;; read-content : (listof Token) -> (listof Content) (listof Token)
- (let read-content ([tokens tokens])
- (cond
- [(null? tokens) (values null tokens)]
- [else
- (let ([tok (car tokens)] [next-tokens (cdr tokens)])
- (cond
- [(start-tag? tok)
- (let* ([name (start-tag-name tok)]
- [auto-start (auto-insert start-name name)])
- (if auto-start
- (read-content (cons (make-start-tag (source-start tok) (source-stop tok) auto-start null) tokens))
- (if (and ok-kids
- (not (memq name ok-kids))
- (may-contain name))
- (values null tokens)
- (let*-values ([(element post-element)
- (read-el tok (cons name context) next-tokens)]
- [(more-contents left-overs) (read-content post-element)])
- (values (cons element more-contents) left-overs)))))]
- [(end-tag? tok)
- (let ([name (end-tag-name tok)])
- (if (eq? name start-name)
- (values null next-tokens)
- (if (memq name context)
- (values null tokens)
- (read-content next-tokens))))]
- [else ;; content
- (let-values ([(more-contents left-overs) (read-content next-tokens)])
- (values
- (expand-content tok more-contents)
- left-overs))]))]))])])
- (values (make-element (source-start start-tag)
- (source-stop start-tag)
- start-name
- (start-tag-attrs start-tag)
- content)
- remaining)))))
-
- ;; expand-content : Content (listof Content) -> (listof Content)
- (define (expand-content x lst)
- (cond
- [(entity? x) (cons (expand-entity x) lst)]
- [(comment? x) (if (read-comments)
- (cons x lst)
- lst)]
- [else (cons x lst)]))
-
- ;; expand-entity : Entity -> (U Entity Pcdata)
- ;; more here - allow expansion of user defined entities
- (define (expand-entity x)
- (let ([expanded (default-entity-table (entity-text x))])
- (if expanded
- (make-pcdata (source-start x) (source-stop x) expanded)
- x)))
-
- ;; default-entity-table : Symbol -> (U #f String)
- (define (default-entity-table name)
- (case name
- [(amp) "&"]
- [(lt) "<"]
- [(gt) ">"]
- [(quot) "\""]
- [(apos) "'"]
- [else #f]))
-
- ;; lex : Input-port -> Token
- (define (lex in)
- (when (trim-whitespace)
- (skip-space in))
- (let ([c (peek-char in)])
- (cond
- [(eof-object? c) c]
- [(eq? c #\&) (lex-entity in)]
- [(eq? c #\<) (lex-tag-cdata-pi-comment in)]
- [else (lex-pcdata in)])))
-
- ;; lex-entity : Input-port -> Token
- ;; This might not return an entity if it doesn't look like one afterall.
- (define (lex-entity in)
- (let ([start (file-position in)])
- (read-char in)
- (case (peek-char in)
- ;; more here - read while it's numeric (or hex) not until #\;
- [(#\#)
- (read-char in)
- (let* ([hex? (if (equal? #\x (peek-char in))
- (and (read-char in) #t)
- #f)]
- [str (read-until #\; in)]
- [n (cond
- [hex?
- (string->number str 16)]
- [else (string->number str)])])
- (if (number? n)
- (make-entity start (file-position in) n)
- (make-pcdata start (file-position in) (string-append "" str))))]
- [else
- (let ([name (lex-name/case-sensitive in)]
- [c (peek-char in)])
- (if (eq? c #\;)
- (begin (read-char in) (make-entity start (file-position in) name))
- (make-pcdata start (file-position in) (format "&~a" name))))])))
-
- ;; lex-tag-cdata-pi-comment : Input-port -> Start-tag | Element | End-tag | Pcdata | Pi | Comment
- (define (lex-tag-cdata-pi-comment in)
- (let ([start (file-position in)])
- (read-char in)
- (case (peek-char in)
- [(#\!)
- (read-char in)
- (case (peek-char in)
- [(#\-) (read-char in)
- (let ([c (read-char in)])
- (cond
- [(eq? c #\-)
- (let ([data (lex-comment-contents in)])
- (make-comment data))]
- [else (make-pcdata start (file-position in) (format " or whatever else is there
- (make-end-tag start (file-position in) name))]
- [else
- (let ([name (lex-name in)]
- [attrs (lex-attributes in)])
- (skip-space in)
- (case (read-char in)
- [(#\/)
- (read-char in) ;; skip #\> or something
- (make-element start (file-position in) name attrs null)]
- [else (make-start-tag start (file-position in) name attrs)]))])))
-
-
- ;; lex-attributes : Input-port -> (listof Attribute)
- (define (lex-attributes in)
- (sort (let loop ()
- (skip-space in)
- (cond [(name-start? (peek-char in))
- (cons (lex-attribute in) (loop))]
- [else null]))
- (lambda (a b)
- (string (symbol->string (attribute-name a))
- (symbol->string (attribute-name b))))))
-
- ;; lex-attribute : Input-port -> Attribute
- ;; Note: entities in attributes are ignored, since defacto html uses & in them for URL syntax
- (define (lex-attribute in)
- (let ([start (file-position in)]
- [name (lex-name in)])
- (skip-space in)
- (cond
- [(eq? (peek-char in) #\=)
- (read-char in)
- (skip-space in)
- (let* ([delimiter (read-char in)]
- [value (list->string
- (case delimiter
- [(#\' #\")
- (let read-more ()
- (let ([c (read-char in)])
- (cond
- [(or (eq? c delimiter) (eof-object? c)) null]
- [else (cons c (read-more))])))]
- [else (cons delimiter (read-up-to (lambda (c) (or (char-whitespace? c) (eq? c #\>))) in))]))])
- (make-attribute start (file-position in) name value))]
- [else (make-attribute start (file-position in) name (symbol->string name))])))
-
- ;; skip-space : Input-port -> Void
- ;; deviation - should sometimes insist on at least one space
- (define (skip-space in)
- (let loop ()
- (let ([c (peek-char in)])
- (when (and (not (eof-object? c)) (char-whitespace? c))
- (read-char in)
- (loop)))))
-
- ;; lex-pcdata : Input-port -> Pcdata
- ;; deviation - disallow ]]> "for compatability" with SGML, sec 2.4 XML spec
- (define (lex-pcdata in)
- (let ([start (file-position in)])
- ;; The following regexp match must use bytes, not chars, because
- ;; `in' might not be a well-formed UTF-8 sequence. If it isn't,
- ;; and it goes wrong with the first byte sequence, then a char-based
- ;; pattern would match 0 characters. Meanwhile, the caller of this function
- ;; expects characters to be read.
- (let ([s (regexp-match #rx#"^[^&<]*" in)])
- (make-pcdata start
- (file-position in)
- (bytes->string/utf-8
- (if (trim-whitespace)
- (regexp-replace* #rx#"[ \t\v\r\n]+" (car s) #"")
- (car s))
- #\?)))))
-#|
+(define-unit sgml-reader@
+ (import xml-structs^)
+ (export sgml-reader^)
+
+ ;; Start-tag ::= (make-start-tag Location Location Symbol (listof Attribute))
+ (define-struct (start-tag source) (name attrs))
+
+ ;; End-tag ::= (make-end-tag Location Location Symbol)
+ (define-struct (end-tag source) (name))
+
+ ;; Token ::= Contents | Start-tag | End-tag | Eof
+
+ (define read-html-comments (make-parameter #f))
+ (define trim-whitespace (make-parameter #f))
+
+ ;; Kid-lister : (Symbol -> (U (listof Symbol) #f))
+
+ ;; gen-may-contain : Spec -> Kid-lister
+ (define (gen-may-contain spec)
+ (let ([table (make-hash)])
+ (for-each (lambda (def)
+ (let ([rhs (cdr def)])
+ (for-each (lambda (name) (hash-set! table name rhs))
+ (car def))))
+ spec)
+ (lambda (name)
+ (hash-ref table name (lambda () #f)))))
+
+ ;; gen-read-sgml : Kid-lister (Symbol Symbol -> (U #f Symbol)) -> [Input-port] -> (listof Content)
+ (define (gen-read-sgml may-contain auto-insert)
+ (case-lambda
+ [(in) (read-from-port may-contain auto-insert in)]
+ [() (read-from-port may-contain auto-insert (current-input-port))]))
+
+ ;; read-from-port : Kid-lister (Symbol Symbol -> (U #f Symbol)) Input-port -> (listof Content)
+ (define (read-from-port may-contain auto-insert in)
+ (let loop ([tokens (let read-tokens ()
+ (let ([tok (lex in)])
+ (cond
+ [(eof-object? tok) null]
+ [else (cons tok (read-tokens))])))])
+ (cond
+ [(null? tokens) null]
+ [else
+ (let ([tok (car tokens)] [rest-tokens (cdr tokens)])
+ (cond
+ [(start-tag? tok)
+ (let-values ([(el more-tokens) (read-element tok null may-contain auto-insert rest-tokens)])
+ (cons el (loop more-tokens)))]
+ [(end-tag? tok) (loop rest-tokens)]
+ [else (let ([rest-contents (loop rest-tokens)])
+ (expand-content tok rest-contents))]))])))
+
+ ;; read-element : Start-tag (listof Symbol) Kid-lister (Symbol Symbol -> (U #f Symbol)) (listof Token) -> Element (listof Token)
+ ;; Note: How elements nest depends on their content model.
+ ;; If a kind of element can't contain anything, then its start tags are implicitly ended, and
+ ;; end tags are implicitly started.
+ ;; Unknown elements can contain anything and can go inside anything.
+ ;; Otherwise, only the subelements listed in the content model can go inside an element.
+ ;; more here - may-contain shouldn't be used to decide if an element is known or not.
+ ;; The edgar dtd puts tags in may-contain's range that aren't in its domain.
+ ;; more here (or not) - the (memq name context) test leaks for a worst case of O(n^2) in the
+ ;; tag nesting depth. However, this only should be a problem when the tag is there,
+ ;; but far back. That shouldn't happen often. I'm guessing n will be about 3.
+ (define (read-element start-tag context may-contain auto-insert tokens)
+ (let read-el ([start-tag start-tag] [context (cons (start-tag-name start-tag) context)] [tokens tokens])
+ (let* ([start-name (start-tag-name start-tag)]
+ [ok-kids (may-contain start-name)])
+ (let-values ([(content remaining)
+ (cond
+ [(null? ok-kids) (values null tokens)]
+ [else
+ ;; read-content : (listof Token) -> (listof Content) (listof Token)
+ (let read-content ([tokens tokens])
+ (cond
+ [(null? tokens) (values null tokens)]
+ [else
+ (let ([tok (car tokens)] [next-tokens (cdr tokens)])
+ (cond
+ [(start-tag? tok)
+ (let* ([name (start-tag-name tok)]
+ [auto-start (auto-insert start-name name)])
+ (if auto-start
+ (read-content (cons (make-start-tag (source-start tok) (source-stop tok) auto-start null) tokens))
+ (if (and ok-kids
+ (not (memq name ok-kids))
+ (may-contain name))
+ (values null tokens)
+ (let*-values ([(element post-element)
+ (read-el tok (cons name context) next-tokens)]
+ [(more-contents left-overs) (read-content post-element)])
+ (values (cons element more-contents) left-overs)))))]
+ [(end-tag? tok)
+ (let ([name (end-tag-name tok)])
+ (if (eq? name start-name)
+ (values null next-tokens)
+ (if (memq name context)
+ (values null tokens)
+ (read-content next-tokens))))]
+ [else ;; content
+ (let-values ([(more-contents left-overs) (read-content next-tokens)])
+ (values
+ (expand-content tok more-contents)
+ left-overs))]))]))])])
+ (values (make-element (source-start start-tag)
+ (source-stop start-tag)
+ start-name
+ (start-tag-attrs start-tag)
+ content)
+ remaining)))))
+
+ ;; expand-content : Content (listof Content) -> (listof Content)
+ (define (expand-content x lst)
+ (cond
+ [(entity? x) (cons (expand-entity x) lst)]
+ [(comment? x) (if (read-html-comments)
+ (cons x lst)
+ lst)]
+ [else (cons x lst)]))
+
+ ;; expand-entity : Entity -> (U Entity Pcdata)
+ ;; more here - allow expansion of user defined entities
+ (define (expand-entity x)
+ (let ([expanded (default-entity-table (entity-text x))])
+ (if expanded
+ (make-pcdata (source-start x) (source-stop x) expanded)
+ x)))
+
+ ;; default-entity-table : Symbol -> (U #f String)
+ (define (default-entity-table name)
+ (case name
+ [(amp) "&"]
+ [(lt) "<"]
+ [(gt) ">"]
+ [(quot) "\""]
+ [(apos) "'"]
+ [else #f]))
+
+ ;; lex : Input-port -> Token
+ (define (lex in)
+ (when (trim-whitespace)
+ (skip-space in))
+ (let ([c (peek-char in)])
+ (cond
+ [(eof-object? c) c]
+ [(eq? c #\&) (lex-entity in)]
+ [(eq? c #\<) (lex-tag-cdata-pi-comment in)]
+ [else (lex-pcdata in)])))
+
+ ;; lex-entity : Input-port -> Token
+ ;; This might not return an entity if it doesn't look like one afterall.
+ (define (lex-entity in)
+ (let ([start (file-position in)])
+ (read-char in)
+ (case (peek-char in)
+ ;; more here - read while it's numeric (or hex) not until #\;
+ [(#\#)
+ (read-char in)
+ (let* ([hex? (if (equal? #\x (peek-char in))
+ (and (read-char in) #t)
+ #f)]
+ [str (read-until #\; in)]
+ [n (cond
+ [hex?
+ (string->number str 16)]
+ [else (string->number str)])])
+ (if (number? n)
+ (make-entity start (file-position in) n)
+ (make-pcdata start (file-position in) (string-append "" str))))]
+ [else
+ (let ([name (lex-name/case-sensitive in)]
+ [c (peek-char in)])
+ (if (eq? c #\;)
+ (begin (read-char in) (make-entity start (file-position in) name))
+ (make-pcdata start (file-position in) (format "&~a" name))))])))
+
+ ;; lex-tag-cdata-pi-comment : Input-port -> Start-tag | Element | End-tag | Pcdata | Pi | Comment
+ (define (lex-tag-cdata-pi-comment in)
+ (let ([start (file-position in)])
+ (read-char in)
+ (case (peek-char in)
+ [(#\!)
+ (read-char in)
+ (case (peek-char in)
+ [(#\-) (read-char in)
+ (let ([c (read-char in)])
+ (cond
+ [(eq? c #\-)
+ (let ([data (lex-comment-contents in)])
+ (make-comment data))]
+ [else (make-pcdata start (file-position in) (format " or whatever else is there
+ (make-end-tag start (file-position in) name))]
+ [else
+ (let ([name (lex-name in)]
+ [attrs (lex-attributes in)])
+ (skip-space in)
+ (case (read-char in)
+ [(#\/)
+ (read-char in) ;; skip #\> or something
+ (make-element start (file-position in) name attrs null)]
+ [else (make-start-tag start (file-position in) name attrs)]))])))
+
+
+ ;; lex-attributes : Input-port -> (listof Attribute)
+ (define (lex-attributes in)
+ (sort (let loop ()
+ (skip-space in)
+ (cond [(name-start? (peek-char in))
+ (cons (lex-attribute in) (loop))]
+ [else null]))
+ (lambda (a b)
+ (string (symbol->string (attribute-name a))
+ (symbol->string (attribute-name b))))))
+
+ ;; lex-attribute : Input-port -> Attribute
+ ;; Note: entities in attributes are ignored, since defacto html uses & in them for URL syntax
+ (define (lex-attribute in)
+ (let ([start (file-position in)]
+ [name (lex-name in)])
+ (skip-space in)
+ (cond
+ [(eq? (peek-char in) #\=)
+ (read-char in)
+ (skip-space in)
+ (let* ([delimiter (read-char in)]
+ [value (list->string
+ (case delimiter
+ [(#\' #\")
+ (let read-more ()
+ (let ([c (read-char in)])
+ (cond
+ [(or (eq? c delimiter) (eof-object? c)) null]
+ [else (cons c (read-more))])))]
+ [else (cons delimiter (read-up-to (lambda (c) (or (char-whitespace? c) (eq? c #\>))) in))]))])
+ (make-attribute start (file-position in) name value))]
+ [else (make-attribute start (file-position in) name (symbol->string name))])))
+
+ ;; skip-space : Input-port -> Void
+ ;; deviation - should sometimes insist on at least one space
+ (define (skip-space in)
+ (let loop ()
+ (let ([c (peek-char in)])
+ (when (and (not (eof-object? c)) (char-whitespace? c))
+ (read-char in)
+ (loop)))))
+
+ ;; lex-pcdata : Input-port -> Pcdata
+ ;; deviation - disallow ]]> "for compatability" with SGML, sec 2.4 XML spec
+ (define (lex-pcdata in)
+ (let ([start (file-position in)])
+ ;; The following regexp match must use bytes, not chars, because
+ ;; `in' might not be a well-formed UTF-8 sequence. If it isn't,
+ ;; and it goes wrong with the first byte sequence, then a char-based
+ ;; pattern would match 0 characters. Meanwhile, the caller of this function
+ ;; expects characters to be read.
+ (let ([s (regexp-match #rx#"^[^&<]*" in)])
+ (make-pcdata start
+ (file-position in)
+ (bytes->string/utf-8
+ (if (trim-whitespace)
+ (regexp-replace* #rx#"[ \t\v\r\n]+" (car s) #"")
+ (car s))
+ #\?)))))
+ #|
;; Original slow version:
(define (lex-pcdata in)
(let ([start (file-position in)]
@@ -311,22 +309,22 @@
(list->string data))))
|#
-
- ;; lex-name : Input-port -> Symbol
- (define (lex-name in)
- (let ([s (bytes->string/utf-8 (car (regexp-match #rx"^[a-zA-Z_:0-9&.-]*" in)))])
- (string->symbol
- ;; Common case: string is already lowercased
- (if (regexp-match-positions #rx"[A-Z]" s)
- (begin
- (string-lowercase! s)
- s)
- s))))
- ;; lex-name/case-sensitive : Input-port -> Symbol
- (define (lex-name/case-sensitive in)
- (let ([s (bytes->string/utf-8 (car (regexp-match #rx"^[a-zA-Z_:0-9&.-]*" in)))])
- (string->symbol s)))
-#|
+
+ ;; lex-name : Input-port -> Symbol
+ (define (lex-name in)
+ (let ([s (bytes->string/utf-8 (car (regexp-match #rx"^[a-zA-Z_:0-9&.-]*" in)))])
+ (string->symbol
+ ;; Common case: string is already lowercased
+ (if (regexp-match-positions #rx"[A-Z]" s)
+ (begin
+ (string-lowercase! s)
+ s)
+ s))))
+ ;; lex-name/case-sensitive : Input-port -> Symbol
+ (define (lex-name/case-sensitive in)
+ (let ([s (bytes->string/utf-8 (car (regexp-match #rx"^[a-zA-Z_:0-9&.-]*" in)))])
+ (string->symbol s)))
+ #|
(define (lex-name in)
(string->symbol
(list->string
@@ -336,101 +334,100 @@
(cons (char-downcase (read-char in)) (lex-rest))]
[else null])))))
|#
-
-
- ;; skip-dtd : Input-port -> Void
- (define (skip-dtd in)
- (let skip ()
- (let ([c (read-char in)])
- (if (eof-object? c)
- (void)
- (case c
- [(#\') (read-until #\' in) (skip)]
- [(#\") (read-until #\" in) (skip)]
- [(#\<)
- (case (read-char in)
- [(#\!) (case (read-char in)
- [(#\-) (read-char in) (lex-comment-contents in) (skip)]
- [else (skip) (skip)])]
- [(#\?) (lex-pi-data in) (skip)]
- [else (skip) (skip)])]
- [(#\>) (void)]
- [else (skip)])))))
-
- ;; name-start? : TST -> Bool
- (define (name-start? ch)
- (and (char? ch) (char-name-start? ch)))
-
- ;; char-name-start? : Char -> Bool
- (define (char-name-start? ch)
- (or (char-alphabetic? ch)
- (eq? ch #\_)
- (eq? ch #\:)))
-
- ;; name-char? : TST -> Bool
- (define (name-char? ch)
- (and (char? ch)
- (or (char-name-start? ch)
- (char-numeric? ch)
- (eq? ch #\&) ; ugly illegal junk for SEC's EDGAR database
- (eq? ch #\.)
- (eq? ch #\-))))
-
- ;; read-up-to : (Char -> Bool) Input-port -> (listof Char)
- ;; abstract this with read-until
- (define (read-up-to p? in)
- (let loop ()
- (let ([c (peek-char in)])
- (cond
- [(or (eof-object? c) (p? c)) null]
- [else (cons (read-char in) (loop))]))))
-
- ;; read-until : Char Input-port -> String
- ;; discards the stop character, too
- (define (read-until char in)
- (list->string
- (let read-more ()
- (let ([c (read-char in)])
- (cond
- [(or (eof-object? c) (eq? c char)) null]
- [else (cons c (read-more))])))))
-
- ;; gen-read-until-string : String -> Input-port -> String
- ;; uses Knuth-Morris-Pratt from
- ;; Introduction to Algorithms, Cormen, Leiserson, and Rivest, pages 869-876
- ;; discards stop from input
- (define (gen-read-until-string stop)
- (let* ([len (string-length stop)]
- [prefix (make-vector len 0)]
- [fall-back
- (lambda (k c)
- (let ([k (let loop ([k k])
- (cond
- [(and (> k 0) (not (eq? (string-ref stop k) c)))
- (loop (vector-ref prefix (sub1 k)))]
- [else k]))])
- (if (eq? (string-ref stop k) c)
- (add1 k)
- k)))])
- (let init ([k 0] [q 1])
- (when (< q len)
- (let ([k (fall-back k (string-ref stop q))])
- (vector-set! prefix q k)
- (init k (add1 q)))))
- ;; (vector-ref prefix x) = the longest suffix that matches a prefix of stop
- (lambda (in)
- (list->string
- (let/ec out
- (let loop ([matched 0] [out out])
- (let* ([c (read-char in)]
- [matched (fall-back matched c)])
- (cond
- [(or (eof-object? c) (= matched len)) (out null)]
- [(zero? matched) (cons c (let/ec out (loop matched out)))]
- [else (cons c (loop matched out))]))))))))
-
- ;; "-->" makes more sense, but "--" follows the spec, but this isn't XML anymore.
- (define lex-comment-contents (gen-read-until-string "-->"))
- (define lex-pi-data (gen-read-until-string "?>"))
- (define lex-cdata-contents (gen-read-until-string "]]>")))))
-
+
+
+ ;; skip-dtd : Input-port -> Void
+ (define (skip-dtd in)
+ (let skip ()
+ (let ([c (read-char in)])
+ (if (eof-object? c)
+ (void)
+ (case c
+ [(#\') (read-until #\' in) (skip)]
+ [(#\") (read-until #\" in) (skip)]
+ [(#\<)
+ (case (read-char in)
+ [(#\!) (case (read-char in)
+ [(#\-) (read-char in) (lex-comment-contents in) (skip)]
+ [else (skip) (skip)])]
+ [(#\?) (lex-pi-data in) (skip)]
+ [else (skip) (skip)])]
+ [(#\>) (void)]
+ [else (skip)])))))
+
+ ;; name-start? : TST -> Bool
+ (define (name-start? ch)
+ (and (char? ch) (char-name-start? ch)))
+
+ ;; char-name-start? : Char -> Bool
+ (define (char-name-start? ch)
+ (or (char-alphabetic? ch)
+ (eq? ch #\_)
+ (eq? ch #\:)))
+
+ ;; name-char? : TST -> Bool
+ (define (name-char? ch)
+ (and (char? ch)
+ (or (char-name-start? ch)
+ (char-numeric? ch)
+ (eq? ch #\&) ; ugly illegal junk for SEC's EDGAR database
+ (eq? ch #\.)
+ (eq? ch #\-))))
+
+ ;; read-up-to : (Char -> Bool) Input-port -> (listof Char)
+ ;; abstract this with read-until
+ (define (read-up-to p? in)
+ (let loop ()
+ (let ([c (peek-char in)])
+ (cond
+ [(or (eof-object? c) (p? c)) null]
+ [else (cons (read-char in) (loop))]))))
+
+ ;; read-until : Char Input-port -> String
+ ;; discards the stop character, too
+ (define (read-until char in)
+ (list->string
+ (let read-more ()
+ (let ([c (read-char in)])
+ (cond
+ [(or (eof-object? c) (eq? c char)) null]
+ [else (cons c (read-more))])))))
+
+ ;; gen-read-until-string : String -> Input-port -> String
+ ;; uses Knuth-Morris-Pratt from
+ ;; Introduction to Algorithms, Cormen, Leiserson, and Rivest, pages 869-876
+ ;; discards stop from input
+ (define (gen-read-until-string stop)
+ (let* ([len (string-length stop)]
+ [prefix (make-vector len 0)]
+ [fall-back
+ (lambda (k c)
+ (let ([k (let loop ([k k])
+ (cond
+ [(and (> k 0) (not (eq? (string-ref stop k) c)))
+ (loop (vector-ref prefix (sub1 k)))]
+ [else k]))])
+ (if (eq? (string-ref stop k) c)
+ (add1 k)
+ k)))])
+ (let init ([k 0] [q 1])
+ (when (< q len)
+ (let ([k (fall-back k (string-ref stop q))])
+ (vector-set! prefix q k)
+ (init k (add1 q)))))
+ ;; (vector-ref prefix x) = the longest suffix that matches a prefix of stop
+ (lambda (in)
+ (list->string
+ (let/ec out
+ (let loop ([matched 0] [out out])
+ (let* ([c (read-char in)]
+ [matched (fall-back matched c)])
+ (cond
+ [(or (eof-object? c) (= matched len)) (out null)]
+ [(zero? matched) (cons c (let/ec out (loop matched out)))]
+ [else (cons c (loop matched out))]))))))))
+
+ ;; "-->" makes more sense, but "--" follows the spec, but this isn't XML anymore.
+ (define lex-comment-contents (gen-read-until-string "-->"))
+ (define lex-pi-data (gen-read-until-string "?>"))
+ (define lex-cdata-contents (gen-read-until-string "]]>")))
diff --git a/collects/html/sgml-reader.ss b/collects/html/sgml-reader.ss
new file mode 100644
index 0000000000..4dfe8a95be
--- /dev/null
+++ b/collects/html/sgml-reader.ss
@@ -0,0 +1,429 @@
+;; copyright by Paul Graunke June 2000 AD
+;; warning - this was copied from the XML collection.
+;; It needs to be abstracted back in.
+#lang scheme
+(require mzlib/list
+ mzlib/string
+ "sgml-reader-sig.ss"
+ xml)
+
+(provide-signature-elements sgml-reader^)
+
+ ;; Start-tag ::= (make-start-tag Location Location Symbol (listof Attribute))
+ (define-struct (start-tag source) (name attrs))
+
+ ;; End-tag ::= (make-end-tag Location Location Symbol)
+ (define-struct (end-tag source) (name))
+
+ ;; Token ::= Contents | Start-tag | End-tag | Eof
+
+ (define read-html-comments (make-parameter #f))
+ (define trim-whitespace (make-parameter #f))
+
+ ;; Kid-lister : (Symbol -> (U (listof Symbol) #f))
+
+ ;; gen-may-contain : Spec -> Kid-lister
+ (define (gen-may-contain spec)
+ (let ([table (make-hash)])
+ (for-each (lambda (def)
+ (let ([rhs (cdr def)])
+ (for-each (lambda (name) (hash-set! table name rhs))
+ (car def))))
+ spec)
+ (lambda (name)
+ (hash-ref table name (lambda () #f)))))
+
+ ;; gen-read-sgml : Kid-lister (Symbol Symbol -> (U #f Symbol)) -> [Input-port] -> (listof Content)
+ (define (gen-read-sgml may-contain auto-insert)
+ (case-lambda
+ [(in) (read-from-port may-contain auto-insert in)]
+ [() (read-from-port may-contain auto-insert (current-input-port))]))
+
+ ;; read-from-port : Kid-lister (Symbol Symbol -> (U #f Symbol)) Input-port -> (listof Content)
+ (define (read-from-port may-contain auto-insert in)
+ (let loop ([tokens (let read-tokens ()
+ (let ([tok (lex in)])
+ (cond
+ [(eof-object? tok) null]
+ [else (cons tok (read-tokens))])))])
+ (cond
+ [(null? tokens) null]
+ [else
+ (let ([tok (car tokens)] [rest-tokens (cdr tokens)])
+ (cond
+ [(start-tag? tok)
+ (let-values ([(el more-tokens) (read-element tok null may-contain auto-insert rest-tokens)])
+ (cons el (loop more-tokens)))]
+ [(end-tag? tok) (loop rest-tokens)]
+ [else (let ([rest-contents (loop rest-tokens)])
+ (expand-content tok rest-contents))]))])))
+
+ ;; read-element : Start-tag (listof Symbol) Kid-lister (Symbol Symbol -> (U #f Symbol)) (listof Token) -> Element (listof Token)
+ ;; Note: How elements nest depends on their content model.
+ ;; If a kind of element can't contain anything, then its start tags are implicitly ended, and
+ ;; end tags are implicitly started.
+ ;; Unknown elements can contain anything and can go inside anything.
+ ;; Otherwise, only the subelements listed in the content model can go inside an element.
+ ;; more here - may-contain shouldn't be used to decide if an element is known or not.
+ ;; The edgar dtd puts tags in may-contain's range that aren't in its domain.
+ ;; more here (or not) - the (memq name context) test leaks for a worst case of O(n^2) in the
+ ;; tag nesting depth. However, this only should be a problem when the tag is there,
+ ;; but far back. That shouldn't happen often. I'm guessing n will be about 3.
+ (define (read-element start-tag context may-contain auto-insert tokens)
+ (let read-el ([start-tag start-tag] [context (cons (start-tag-name start-tag) context)] [tokens tokens])
+ (let* ([start-name (start-tag-name start-tag)]
+ [ok-kids (may-contain start-name)])
+ (let-values ([(content remaining)
+ (cond
+ [(null? ok-kids) (values null tokens)]
+ [else
+ ;; read-content : (listof Token) -> (listof Content) (listof Token)
+ (let read-content ([tokens tokens])
+ (cond
+ [(null? tokens) (values null tokens)]
+ [else
+ (let ([tok (car tokens)] [next-tokens (cdr tokens)])
+ (cond
+ [(start-tag? tok)
+ (let* ([name (start-tag-name tok)]
+ [auto-start (auto-insert start-name name)])
+ (if auto-start
+ (read-content (cons (make-start-tag (source-start tok) (source-stop tok) auto-start null) tokens))
+ (if (and ok-kids
+ (not (memq name ok-kids))
+ (may-contain name))
+ (values null tokens)
+ (let*-values ([(element post-element)
+ (read-el tok (cons name context) next-tokens)]
+ [(more-contents left-overs) (read-content post-element)])
+ (values (cons element more-contents) left-overs)))))]
+ [(end-tag? tok)
+ (let ([name (end-tag-name tok)])
+ (if (eq? name start-name)
+ (values null next-tokens)
+ (if (memq name context)
+ (values null tokens)
+ (read-content next-tokens))))]
+ [else ;; content
+ (let-values ([(more-contents left-overs) (read-content next-tokens)])
+ (values
+ (expand-content tok more-contents)
+ left-overs))]))]))])])
+ (values (make-element (source-start start-tag)
+ (source-stop start-tag)
+ start-name
+ (start-tag-attrs start-tag)
+ content)
+ remaining)))))
+
+ ;; expand-content : Content (listof Content) -> (listof Content)
+ (define (expand-content x lst)
+ (cond
+ [(entity? x) (cons (expand-entity x) lst)]
+ [(comment? x) (if (read-html-comments)
+ (cons x lst)
+ lst)]
+ [else (cons x lst)]))
+
+ ;; expand-entity : Entity -> (U Entity Pcdata)
+ ;; more here - allow expansion of user defined entities
+ (define (expand-entity x)
+ (let ([expanded (default-entity-table (entity-text x))])
+ (if expanded
+ (make-pcdata (source-start x) (source-stop x) expanded)
+ x)))
+
+ ;; default-entity-table : Symbol -> (U #f String)
+ (define (default-entity-table name)
+ (case name
+ [(amp) "&"]
+ [(lt) "<"]
+ [(gt) ">"]
+ [(quot) "\""]
+ [(apos) "'"]
+ [else #f]))
+
+ ;; lex : Input-port -> Token
+ (define (lex in)
+ (when (trim-whitespace)
+ (skip-space in))
+ (let ([c (peek-char in)])
+ (cond
+ [(eof-object? c) c]
+ [(eq? c #\&) (lex-entity in)]
+ [(eq? c #\<) (lex-tag-cdata-pi-comment in)]
+ [else (lex-pcdata in)])))
+
+ ;; lex-entity : Input-port -> Token
+ ;; This might not return an entity if it doesn't look like one afterall.
+ (define (lex-entity in)
+ (let ([start (file-position in)])
+ (read-char in)
+ (case (peek-char in)
+ ;; more here - read while it's numeric (or hex) not until #\;
+ [(#\#)
+ (read-char in)
+ (let* ([hex? (if (equal? #\x (peek-char in))
+ (and (read-char in) #t)
+ #f)]
+ [str (read-until #\; in)]
+ [n (cond
+ [hex?
+ (string->number str 16)]
+ [else (string->number str)])])
+ (if (number? n)
+ (make-entity start (file-position in) n)
+ (make-pcdata start (file-position in) (string-append "" str))))]
+ [else
+ (let ([name (lex-name/case-sensitive in)]
+ [c (peek-char in)])
+ (if (eq? c #\;)
+ (begin (read-char in) (make-entity start (file-position in) name))
+ (make-pcdata start (file-position in) (format "&~a" name))))])))
+
+ ;; lex-tag-cdata-pi-comment : Input-port -> Start-tag | Element | End-tag | Pcdata | Pi | Comment
+ (define (lex-tag-cdata-pi-comment in)
+ (let ([start (file-position in)])
+ (read-char in)
+ (case (peek-char in)
+ [(#\!)
+ (read-char in)
+ (case (peek-char in)
+ [(#\-) (read-char in)
+ (let ([c (read-char in)])
+ (cond
+ [(eq? c #\-)
+ (let ([data (lex-comment-contents in)])
+ (make-comment data))]
+ [else (make-pcdata start (file-position in) (format " or whatever else is there
+ (make-end-tag start (file-position in) name))]
+ [else
+ (let ([name (lex-name in)]
+ [attrs (lex-attributes in)])
+ (skip-space in)
+ (case (read-char in)
+ [(#\/)
+ (read-char in) ;; skip #\> or something
+ (make-element start (file-position in) name attrs null)]
+ [else (make-start-tag start (file-position in) name attrs)]))])))
+
+
+ ;; lex-attributes : Input-port -> (listof Attribute)
+ (define (lex-attributes in)
+ (sort (let loop ()
+ (skip-space in)
+ (cond [(name-start? (peek-char in))
+ (cons (lex-attribute in) (loop))]
+ [else null]))
+ (lambda (a b)
+ (string (symbol->string (attribute-name a))
+ (symbol->string (attribute-name b))))))
+
+ ;; lex-attribute : Input-port -> Attribute
+ ;; Note: entities in attributes are ignored, since defacto html uses & in them for URL syntax
+ (define (lex-attribute in)
+ (let ([start (file-position in)]
+ [name (lex-name in)])
+ (skip-space in)
+ (cond
+ [(eq? (peek-char in) #\=)
+ (read-char in)
+ (skip-space in)
+ (let* ([delimiter (read-char in)]
+ [value (list->string
+ (case delimiter
+ [(#\' #\")
+ (let read-more ()
+ (let ([c (read-char in)])
+ (cond
+ [(or (eq? c delimiter) (eof-object? c)) null]
+ [else (cons c (read-more))])))]
+ [else (cons delimiter (read-up-to (lambda (c) (or (char-whitespace? c) (eq? c #\>))) in))]))])
+ (make-attribute start (file-position in) name value))]
+ [else (make-attribute start (file-position in) name (symbol->string name))])))
+
+ ;; skip-space : Input-port -> Void
+ ;; deviation - should sometimes insist on at least one space
+ (define (skip-space in)
+ (let loop ()
+ (let ([c (peek-char in)])
+ (when (and (not (eof-object? c)) (char-whitespace? c))
+ (read-char in)
+ (loop)))))
+
+ ;; lex-pcdata : Input-port -> Pcdata
+ ;; deviation - disallow ]]> "for compatability" with SGML, sec 2.4 XML spec
+ (define (lex-pcdata in)
+ (let ([start (file-position in)])
+ ;; The following regexp match must use bytes, not chars, because
+ ;; `in' might not be a well-formed UTF-8 sequence. If it isn't,
+ ;; and it goes wrong with the first byte sequence, then a char-based
+ ;; pattern would match 0 characters. Meanwhile, the caller of this function
+ ;; expects characters to be read.
+ (let ([s (regexp-match #rx#"^[^&<]*" in)])
+ (make-pcdata start
+ (file-position in)
+ (bytes->string/utf-8
+ (if (trim-whitespace)
+ (regexp-replace* #rx#"[ \t\v\r\n]+" (car s) #"")
+ (car s))
+ #\?)))))
+ #|
+ ;; Original slow version:
+ (define (lex-pcdata in)
+ (let ([start (file-position in)]
+ [data (let loop ([c (read-char in)])
+ (let ([next (peek-char in)])
+ (cond
+ [(or (eof-object? next) (eq? next #\&) (eq? next #\<))
+ (list c)]
+ [(and (char-whitespace? next) (trim-whitespace))
+ (skip-space in)
+ (let ([lst (loop #\space)])
+ (cond
+ [(null? (cdr lst)) (list c)]
+ [else (cons c lst)]))]
+ [else (cons c (loop (read-char in)))])))])
+ (make-pcdata start
+ (file-position in)
+ (list->string data))))
+ |#
+
+
+ ;; lex-name : Input-port -> Symbol
+ (define (lex-name in)
+ (let ([s (bytes->string/utf-8 (car (regexp-match #rx"^[a-zA-Z_:0-9&.-]*" in)))])
+ (string->symbol
+ ;; Common case: string is already lowercased
+ (if (regexp-match-positions #rx"[A-Z]" s)
+ (begin
+ (string-lowercase! s)
+ s)
+ s))))
+ ;; lex-name/case-sensitive : Input-port -> Symbol
+ (define (lex-name/case-sensitive in)
+ (let ([s (bytes->string/utf-8 (car (regexp-match #rx"^[a-zA-Z_:0-9&.-]*" in)))])
+ (string->symbol s)))
+ #|
+ (define (lex-name in)
+ (string->symbol
+ (list->string
+ (let lex-rest ()
+ (cond
+ [(name-char? (peek-char in))
+ (cons (char-downcase (read-char in)) (lex-rest))]
+ [else null])))))
+|#
+
+
+ ;; skip-dtd : Input-port -> Void
+ (define (skip-dtd in)
+ (let skip ()
+ (let ([c (read-char in)])
+ (if (eof-object? c)
+ (void)
+ (case c
+ [(#\') (read-until #\' in) (skip)]
+ [(#\") (read-until #\" in) (skip)]
+ [(#\<)
+ (case (read-char in)
+ [(#\!) (case (read-char in)
+ [(#\-) (read-char in) (lex-comment-contents in) (skip)]
+ [else (skip) (skip)])]
+ [(#\?) (lex-pi-data in) (skip)]
+ [else (skip) (skip)])]
+ [(#\>) (void)]
+ [else (skip)])))))
+
+ ;; name-start? : TST -> Bool
+ (define (name-start? ch)
+ (and (char? ch) (char-name-start? ch)))
+
+ ;; char-name-start? : Char -> Bool
+ (define (char-name-start? ch)
+ (or (char-alphabetic? ch)
+ (eq? ch #\_)
+ (eq? ch #\:)))
+
+ ;; name-char? : TST -> Bool
+ (define (name-char? ch)
+ (and (char? ch)
+ (or (char-name-start? ch)
+ (char-numeric? ch)
+ (eq? ch #\&) ; ugly illegal junk for SEC's EDGAR database
+ (eq? ch #\.)
+ (eq? ch #\-))))
+
+ ;; read-up-to : (Char -> Bool) Input-port -> (listof Char)
+ ;; abstract this with read-until
+ (define (read-up-to p? in)
+ (let loop ()
+ (let ([c (peek-char in)])
+ (cond
+ [(or (eof-object? c) (p? c)) null]
+ [else (cons (read-char in) (loop))]))))
+
+ ;; read-until : Char Input-port -> String
+ ;; discards the stop character, too
+ (define (read-until char in)
+ (list->string
+ (let read-more ()
+ (let ([c (read-char in)])
+ (cond
+ [(or (eof-object? c) (eq? c char)) null]
+ [else (cons c (read-more))])))))
+
+ ;; gen-read-until-string : String -> Input-port -> String
+ ;; uses Knuth-Morris-Pratt from
+ ;; Introduction to Algorithms, Cormen, Leiserson, and Rivest, pages 869-876
+ ;; discards stop from input
+ (define (gen-read-until-string stop)
+ (let* ([len (string-length stop)]
+ [prefix (make-vector len 0)]
+ [fall-back
+ (lambda (k c)
+ (let ([k (let loop ([k k])
+ (cond
+ [(and (> k 0) (not (eq? (string-ref stop k) c)))
+ (loop (vector-ref prefix (sub1 k)))]
+ [else k]))])
+ (if (eq? (string-ref stop k) c)
+ (add1 k)
+ k)))])
+ (let init ([k 0] [q 1])
+ (when (< q len)
+ (let ([k (fall-back k (string-ref stop q))])
+ (vector-set! prefix q k)
+ (init k (add1 q)))))
+ ;; (vector-ref prefix x) = the longest suffix that matches a prefix of stop
+ (lambda (in)
+ (list->string
+ (let/ec out
+ (let loop ([matched 0] [out out])
+ (let* ([c (read-char in)]
+ [matched (fall-back matched c)])
+ (cond
+ [(or (eof-object? c) (= matched len)) (out null)]
+ [(zero? matched) (cons c (let/ec out (loop matched out)))]
+ [else (cons c (loop matched out))]))))))))
+
+ ;; "-->" makes more sense, but "--" follows the spec, but this isn't XML anymore.
+ (define lex-comment-contents (gen-read-until-string "-->"))
+ (define lex-pi-data (gen-read-until-string "?>"))
+ (define lex-cdata-contents (gen-read-until-string "]]>"))
diff --git a/collects/tests/html/test.ss b/collects/tests/html/test.ss
new file mode 100644
index 0000000000..2b53719672
--- /dev/null
+++ b/collects/tests/html/test.ss
@@ -0,0 +1,45 @@
+#lang scheme
+(require (planet schematics/schemeunit:3)
+ (planet schematics/schemeunit:3/text-ui)
+ (prefix-in h: html)
+ (prefix-in x: xml))
+
+(define html-tests
+ (test-suite
+ "HTML"
+
+ (test-case
+ "Example"
+ (local
+ [(define an-html
+ (h:read-xhtml
+ (open-input-string
+ (string-append
+ "
My title"
+ "Hello world
Testing!
"
+ ""))))
+
+ ; extract-pcdata: html-content -> (listof string)
+ ; Pulls out the pcdata strings from some-content.
+ (define (extract-pcdata some-content)
+ (cond [(x:pcdata? some-content)
+ (list (x:pcdata-string some-content))]
+ [(x:entity? some-content)
+ (list)]
+ [else
+ (extract-pcdata-from-element some-content)]))
+
+ ; extract-pcdata-from-element: html-element -> (listof string)
+ ; Pulls out the pcdata strings from an-html-element.
+ (define (extract-pcdata-from-element an-html-element)
+ (match an-html-element
+ [(struct h:html-full (attributes content))
+ (apply append (map extract-pcdata content))]
+
+ [(struct h:html-element (attributes))
+ '()]))]
+
+ (check-equal? (extract-pcdata an-html)
+ ' ("My title" "Hello world" "Testing" "!"))))))
+
+(run-tests html-tests)
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/canonxml.html b/collects/tests/xml/clark-tests/canonxml.html
new file mode 100644
index 0000000000..2ba0edf6c6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/canonxml.html
@@ -0,0 +1,44 @@
+
+Canonical XML
+
+Canonical XML
+
+This document defines a subset of XML called canonical XML.
+The intended use of canonical XML is in testing XML processors,
+as a representation of the result of parsing an XML document.
+
+Every well-formed XML document has a unique structurally equivalent
+canonical XML document. Two structurally equivalent XML
+documents have a byte-for-byte identical canonical XML document.
+Canonicalizing an XML document requires only information that an XML
+processor is required to make available to an application.
+
+A canonical XML document conforms to the following grammar:
+
+CanonXML ::= Pi* element Pi*
+element ::= Stag (Datachar | Pi | element)* Etag
+Stag ::= '<' Name Atts '>'
+Etag ::= '</' Name '>'
+Pi ::= '<?' Name ' ' (((Char - S) Char*)? - (Char* '?>' Char*)) '?>'
+Atts ::= (' ' Name '=' '"' Datachar* '"')*
+Datachar ::= '&' | '<' | '>' | '"'
+ | '	'| ' '| ' '
+ | (Char - ('&' | '<' | '>' | '"' | #x9 | #xA | #xD))
+Name ::= (see XML spec)
+Char ::= (see XML spec)
+S ::= (see XML spec)
+
+
+Attributes are in lexicographical order (in Unicode bit order).
+
+A canonical XML document is encoded in UTF-8.
+
+Ignorable white space is considered significant and is treated equivalently
+to data.
+
+
+James Clark
+
+
+
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/invalid/001.ent b/collects/tests/xml/clark-tests/invalid/001.ent
new file mode 100644
index 0000000000..f70eaea9c4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/001.ent
@@ -0,0 +1,3 @@
+
+
+%e; -->
diff --git a/collects/tests/xml/clark-tests/invalid/001.xml b/collects/tests/xml/clark-tests/invalid/001.xml
new file mode 100644
index 0000000000..36188451ae
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/invalid/002.ent b/collects/tests/xml/clark-tests/invalid/002.ent
new file mode 100644
index 0000000000..4cb848b438
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/002.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/invalid/002.xml b/collects/tests/xml/clark-tests/invalid/002.xml
new file mode 100644
index 0000000000..5a3a96d1ab
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/002.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/invalid/003.ent b/collects/tests/xml/clark-tests/invalid/003.ent
new file mode 100644
index 0000000000..54f3c821b8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/003.ent
@@ -0,0 +1,2 @@
+
+%e; doc (#PCDATA)>
diff --git a/collects/tests/xml/clark-tests/invalid/003.xml b/collects/tests/xml/clark-tests/invalid/003.xml
new file mode 100644
index 0000000000..dd01f41126
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/invalid/004.ent b/collects/tests/xml/clark-tests/invalid/004.ent
new file mode 100644
index 0000000000..aae4cc2929
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/004.ent
@@ -0,0 +1,3 @@
+
+">
+%e1; doc (#PCDATA) %e2;
diff --git a/collects/tests/xml/clark-tests/invalid/004.xml b/collects/tests/xml/clark-tests/invalid/004.xml
new file mode 100644
index 0000000000..20cdf6d0e5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/004.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/invalid/005.ent b/collects/tests/xml/clark-tests/invalid/005.ent
new file mode 100644
index 0000000000..85e16474a6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/005.ent
@@ -0,0 +1,2 @@
+">
+
+
diff --git a/collects/tests/xml/clark-tests/invalid/006.ent b/collects/tests/xml/clark-tests/invalid/006.ent
new file mode 100644
index 0000000000..116ca79657
--- /dev/null
+++ b/collects/tests/xml/clark-tests/invalid/006.ent
@@ -0,0 +1,2 @@
+">
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/ext-sa/001.ent b/collects/tests/xml/clark-tests/not-wf/ext-sa/001.ent
new file mode 100644
index 0000000000..378a2074b7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/ext-sa/001.ent
@@ -0,0 +1 @@
+&e;
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/ext-sa/001.xml b/collects/tests/xml/clark-tests/not-wf/ext-sa/001.xml
new file mode 100644
index 0000000000..aa624cbe71
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/ext-sa/001.xml
@@ -0,0 +1,4 @@
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/ext-sa/002.ent b/collects/tests/xml/clark-tests/not-wf/ext-sa/002.ent
new file mode 100644
index 0000000000..2cd184a213
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/ext-sa/002.ent
@@ -0,0 +1,3 @@
+
+data
+
diff --git a/collects/tests/xml/clark-tests/not-wf/ext-sa/002.xml b/collects/tests/xml/clark-tests/not-wf/ext-sa/002.xml
new file mode 100644
index 0000000000..9eaf91724f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/ext-sa/002.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/ext-sa/003.ent b/collects/tests/xml/clark-tests/not-wf/ext-sa/003.ent
new file mode 100644
index 0000000000..35cf4892f2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/ext-sa/003.ent
@@ -0,0 +1,2 @@
+
+data
diff --git a/collects/tests/xml/clark-tests/not-wf/ext-sa/003.xml b/collects/tests/xml/clark-tests/not-wf/ext-sa/003.xml
new file mode 100644
index 0000000000..bb60b663ef
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/ext-sa/003.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/001.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/001.ent
new file mode 100644
index 0000000000..00096e572e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/001.ent
@@ -0,0 +1,3 @@
+
+]>
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/001.xml b/collects/tests/xml/clark-tests/not-wf/not-sa/001.xml
new file mode 100644
index 0000000000..36188451ae
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/001.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/002.xml b/collects/tests/xml/clark-tests/not-wf/not-sa/002.xml
new file mode 100644
index 0000000000..dd73174135
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/002.xml
@@ -0,0 +1,6 @@
+
+">
+%e;
+]>
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/003.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/003.ent
new file mode 100644
index 0000000000..abf1b1a35e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/003.ent
@@ -0,0 +1,2 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/004.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/004.ent
new file mode 100644
index 0000000000..552e4f520a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/004.ent
@@ -0,0 +1,2 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/005.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/005.ent
new file mode 100644
index 0000000000..9a369cef12
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/005.ent
@@ -0,0 +1,2 @@
+
+%e;
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/005.xml b/collects/tests/xml/clark-tests/not-wf/not-sa/005.xml
new file mode 100644
index 0000000000..383553d24f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/005.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/006.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/006.ent
new file mode 100644
index 0000000000..771daf1915
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/006.ent
@@ -0,0 +1,3 @@
+
+]]>
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/006.xml b/collects/tests/xml/clark-tests/not-wf/not-sa/006.xml
new file mode 100644
index 0000000000..2f14e839e2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/006.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/007.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/007.ent
new file mode 100644
index 0000000000..9e9866d2ad
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/007.ent
@@ -0,0 +1,3 @@
+
+]>
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/007.xml b/collects/tests/xml/clark-tests/not-wf/not-sa/007.xml
new file mode 100644
index 0000000000..38897e34ea
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/007.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/008.ent b/collects/tests/xml/clark-tests/not-wf/not-sa/008.ent
new file mode 100644
index 0000000000..f8b1cd3dad
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/008.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/not-sa/008.xml b/collects/tests/xml/clark-tests/not-wf/not-sa/008.xml
new file mode 100644
index 0000000000..54351009cd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/not-sa/008.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/001.xml b/collects/tests/xml/clark-tests/not-wf/sa/001.xml
new file mode 100644
index 0000000000..d33ec68dcd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/001.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/002.xml b/collects/tests/xml/clark-tests/not-wf/sa/002.xml
new file mode 100644
index 0000000000..0a64d52428
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/002.xml
@@ -0,0 +1,4 @@
+
+<.doc>
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/003.xml b/collects/tests/xml/clark-tests/not-wf/sa/003.xml
new file mode 100644
index 0000000000..e0b8bae4a4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/003.xml
@@ -0,0 +1 @@
+ ?>
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/004.xml b/collects/tests/xml/clark-tests/not-wf/sa/004.xml
new file mode 100644
index 0000000000..e85bc96e56
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/004.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/005.xml b/collects/tests/xml/clark-tests/not-wf/sa/005.xml
new file mode 100644
index 0000000000..7cd44ef10c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/005.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/006.xml b/collects/tests/xml/clark-tests/not-wf/sa/006.xml
new file mode 100644
index 0000000000..8594c35cc7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/006.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/007.xml b/collects/tests/xml/clark-tests/not-wf/sa/007.xml
new file mode 100644
index 0000000000..286756fdd5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/007.xml
@@ -0,0 +1 @@
+& no refc
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/008.xml b/collects/tests/xml/clark-tests/not-wf/sa/008.xml
new file mode 100644
index 0000000000..29ef40306b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/008.xml
@@ -0,0 +1 @@
+&.entity;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/009.xml b/collects/tests/xml/clark-tests/not-wf/sa/009.xml
new file mode 100644
index 0000000000..8e3ff7de10
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/009.xml
@@ -0,0 +1 @@
+RE;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/010.xml b/collects/tests/xml/clark-tests/not-wf/sa/010.xml
new file mode 100644
index 0000000000..a6790846c9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/010.xml
@@ -0,0 +1 @@
+A & B
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/011.xml b/collects/tests/xml/clark-tests/not-wf/sa/011.xml
new file mode 100644
index 0000000000..57eaf9fc48
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/011.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/012.xml b/collects/tests/xml/clark-tests/not-wf/sa/012.xml
new file mode 100644
index 0000000000..1b2539ffa6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/012.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/013.xml b/collects/tests/xml/clark-tests/not-wf/sa/013.xml
new file mode 100644
index 0000000000..3540df9143
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/013.xml
@@ -0,0 +1 @@
+">
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/015.xml b/collects/tests/xml/clark-tests/not-wf/sa/015.xml
new file mode 100644
index 0000000000..f2baf947b5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/015.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/016.xml b/collects/tests/xml/clark-tests/not-wf/sa/016.xml
new file mode 100644
index 0000000000..22d4b2e265
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/016.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/017.xml b/collects/tests/xml/clark-tests/not-wf/sa/017.xml
new file mode 100644
index 0000000000..a76f5929e9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/017.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/018.xml b/collects/tests/xml/clark-tests/not-wf/sa/018.xml
new file mode 100644
index 0000000000..66e204acc4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/018.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/019.xml b/collects/tests/xml/clark-tests/not-wf/sa/019.xml
new file mode 100644
index 0000000000..b835c2d752
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/019.xml
@@ -0,0 +1 @@
+>
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/020.xml b/collects/tests/xml/clark-tests/not-wf/sa/020.xml
new file mode 100644
index 0000000000..b30cfcfc10
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/020.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/021.xml b/collects/tests/xml/clark-tests/not-wf/sa/021.xml
new file mode 100644
index 0000000000..1bfa84aa64
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/021.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/022.xml b/collects/tests/xml/clark-tests/not-wf/sa/022.xml
new file mode 100644
index 0000000000..44c803bf1b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/022.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/023.xml b/collects/tests/xml/clark-tests/not-wf/sa/023.xml
new file mode 100644
index 0000000000..b877ae2a6b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/023.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/024.xml b/collects/tests/xml/clark-tests/not-wf/sa/024.xml
new file mode 100644
index 0000000000..cf68f2c073
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/024.xml
@@ -0,0 +1,3 @@
+
+<123>123>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/025.xml b/collects/tests/xml/clark-tests/not-wf/sa/025.xml
new file mode 100644
index 0000000000..6cba95cd78
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/025.xml
@@ -0,0 +1 @@
+]]>
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/026.xml b/collects/tests/xml/clark-tests/not-wf/sa/026.xml
new file mode 100644
index 0000000000..347984fa73
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/026.xml
@@ -0,0 +1 @@
+]]]>
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/027.xml b/collects/tests/xml/clark-tests/not-wf/sa/027.xml
new file mode 100644
index 0000000000..cfafaf0d70
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/027.xml
@@ -0,0 +1,3 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/033.xml b/collects/tests/xml/clark-tests/not-wf/sa/033.xml
new file mode 100644
index 0000000000..afd2328402
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/033.xml
@@ -0,0 +1 @@
+abcdef
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/034.xml b/collects/tests/xml/clark-tests/not-wf/sa/034.xml
new file mode 100644
index 0000000000..d74a77719b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/034.xml
@@ -0,0 +1 @@
+A form-feed is not white space or a name character
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/035.xml b/collects/tests/xml/clark-tests/not-wf/sa/035.xml
new file mode 100644
index 0000000000..e1fc920522
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/035.xml
@@ -0,0 +1 @@
+1 < 2 but not in XML
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/036.xml b/collects/tests/xml/clark-tests/not-wf/sa/036.xml
new file mode 100644
index 0000000000..b8ecb21ba1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/036.xml
@@ -0,0 +1,2 @@
+
+Illegal data
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/037.xml b/collects/tests/xml/clark-tests/not-wf/sa/037.xml
new file mode 100644
index 0000000000..2e02662926
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/037.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/038.xml b/collects/tests/xml/clark-tests/not-wf/sa/038.xml
new file mode 100644
index 0000000000..68b2803f82
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/038.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/039.xml b/collects/tests/xml/clark-tests/not-wf/sa/039.xml
new file mode 100644
index 0000000000..80429e3e40
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/039.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/040.xml b/collects/tests/xml/clark-tests/not-wf/sa/040.xml
new file mode 100644
index 0000000000..dc8ba5a434
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/040.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/041.xml b/collects/tests/xml/clark-tests/not-wf/sa/041.xml
new file mode 100644
index 0000000000..30bcdd6bfe
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/041.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/042.xml b/collects/tests/xml/clark-tests/not-wf/sa/042.xml
new file mode 100644
index 0000000000..4ae50efc7b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/042.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/043.xml b/collects/tests/xml/clark-tests/not-wf/sa/043.xml
new file mode 100644
index 0000000000..41824eee4b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/043.xml
@@ -0,0 +1,2 @@
+
+Illegal data
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/044.xml b/collects/tests/xml/clark-tests/not-wf/sa/044.xml
new file mode 100644
index 0000000000..3fc232dc37
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/044.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/045.xml b/collects/tests/xml/clark-tests/not-wf/sa/045.xml
new file mode 100644
index 0000000000..00c10f00bf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/045.xml
@@ -0,0 +1,4 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/046.xml b/collects/tests/xml/clark-tests/not-wf/sa/046.xml
new file mode 100644
index 0000000000..265cb15301
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/046.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/047.xml b/collects/tests/xml/clark-tests/not-wf/sa/047.xml
new file mode 100644
index 0000000000..d18a4a4440
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/047.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/048.xml b/collects/tests/xml/clark-tests/not-wf/sa/048.xml
new file mode 100644
index 0000000000..67419c1ed5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/048.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/049.xml b/collects/tests/xml/clark-tests/not-wf/sa/049.xml
new file mode 100644
index 0000000000..3cf0e79422
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/049.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/050.xml b/collects/tests/xml/clark-tests/not-wf/sa/050.xml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/051.xml b/collects/tests/xml/clark-tests/not-wf/sa/051.xml
new file mode 100644
index 0000000000..b52df12cc4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/051.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/052.xml b/collects/tests/xml/clark-tests/not-wf/sa/052.xml
new file mode 100644
index 0000000000..8283895990
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/052.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/053.xml b/collects/tests/xml/clark-tests/not-wf/sa/053.xml
new file mode 100644
index 0000000000..9d7f36920f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/053.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/054.xml b/collects/tests/xml/clark-tests/not-wf/sa/054.xml
new file mode 100644
index 0000000000..eda553c6d3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/054.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/055.xml b/collects/tests/xml/clark-tests/not-wf/sa/055.xml
new file mode 100644
index 0000000000..cbb3683a9d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/055.xml
@@ -0,0 +1,2 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/056.xml b/collects/tests/xml/clark-tests/not-wf/sa/056.xml
new file mode 100644
index 0000000000..a681684c58
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/056.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/057.xml b/collects/tests/xml/clark-tests/not-wf/sa/057.xml
new file mode 100644
index 0000000000..848d347120
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/057.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/058.xml b/collects/tests/xml/clark-tests/not-wf/sa/058.xml
new file mode 100644
index 0000000000..daba266af2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/058.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/059.xml b/collects/tests/xml/clark-tests/not-wf/sa/059.xml
new file mode 100644
index 0000000000..316083dc25
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/059.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/060.xml b/collects/tests/xml/clark-tests/not-wf/sa/060.xml
new file mode 100644
index 0000000000..9a610fd38f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/060.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/061.xml b/collects/tests/xml/clark-tests/not-wf/sa/061.xml
new file mode 100644
index 0000000000..59181e706f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/061.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/062.xml b/collects/tests/xml/clark-tests/not-wf/sa/062.xml
new file mode 100644
index 0000000000..e62e9cd370
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/062.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/063.xml b/collects/tests/xml/clark-tests/not-wf/sa/063.xml
new file mode 100644
index 0000000000..98675b9040
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/063.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/064.xml b/collects/tests/xml/clark-tests/not-wf/sa/064.xml
new file mode 100644
index 0000000000..3888c46b8b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/064.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/065.xml b/collects/tests/xml/clark-tests/not-wf/sa/065.xml
new file mode 100644
index 0000000000..da9cafd137
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/065.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/066.xml b/collects/tests/xml/clark-tests/not-wf/sa/066.xml
new file mode 100644
index 0000000000..9c09eb4e5d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/066.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/067.xml b/collects/tests/xml/clark-tests/not-wf/sa/067.xml
new file mode 100644
index 0000000000..7e0809bd34
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/067.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/068.xml b/collects/tests/xml/clark-tests/not-wf/sa/068.xml
new file mode 100644
index 0000000000..53a80a83a8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/068.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/069.xml b/collects/tests/xml/clark-tests/not-wf/sa/069.xml
new file mode 100644
index 0000000000..6f891dd5e1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/069.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/070.xml b/collects/tests/xml/clark-tests/not-wf/sa/070.xml
new file mode 100644
index 0000000000..faf4b0ae4c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/070.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/071.xml b/collects/tests/xml/clark-tests/not-wf/sa/071.xml
new file mode 100644
index 0000000000..5bd3908968
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/071.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+&e1;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/072.xml b/collects/tests/xml/clark-tests/not-wf/sa/072.xml
new file mode 100644
index 0000000000..743ba79429
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/072.xml
@@ -0,0 +1 @@
+&foo;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/073.xml b/collects/tests/xml/clark-tests/not-wf/sa/073.xml
new file mode 100644
index 0000000000..2578af42ec
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/073.xml
@@ -0,0 +1,4 @@
+
+]>
+&f;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/074.xml b/collects/tests/xml/clark-tests/not-wf/sa/074.xml
new file mode 100644
index 0000000000..f8abaeb22c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/074.xml
@@ -0,0 +1,6 @@
+">
+]>
+
+&e;
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/075.xml b/collects/tests/xml/clark-tests/not-wf/sa/075.xml
new file mode 100644
index 0000000000..d3dbf50ed6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/075.xml
@@ -0,0 +1,7 @@
+
+
+
+]>
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/076.xml b/collects/tests/xml/clark-tests/not-wf/sa/076.xml
new file mode 100644
index 0000000000..60546720e7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/076.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/077.xml b/collects/tests/xml/clark-tests/not-wf/sa/077.xml
new file mode 100644
index 0000000000..f8ac23a5a2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/077.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/078.xml b/collects/tests/xml/clark-tests/not-wf/sa/078.xml
new file mode 100644
index 0000000000..446cd85ef9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/078.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/079.xml b/collects/tests/xml/clark-tests/not-wf/sa/079.xml
new file mode 100644
index 0000000000..da016fd3b2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/079.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/080.xml b/collects/tests/xml/clark-tests/not-wf/sa/080.xml
new file mode 100644
index 0000000000..fa4b9e428d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/080.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/081.xml b/collects/tests/xml/clark-tests/not-wf/sa/081.xml
new file mode 100644
index 0000000000..d676100e8a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/081.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/082.xml b/collects/tests/xml/clark-tests/not-wf/sa/082.xml
new file mode 100644
index 0000000000..3217d6f8b4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/082.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/083.xml b/collects/tests/xml/clark-tests/not-wf/sa/083.xml
new file mode 100644
index 0000000000..469d43fd42
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/083.xml
@@ -0,0 +1,4 @@
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/084.xml b/collects/tests/xml/clark-tests/not-wf/sa/084.xml
new file mode 100644
index 0000000000..abbbcdea69
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/084.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/085.xml b/collects/tests/xml/clark-tests/not-wf/sa/085.xml
new file mode 100644
index 0000000000..ac0aeca3e4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/085.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/086.xml b/collects/tests/xml/clark-tests/not-wf/sa/086.xml
new file mode 100644
index 0000000000..df6adfd884
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/086.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/087.xml b/collects/tests/xml/clark-tests/not-wf/sa/087.xml
new file mode 100644
index 0000000000..ed49492a7a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/087.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/088.xml b/collects/tests/xml/clark-tests/not-wf/sa/088.xml
new file mode 100644
index 0000000000..da0a68c401
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/088.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/090.xml b/collects/tests/xml/clark-tests/not-wf/sa/090.xml
new file mode 100644
index 0000000000..3fb72f3cc0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/090.xml
@@ -0,0 +1,4 @@
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/091.xml b/collects/tests/xml/clark-tests/not-wf/sa/091.xml
new file mode 100644
index 0000000000..a61d0914f8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/091.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/092.xml b/collects/tests/xml/clark-tests/not-wf/sa/092.xml
new file mode 100644
index 0000000000..be5266dada
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/092.xml
@@ -0,0 +1,4 @@
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/093.xml b/collects/tests/xml/clark-tests/not-wf/sa/093.xml
new file mode 100644
index 0000000000..4af61bc645
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/093.xml
@@ -0,0 +1 @@
+X
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/094.xml b/collects/tests/xml/clark-tests/not-wf/sa/094.xml
new file mode 100644
index 0000000000..bdec7a4660
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/094.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/095.xml b/collects/tests/xml/clark-tests/not-wf/sa/095.xml
new file mode 100644
index 0000000000..090b8b4eec
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/095.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/096.xml b/collects/tests/xml/clark-tests/not-wf/sa/096.xml
new file mode 100644
index 0000000000..d806c3b952
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/096.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/097.xml b/collects/tests/xml/clark-tests/not-wf/sa/097.xml
new file mode 100644
index 0000000000..d4def544b0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/097.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/098.xml b/collects/tests/xml/clark-tests/not-wf/sa/098.xml
new file mode 100644
index 0000000000..9798496aa3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/098.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/099.xml b/collects/tests/xml/clark-tests/not-wf/sa/099.xml
new file mode 100644
index 0000000000..d5be08eff0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/099.xml
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/100.xml b/collects/tests/xml/clark-tests/not-wf/sa/100.xml
new file mode 100644
index 0000000000..51e06231c2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/100.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/101.xml b/collects/tests/xml/clark-tests/not-wf/sa/101.xml
new file mode 100644
index 0000000000..afa5a455fc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/101.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/102.xml b/collects/tests/xml/clark-tests/not-wf/sa/102.xml
new file mode 100644
index 0000000000..8734adaa6e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/102.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/103.xml b/collects/tests/xml/clark-tests/not-wf/sa/103.xml
new file mode 100644
index 0000000000..6c4716798f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/103.xml
@@ -0,0 +1,4 @@
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/104.xml b/collects/tests/xml/clark-tests/not-wf/sa/104.xml
new file mode 100644
index 0000000000..dd57396239
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/104.xml
@@ -0,0 +1,4 @@
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/105.xml b/collects/tests/xml/clark-tests/not-wf/sa/105.xml
new file mode 100644
index 0000000000..809e705870
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/105.xml
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/106.xml b/collects/tests/xml/clark-tests/not-wf/sa/106.xml
new file mode 100644
index 0000000000..d32319ef09
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/106.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/107.xml b/collects/tests/xml/clark-tests/not-wf/sa/107.xml
new file mode 100644
index 0000000000..3dfd8200e2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/107.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/108.xml b/collects/tests/xml/clark-tests/not-wf/sa/108.xml
new file mode 100644
index 0000000000..af5cf50d48
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/108.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/109.xml b/collects/tests/xml/clark-tests/not-wf/sa/109.xml
new file mode 100644
index 0000000000..5afc03e8db
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/109.xml
@@ -0,0 +1,4 @@
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/110.xml b/collects/tests/xml/clark-tests/not-wf/sa/110.xml
new file mode 100644
index 0000000000..cf54ebe5c0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/110.xml
@@ -0,0 +1,5 @@
+
+]>
+
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/111.xml b/collects/tests/xml/clark-tests/not-wf/sa/111.xml
new file mode 100644
index 0000000000..84a469f5d1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/111.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/112.xml b/collects/tests/xml/clark-tests/not-wf/sa/112.xml
new file mode 100644
index 0000000000..0c5c1a4341
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/112.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/113.xml b/collects/tests/xml/clark-tests/not-wf/sa/113.xml
new file mode 100644
index 0000000000..04fc9d2318
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/113.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/114.xml b/collects/tests/xml/clark-tests/not-wf/sa/114.xml
new file mode 100644
index 0000000000..1261ee49e1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/114.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/115.xml b/collects/tests/xml/clark-tests/not-wf/sa/115.xml
new file mode 100644
index 0000000000..f111dbe153
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/115.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/116.xml b/collects/tests/xml/clark-tests/not-wf/sa/116.xml
new file mode 100644
index 0000000000..84bb762fdf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/116.xml
@@ -0,0 +1,4 @@
+
+]>
+&e;7;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/117.xml b/collects/tests/xml/clark-tests/not-wf/sa/117.xml
new file mode 100644
index 0000000000..e4a5e572ef
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/117.xml
@@ -0,0 +1,4 @@
+
+]>
+&e;#97;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/118.xml b/collects/tests/xml/clark-tests/not-wf/sa/118.xml
new file mode 100644
index 0000000000..494d53d208
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/118.xml
@@ -0,0 +1,4 @@
+
+]>
+&&e;97;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/119.xml b/collects/tests/xml/clark-tests/not-wf/sa/119.xml
new file mode 100644
index 0000000000..aefaa44a1c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/119.xml
@@ -0,0 +1,6 @@
+
+]>
+
+&e;#38;
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/120.xml b/collects/tests/xml/clark-tests/not-wf/sa/120.xml
new file mode 100644
index 0000000000..b7d6ff9ce9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/120.xml
@@ -0,0 +1,6 @@
+
+]>
+
+&e;
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/121.xml b/collects/tests/xml/clark-tests/not-wf/sa/121.xml
new file mode 100644
index 0000000000..2b4adcc6b4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/121.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/122.xml b/collects/tests/xml/clark-tests/not-wf/sa/122.xml
new file mode 100644
index 0000000000..ef0b057cee
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/122.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/123.xml b/collects/tests/xml/clark-tests/not-wf/sa/123.xml
new file mode 100644
index 0000000000..06d65f045b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/123.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/124.xml b/collects/tests/xml/clark-tests/not-wf/sa/124.xml
new file mode 100644
index 0000000000..3bbe0f91a6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/124.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/125.xml b/collects/tests/xml/clark-tests/not-wf/sa/125.xml
new file mode 100644
index 0000000000..5f9c22c0c6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/125.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/126.xml b/collects/tests/xml/clark-tests/not-wf/sa/126.xml
new file mode 100644
index 0000000000..13e74d6d5e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/126.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/127.xml b/collects/tests/xml/clark-tests/not-wf/sa/127.xml
new file mode 100644
index 0000000000..a379b9e539
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/127.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/128.xml b/collects/tests/xml/clark-tests/not-wf/sa/128.xml
new file mode 100644
index 0000000000..dd706bb21f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/128.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/129.xml b/collects/tests/xml/clark-tests/not-wf/sa/129.xml
new file mode 100644
index 0000000000..d4e4461a6d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/129.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/130.xml b/collects/tests/xml/clark-tests/not-wf/sa/130.xml
new file mode 100644
index 0000000000..fa7be641f1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/130.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/131.xml b/collects/tests/xml/clark-tests/not-wf/sa/131.xml
new file mode 100644
index 0000000000..f34ed453b5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/131.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/132.xml b/collects/tests/xml/clark-tests/not-wf/sa/132.xml
new file mode 100644
index 0000000000..ab6cc416e9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/132.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/133.xml b/collects/tests/xml/clark-tests/not-wf/sa/133.xml
new file mode 100644
index 0000000000..d2aa604e9f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/133.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/134.xml b/collects/tests/xml/clark-tests/not-wf/sa/134.xml
new file mode 100644
index 0000000000..c8919c5ef8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/134.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/135.xml b/collects/tests/xml/clark-tests/not-wf/sa/135.xml
new file mode 100644
index 0000000000..e639e8b6ea
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/135.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/136.xml b/collects/tests/xml/clark-tests/not-wf/sa/136.xml
new file mode 100644
index 0000000000..499e68bcea
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/136.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/137.xml b/collects/tests/xml/clark-tests/not-wf/sa/137.xml
new file mode 100644
index 0000000000..723b77f776
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/137.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/138.xml b/collects/tests/xml/clark-tests/not-wf/sa/138.xml
new file mode 100644
index 0000000000..16934cc88e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/138.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/139.xml b/collects/tests/xml/clark-tests/not-wf/sa/139.xml
new file mode 100644
index 0000000000..34df52ed93
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/139.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/140.xml b/collects/tests/xml/clark-tests/not-wf/sa/140.xml
new file mode 100644
index 0000000000..467d5ed301
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/140.xml
@@ -0,0 +1,4 @@
+゚>">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/141.xml b/collects/tests/xml/clark-tests/not-wf/sa/141.xml
new file mode 100644
index 0000000000..409d0a7568
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/141.xml
@@ -0,0 +1,4 @@
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/142.xml b/collects/tests/xml/clark-tests/not-wf/sa/142.xml
new file mode 100644
index 0000000000..20e88f88b3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/142.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/143.xml b/collects/tests/xml/clark-tests/not-wf/sa/143.xml
new file mode 100644
index 0000000000..0ee1c614f8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/143.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/144.xml b/collects/tests/xml/clark-tests/not-wf/sa/144.xml
new file mode 100644
index 0000000000..437548c0ba
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/144.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/145.xml b/collects/tests/xml/clark-tests/not-wf/sa/145.xml
new file mode 100644
index 0000000000..71b187a933
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/145.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/146.xml b/collects/tests/xml/clark-tests/not-wf/sa/146.xml
new file mode 100644
index 0000000000..d0bfbca723
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/146.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/147.xml b/collects/tests/xml/clark-tests/not-wf/sa/147.xml
new file mode 100644
index 0000000000..3b6145615f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/147.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/148.xml b/collects/tests/xml/clark-tests/not-wf/sa/148.xml
new file mode 100644
index 0000000000..774dce18fd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/148.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/149.xml b/collects/tests/xml/clark-tests/not-wf/sa/149.xml
new file mode 100644
index 0000000000..725eea0dec
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/149.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/150.xml b/collects/tests/xml/clark-tests/not-wf/sa/150.xml
new file mode 100644
index 0000000000..44f6b6df92
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/150.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/151.xml b/collects/tests/xml/clark-tests/not-wf/sa/151.xml
new file mode 100644
index 0000000000..fecc4f24e3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/151.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/152.xml b/collects/tests/xml/clark-tests/not-wf/sa/152.xml
new file mode 100644
index 0000000000..b5c5cb26ae
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/152.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/153.xml b/collects/tests/xml/clark-tests/not-wf/sa/153.xml
new file mode 100644
index 0000000000..5e2973707e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/153.xml
@@ -0,0 +1,5 @@
+
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/154.xml b/collects/tests/xml/clark-tests/not-wf/sa/154.xml
new file mode 100644
index 0000000000..96e01d63f5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/154.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/155.xml b/collects/tests/xml/clark-tests/not-wf/sa/155.xml
new file mode 100644
index 0000000000..4f16d0f163
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/155.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/156.xml b/collects/tests/xml/clark-tests/not-wf/sa/156.xml
new file mode 100644
index 0000000000..c6d93fd312
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/156.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/157.xml b/collects/tests/xml/clark-tests/not-wf/sa/157.xml
new file mode 100644
index 0000000000..2f058dac3e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/157.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/158.xml b/collects/tests/xml/clark-tests/not-wf/sa/158.xml
new file mode 100644
index 0000000000..32b90b722d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/158.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/159.xml b/collects/tests/xml/clark-tests/not-wf/sa/159.xml
new file mode 100644
index 0000000000..066244cb91
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/159.xml
@@ -0,0 +1,5 @@
+
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/160.xml b/collects/tests/xml/clark-tests/not-wf/sa/160.xml
new file mode 100644
index 0000000000..85424acb1b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/160.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/161.xml b/collects/tests/xml/clark-tests/not-wf/sa/161.xml
new file mode 100644
index 0000000000..4f8a5b7b6b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/161.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/162.xml b/collects/tests/xml/clark-tests/not-wf/sa/162.xml
new file mode 100644
index 0000000000..efae4b190e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/162.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/163.xml b/collects/tests/xml/clark-tests/not-wf/sa/163.xml
new file mode 100644
index 0000000000..e14fb76c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/163.xml
@@ -0,0 +1,6 @@
+
+
+]>
+%e;
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/164.xml b/collects/tests/xml/clark-tests/not-wf/sa/164.xml
new file mode 100644
index 0000000000..98dd267c21
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/164.xml
@@ -0,0 +1,5 @@
+
+
+] %e; >
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/165.xml b/collects/tests/xml/clark-tests/not-wf/sa/165.xml
new file mode 100644
index 0000000000..36c04618ef
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/165.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/166.xml b/collects/tests/xml/clark-tests/not-wf/sa/166.xml
new file mode 100644
index 0000000000..ee2ce28630
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/166.xml
@@ -0,0 +1 @@
+ï¿¿
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/167.xml b/collects/tests/xml/clark-tests/not-wf/sa/167.xml
new file mode 100644
index 0000000000..9bdc6c1278
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/167.xml
@@ -0,0 +1 @@
+￾
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/168.xml b/collects/tests/xml/clark-tests/not-wf/sa/168.xml
new file mode 100644
index 0000000000..f83221a3ad
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/168.xml
@@ -0,0 +1 @@
+í €
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/169.xml b/collects/tests/xml/clark-tests/not-wf/sa/169.xml
new file mode 100644
index 0000000000..310029b976
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/169.xml
@@ -0,0 +1 @@
+í°€
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/170.xml b/collects/tests/xml/clark-tests/not-wf/sa/170.xml
new file mode 100644
index 0000000000..cfa0aee155
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/170.xml
@@ -0,0 +1 @@
+÷€€€
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/171.xml b/collects/tests/xml/clark-tests/not-wf/sa/171.xml
new file mode 100644
index 0000000000..48b5c7d3bc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/171.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/172.xml b/collects/tests/xml/clark-tests/not-wf/sa/172.xml
new file mode 100644
index 0000000000..6651d4d299
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/172.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/173.xml b/collects/tests/xml/clark-tests/not-wf/sa/173.xml
new file mode 100644
index 0000000000..f9f9f42023
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/173.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/174.xml b/collects/tests/xml/clark-tests/not-wf/sa/174.xml
new file mode 100644
index 0000000000..42bef861c6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/174.xml
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/175.xml b/collects/tests/xml/clark-tests/not-wf/sa/175.xml
new file mode 100644
index 0000000000..69912f36d2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/175.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/176.xml b/collects/tests/xml/clark-tests/not-wf/sa/176.xml
new file mode 100644
index 0000000000..39153ad5a8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/176.xml
@@ -0,0 +1,4 @@
+
+]>
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/177.xml b/collects/tests/xml/clark-tests/not-wf/sa/177.xml
new file mode 100644
index 0000000000..6bc8228879
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/177.xml
@@ -0,0 +1,4 @@
+
+]>
+Aï¿¿
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/178.xml b/collects/tests/xml/clark-tests/not-wf/sa/178.xml
new file mode 100644
index 0000000000..e8f2d18eed
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/178.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/180.xml b/collects/tests/xml/clark-tests/not-wf/sa/180.xml
new file mode 100644
index 0000000000..569d553a8c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/180.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/181.xml b/collects/tests/xml/clark-tests/not-wf/sa/181.xml
new file mode 100644
index 0000000000..4341d99ee2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/181.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;]]>
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/182.xml b/collects/tests/xml/clark-tests/not-wf/sa/182.xml
new file mode 100644
index 0000000000..920f431666
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/182.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;-->
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/183.xml b/collects/tests/xml/clark-tests/not-wf/sa/183.xml
new file mode 100644
index 0000000000..7a5677de54
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/183.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/184.xml b/collects/tests/xml/clark-tests/not-wf/sa/184.xml
new file mode 100644
index 0000000000..103384a06e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/184.xml
@@ -0,0 +1,6 @@
+
+
+]>
+
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/185.ent b/collects/tests/xml/clark-tests/not-wf/sa/185.ent
new file mode 100644
index 0000000000..e557426454
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/185.ent
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/185.xml b/collects/tests/xml/clark-tests/not-wf/sa/185.xml
new file mode 100644
index 0000000000..81d5ef4bcd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/185.xml
@@ -0,0 +1,3 @@
+
+
+&e;
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/186.xml b/collects/tests/xml/clark-tests/not-wf/sa/186.xml
new file mode 100644
index 0000000000..85b26ec0a2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/not-wf/sa/186.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/not-wf/sa/null.ent b/collects/tests/xml/clark-tests/not-wf/sa/null.ent
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/collects/tests/xml/clark-tests/readme.html b/collects/tests/xml/clark-tests/readme.html
new file mode 100644
index 0000000000..fc7310c68e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/readme.html
@@ -0,0 +1,60 @@
+
+XML Test Cases
+
+XML Test Cases version 1998-11-18
+
+Copyright (C) 1998 James Clark. All rights reserved. Permission is
+granted to copy and modify this collection in any way for internal use
+within a company or organization. Permission is granted to
+redistribute the file xmltest.zip
containing this
+collection to third parties provided that no modifications of any kind
+are made to this file. Note that permission to distribute the
+collection in any other form is not granted.
+
+The collection is structured into three directories:
+
+not-wf
+- this contains cases that are not well-formed XML documents
+
valid
+- this contains cases that are valid XML documents
+
invalid
+- this contains cases that are well-formed XML documents
+but are not valid XML documents
+
+
+The not-wf
and valid
directories each have
+three subdirectories:
+
+-
+
sa
+ -
+this contains cases that are standalone (as defined in XML) and do not
+have references to external general entities
+
-
+
ext-sa
+ -
+this contains case that are standalone and have references to external
+general entities
+
-
+
not-sa
+ -
+this contains cases that are not standalone
+
+
+In each directory, files with a .xml
extension are the
+XML document test cases, and files with a .ent
extension
+are external entities referenced by the test cases.
+
+Within the valid
directory, each of these three
+subdirectories has an out
subdirectory which contains an
+equivalent canonical XML document for each
+of the cases.
+
+
+Bug reports and contributions of new test cases are welcome.
+
+
+James Clark
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/001.ent b/collects/tests/xml/clark-tests/valid/ext-sa/001.ent
new file mode 100644
index 0000000000..1cff3fd44f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/001.ent
@@ -0,0 +1 @@
+Data
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/001.xml b/collects/tests/xml/clark-tests/valid/ext-sa/001.xml
new file mode 100644
index 0000000000..147d70d2d1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/001.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/002.ent b/collects/tests/xml/clark-tests/valid/ext-sa/002.ent
new file mode 100644
index 0000000000..45f6d8e74e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/002.ent
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/002.xml b/collects/tests/xml/clark-tests/valid/ext-sa/002.xml
new file mode 100644
index 0000000000..9eaf91724f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/002.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/003.ent b/collects/tests/xml/clark-tests/valid/ext-sa/003.ent
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/003.xml b/collects/tests/xml/clark-tests/valid/ext-sa/003.xml
new file mode 100644
index 0000000000..bb60b663ef
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/003.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/004.ent b/collects/tests/xml/clark-tests/valid/ext-sa/004.ent
new file mode 100644
index 0000000000..3436f20001
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/004.ent
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/004.xml b/collects/tests/xml/clark-tests/valid/ext-sa/004.xml
new file mode 100644
index 0000000000..074498ce19
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/004.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/005.ent b/collects/tests/xml/clark-tests/valid/ext-sa/005.ent
new file mode 100644
index 0000000000..c6e97f821f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/005.ent
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/005.xml b/collects/tests/xml/clark-tests/valid/ext-sa/005.xml
new file mode 100644
index 0000000000..82a6228205
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/005.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/006.ent b/collects/tests/xml/clark-tests/valid/ext-sa/006.ent
new file mode 100644
index 0000000000..4df2f0c2ac
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/006.ent
@@ -0,0 +1,4 @@
+Data
+
+More data
+
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/006.xml b/collects/tests/xml/clark-tests/valid/ext-sa/006.xml
new file mode 100644
index 0000000000..0b326cad4c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/006.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/007.ent b/collects/tests/xml/clark-tests/valid/ext-sa/007.ent
new file mode 100644
index 0000000000..ab1d696dd7
Binary files /dev/null and b/collects/tests/xml/clark-tests/valid/ext-sa/007.ent differ
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/007.xml b/collects/tests/xml/clark-tests/valid/ext-sa/007.xml
new file mode 100644
index 0000000000..825e3b286a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/007.xml
@@ -0,0 +1,5 @@
+
+
+]>
+X&e;Z
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/008.ent b/collects/tests/xml/clark-tests/valid/ext-sa/008.ent
new file mode 100644
index 0000000000..c6ca61f9c8
Binary files /dev/null and b/collects/tests/xml/clark-tests/valid/ext-sa/008.ent differ
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/008.xml b/collects/tests/xml/clark-tests/valid/ext-sa/008.xml
new file mode 100644
index 0000000000..3c001b6cb3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/008.xml
@@ -0,0 +1,5 @@
+
+
+]>
+X&e;Z
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/009.ent b/collects/tests/xml/clark-tests/valid/ext-sa/009.ent
new file mode 100644
index 0000000000..67c3297611
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/009.ent
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/009.xml b/collects/tests/xml/clark-tests/valid/ext-sa/009.xml
new file mode 100644
index 0000000000..a5866e5a77
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/009.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/010.ent b/collects/tests/xml/clark-tests/valid/ext-sa/010.ent
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/010.xml b/collects/tests/xml/clark-tests/valid/ext-sa/010.xml
new file mode 100644
index 0000000000..418e9b0141
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/010.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/011.ent b/collects/tests/xml/clark-tests/valid/ext-sa/011.ent
new file mode 100644
index 0000000000..b19be3a497
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/011.ent
@@ -0,0 +1 @@
+xyzzy
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/011.xml b/collects/tests/xml/clark-tests/valid/ext-sa/011.xml
new file mode 100644
index 0000000000..2ceefa1d21
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/011.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/012.ent b/collects/tests/xml/clark-tests/valid/ext-sa/012.ent
new file mode 100644
index 0000000000..8eb1fb9c41
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/012.ent
@@ -0,0 +1 @@
+&e4;
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/012.xml b/collects/tests/xml/clark-tests/valid/ext-sa/012.xml
new file mode 100644
index 0000000000..5a8f009b4a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/012.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+]>
+&e1;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/013.ent b/collects/tests/xml/clark-tests/valid/ext-sa/013.ent
new file mode 100644
index 0000000000..7f25c502dd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/013.ent
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/013.xml b/collects/tests/xml/clark-tests/valid/ext-sa/013.xml
new file mode 100644
index 0000000000..7717c97afe
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/013.xml
@@ -0,0 +1,10 @@
+
+
+
+
+]>
+&x;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/014.ent b/collects/tests/xml/clark-tests/valid/ext-sa/014.ent
new file mode 100644
index 0000000000..470fd6fe44
Binary files /dev/null and b/collects/tests/xml/clark-tests/valid/ext-sa/014.ent differ
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/014.xml b/collects/tests/xml/clark-tests/valid/ext-sa/014.xml
new file mode 100644
index 0000000000..816fd1e796
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/014.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/001.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/001.xml
new file mode 100644
index 0000000000..0a7acf8ebe
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/001.xml
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/002.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/002.xml
new file mode 100644
index 0000000000..d4a445e555
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/002.xml
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/003.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/003.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/003.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/004.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/004.xml
new file mode 100644
index 0000000000..0a7acf8ebe
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/004.xml
@@ -0,0 +1 @@
+Data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/005.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/005.xml
new file mode 100644
index 0000000000..6e293aa70e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/005.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/006.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/006.xml
new file mode 100644
index 0000000000..04b6fc82ee
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/006.xml
@@ -0,0 +1 @@
+Data
More data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/007.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/007.xml
new file mode 100644
index 0000000000..ab2a74c9d1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/007.xml
@@ -0,0 +1 @@
+XYZ
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/008.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/008.xml
new file mode 100644
index 0000000000..ab2a74c9d1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/008.xml
@@ -0,0 +1 @@
+XYZ
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/009.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/009.xml
new file mode 100644
index 0000000000..a79dff65fd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/009.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/010.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/010.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/010.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/011.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/011.xml
new file mode 100644
index 0000000000..bf275adb2b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/011.xml
@@ -0,0 +1 @@
+xyzzy
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/012.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/012.xml
new file mode 100644
index 0000000000..81a251cb4b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/012.xml
@@ -0,0 +1 @@
+(e5)
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/013.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/013.xml
new file mode 100644
index 0000000000..524d94ee6b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/013.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/ext-sa/out/014.xml b/collects/tests/xml/clark-tests/valid/ext-sa/out/014.xml
new file mode 100644
index 0000000000..71c6dc3e8e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/ext-sa/out/014.xml
@@ -0,0 +1 @@
+data
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/001.ent b/collects/tests/xml/clark-tests/valid/not-sa/001.ent
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/001.xml b/collects/tests/xml/clark-tests/valid/not-sa/001.xml
new file mode 100644
index 0000000000..2d6f41a137
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/001.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/002.ent b/collects/tests/xml/clark-tests/valid/not-sa/002.ent
new file mode 100644
index 0000000000..67c3297611
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/002.ent
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/002.xml b/collects/tests/xml/clark-tests/valid/not-sa/002.xml
new file mode 100644
index 0000000000..023fce8499
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/002.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/003-1.ent b/collects/tests/xml/clark-tests/valid/not-sa/003-1.ent
new file mode 100644
index 0000000000..931f3ad6d8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/003-1.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/003-2.ent b/collects/tests/xml/clark-tests/valid/not-sa/003-2.ent
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/003.xml b/collects/tests/xml/clark-tests/valid/not-sa/003.xml
new file mode 100644
index 0000000000..63a5e8bdfc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/003.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/004-1.ent b/collects/tests/xml/clark-tests/valid/not-sa/004-1.ent
new file mode 100644
index 0000000000..40f7ff58a2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/004-1.ent
@@ -0,0 +1,4 @@
+
+
+
+%e1;
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/004-2.ent b/collects/tests/xml/clark-tests/valid/not-sa/004-2.ent
new file mode 100644
index 0000000000..61def75cb7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/004-2.ent
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/004.xml b/collects/tests/xml/clark-tests/valid/not-sa/004.xml
new file mode 100644
index 0000000000..adc9201496
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/004.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/005-1.ent b/collects/tests/xml/clark-tests/valid/not-sa/005-1.ent
new file mode 100644
index 0000000000..ade9599032
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/005-1.ent
@@ -0,0 +1,3 @@
+
+
+%e;
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/005-2.ent b/collects/tests/xml/clark-tests/valid/not-sa/005-2.ent
new file mode 100644
index 0000000000..bef50b1f38
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/005-2.ent
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/005.xml b/collects/tests/xml/clark-tests/valid/not-sa/005.xml
new file mode 100644
index 0000000000..6bd44cfee0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/005.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/006.ent b/collects/tests/xml/clark-tests/valid/not-sa/006.ent
new file mode 100644
index 0000000000..8f305a82bd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/006.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/006.xml b/collects/tests/xml/clark-tests/valid/not-sa/006.xml
new file mode 100644
index 0000000000..eb80bb7409
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/006.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/007.ent b/collects/tests/xml/clark-tests/valid/not-sa/007.ent
new file mode 100644
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/007.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/007.xml b/collects/tests/xml/clark-tests/valid/not-sa/007.xml
new file mode 100644
index 0000000000..38897e34ea
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/007.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/008.ent b/collects/tests/xml/clark-tests/valid/not-sa/008.ent
new file mode 100644
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/008.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/008.xml b/collects/tests/xml/clark-tests/valid/not-sa/008.xml
new file mode 100644
index 0000000000..bf777a7ff2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/008.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/009.ent b/collects/tests/xml/clark-tests/valid/not-sa/009.ent
new file mode 100644
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/009.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/009.xml b/collects/tests/xml/clark-tests/valid/not-sa/009.xml
new file mode 100644
index 0000000000..c17562fe68
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/009.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/010.ent b/collects/tests/xml/clark-tests/valid/not-sa/010.ent
new file mode 100644
index 0000000000..52a28f5deb
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/010.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/010.xml b/collects/tests/xml/clark-tests/valid/not-sa/010.xml
new file mode 100644
index 0000000000..2786b328f3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/010.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/011.ent b/collects/tests/xml/clark-tests/valid/not-sa/011.ent
new file mode 100644
index 0000000000..fbf4ca4947
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/011.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/011.xml b/collects/tests/xml/clark-tests/valid/not-sa/011.xml
new file mode 100644
index 0000000000..03b482bbb6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/011.xml
@@ -0,0 +1,5 @@
+
+%e;
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/012.ent b/collects/tests/xml/clark-tests/valid/not-sa/012.ent
new file mode 100644
index 0000000000..7e372e65e9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/012.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/012.xml b/collects/tests/xml/clark-tests/valid/not-sa/012.xml
new file mode 100644
index 0000000000..1967edbba7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/012.xml
@@ -0,0 +1,5 @@
+
+%e;
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/013.ent b/collects/tests/xml/clark-tests/valid/not-sa/013.ent
new file mode 100644
index 0000000000..a3691d9f08
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/013.ent
@@ -0,0 +1,4 @@
+
+
+]]>
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/013.xml b/collects/tests/xml/clark-tests/valid/not-sa/013.xml
new file mode 100644
index 0000000000..cf44f2600a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/013.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/014.ent b/collects/tests/xml/clark-tests/valid/not-sa/014.ent
new file mode 100644
index 0000000000..6eaf779329
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/014.ent
@@ -0,0 +1,4 @@
+
+
+]]>
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/014.xml b/collects/tests/xml/clark-tests/valid/not-sa/014.xml
new file mode 100644
index 0000000000..bd08502489
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/014.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/015.ent b/collects/tests/xml/clark-tests/valid/not-sa/015.ent
new file mode 100644
index 0000000000..00d2f30e1d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/015.ent
@@ -0,0 +1,5 @@
+
+
+]]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/015.xml b/collects/tests/xml/clark-tests/valid/not-sa/015.xml
new file mode 100644
index 0000000000..e04e75ffca
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/015.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/016.ent b/collects/tests/xml/clark-tests/valid/not-sa/016.ent
new file mode 100644
index 0000000000..bf77ef8336
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/016.ent
@@ -0,0 +1,4 @@
+
+
+]]>
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/016.xml b/collects/tests/xml/clark-tests/valid/not-sa/016.xml
new file mode 100644
index 0000000000..4ccf4af350
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/016.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/017.ent b/collects/tests/xml/clark-tests/valid/not-sa/017.ent
new file mode 100644
index 0000000000..ffd9adde61
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/017.ent
@@ -0,0 +1,3 @@
+
+">
+%e;
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/017.xml b/collects/tests/xml/clark-tests/valid/not-sa/017.xml
new file mode 100644
index 0000000000..7fe18f4c7a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/017.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/018.ent b/collects/tests/xml/clark-tests/valid/not-sa/018.ent
new file mode 100644
index 0000000000..2d46f76fc3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/018.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/018.xml b/collects/tests/xml/clark-tests/valid/not-sa/018.xml
new file mode 100644
index 0000000000..31e90f2405
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/018.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/019.ent b/collects/tests/xml/clark-tests/valid/not-sa/019.ent
new file mode 100644
index 0000000000..d18201a98b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/019.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/019.xml b/collects/tests/xml/clark-tests/valid/not-sa/019.xml
new file mode 100644
index 0000000000..b7a18faba0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/019.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/020.ent b/collects/tests/xml/clark-tests/valid/not-sa/020.ent
new file mode 100644
index 0000000000..815291c6d2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/020.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/020.xml b/collects/tests/xml/clark-tests/valid/not-sa/020.xml
new file mode 100644
index 0000000000..d70892f7ad
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/020.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/021.ent b/collects/tests/xml/clark-tests/valid/not-sa/021.ent
new file mode 100644
index 0000000000..9f8f2afd2b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/021.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/021.xml b/collects/tests/xml/clark-tests/valid/not-sa/021.xml
new file mode 100644
index 0000000000..70c28730db
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/021.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/022.ent b/collects/tests/xml/clark-tests/valid/not-sa/022.ent
new file mode 100644
index 0000000000..26f2d8beb2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/022.ent
@@ -0,0 +1,3 @@
+
+
+ ]]>
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/022.xml b/collects/tests/xml/clark-tests/valid/not-sa/022.xml
new file mode 100644
index 0000000000..b639f2551c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/022.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/023.ent b/collects/tests/xml/clark-tests/valid/not-sa/023.ent
new file mode 100644
index 0000000000..e3268819f7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/023.ent
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/023.xml b/collects/tests/xml/clark-tests/valid/not-sa/023.xml
new file mode 100644
index 0000000000..1c2484b70b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/023.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/024.ent b/collects/tests/xml/clark-tests/valid/not-sa/024.ent
new file mode 100644
index 0000000000..aa6d0eccac
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/024.ent
@@ -0,0 +1,4 @@
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/024.xml b/collects/tests/xml/clark-tests/valid/not-sa/024.xml
new file mode 100644
index 0000000000..96e1ecb61b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/024.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/025.ent b/collects/tests/xml/clark-tests/valid/not-sa/025.ent
new file mode 100644
index 0000000000..389d259eb1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/025.ent
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/025.xml b/collects/tests/xml/clark-tests/valid/not-sa/025.xml
new file mode 100644
index 0000000000..8fdbc14c47
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/025.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/026.ent b/collects/tests/xml/clark-tests/valid/not-sa/026.ent
new file mode 100644
index 0000000000..bdc93af639
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/026.ent
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/026.xml b/collects/tests/xml/clark-tests/valid/not-sa/026.xml
new file mode 100644
index 0000000000..7b109c0913
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/026.xml
@@ -0,0 +1,7 @@
+
+
+%e;
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/027.ent b/collects/tests/xml/clark-tests/valid/not-sa/027.ent
new file mode 100644
index 0000000000..712cce3700
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/027.ent
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/027.xml b/collects/tests/xml/clark-tests/valid/not-sa/027.xml
new file mode 100644
index 0000000000..d0c8c7abb5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/027.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/028.ent b/collects/tests/xml/clark-tests/valid/not-sa/028.ent
new file mode 100644
index 0000000000..ac249d7b2c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/028.ent
@@ -0,0 +1,2 @@
+
+]]>
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/028.xml b/collects/tests/xml/clark-tests/valid/not-sa/028.xml
new file mode 100644
index 0000000000..50e5248cbf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/028.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/029.ent b/collects/tests/xml/clark-tests/valid/not-sa/029.ent
new file mode 100644
index 0000000000..df94df5560
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/029.ent
@@ -0,0 +1,3 @@
+
+]]>
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/029.xml b/collects/tests/xml/clark-tests/valid/not-sa/029.xml
new file mode 100644
index 0000000000..07e226c1d7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/029.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/030.ent b/collects/tests/xml/clark-tests/valid/not-sa/030.ent
new file mode 100644
index 0000000000..e3864460df
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/030.ent
@@ -0,0 +1,3 @@
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/030.xml b/collects/tests/xml/clark-tests/valid/not-sa/030.xml
new file mode 100644
index 0000000000..01fc2be4ca
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/030.xml
@@ -0,0 +1,2 @@
+
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/031-1.ent b/collects/tests/xml/clark-tests/valid/not-sa/031-1.ent
new file mode 100644
index 0000000000..f7f94ab152
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/031-1.ent
@@ -0,0 +1,3 @@
+
+
+">
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/031-2.ent b/collects/tests/xml/clark-tests/valid/not-sa/031-2.ent
new file mode 100644
index 0000000000..bef50b1f38
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/031-2.ent
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/031.xml b/collects/tests/xml/clark-tests/valid/not-sa/031.xml
new file mode 100644
index 0000000000..c3fe5fca71
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/031.xml
@@ -0,0 +1,2 @@
+
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/001.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/001.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/001.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/002.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/002.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/002.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/003.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/003.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/003.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/004.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/004.xml
new file mode 100644
index 0000000000..bdc39e2224
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/004.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/005.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/005.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/005.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/006.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/006.xml
new file mode 100644
index 0000000000..d07627d7a3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/006.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/007.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/007.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/007.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/008.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/008.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/008.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/009.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/009.xml
new file mode 100644
index 0000000000..7293fb63dc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/009.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/010.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/010.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/010.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/011.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/011.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/011.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/012.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/012.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/012.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/013.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/013.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/013.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/014.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/014.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/014.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/015.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/015.xml
new file mode 100644
index 0000000000..131a32fe69
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/015.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/016.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/016.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/016.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/017.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/017.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/017.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/018.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/018.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/018.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/019.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/019.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/019.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/020.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/020.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/020.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/021.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/021.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/021.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/022.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/022.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/022.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/023.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/023.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/023.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/024.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/024.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/024.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/025.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/025.xml
new file mode 100644
index 0000000000..eb3f9674e8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/025.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/026.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/026.xml
new file mode 100644
index 0000000000..71c02026e4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/026.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/027.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/027.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/027.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/028.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/028.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/028.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/029.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/029.xml
new file mode 100644
index 0000000000..7ac8b2b89d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/029.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/030.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/030.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/030.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/not-sa/out/031.xml b/collects/tests/xml/clark-tests/valid/not-sa/out/031.xml
new file mode 100644
index 0000000000..03a6c3f9cd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/not-sa/out/031.xml
@@ -0,0 +1 @@
+<!ATTLIST doc a1 CDATA "v1">
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/001.xml b/collects/tests/xml/clark-tests/valid/sa/001.xml
new file mode 100644
index 0000000000..7fbef49502
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/001.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/002.xml b/collects/tests/xml/clark-tests/valid/sa/002.xml
new file mode 100644
index 0000000000..2e3f1d81dd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/002.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/003.xml b/collects/tests/xml/clark-tests/valid/sa/003.xml
new file mode 100644
index 0000000000..c841b81784
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/003.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/004.xml b/collects/tests/xml/clark-tests/valid/sa/004.xml
new file mode 100644
index 0000000000..a9c5756933
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/004.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/005.xml b/collects/tests/xml/clark-tests/valid/sa/005.xml
new file mode 100644
index 0000000000..b069efe727
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/005.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/006.xml b/collects/tests/xml/clark-tests/valid/sa/006.xml
new file mode 100644
index 0000000000..39a346342f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/006.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/007.xml b/collects/tests/xml/clark-tests/valid/sa/007.xml
new file mode 100644
index 0000000000..cc3dc53166
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/007.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/008.xml b/collects/tests/xml/clark-tests/valid/sa/008.xml
new file mode 100644
index 0000000000..b3370eb1cc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/008.xml
@@ -0,0 +1,4 @@
+
+]>
+&<>"'
diff --git a/collects/tests/xml/clark-tests/valid/sa/009.xml b/collects/tests/xml/clark-tests/valid/sa/009.xml
new file mode 100644
index 0000000000..0fa183eccf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/009.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/010.xml b/collects/tests/xml/clark-tests/valid/sa/010.xml
new file mode 100644
index 0000000000..eb64d18590
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/010.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/011.xml b/collects/tests/xml/clark-tests/valid/sa/011.xml
new file mode 100644
index 0000000000..4cac44b4e4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/011.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/012.xml b/collects/tests/xml/clark-tests/valid/sa/012.xml
new file mode 100644
index 0000000000..6ce2a3eae2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/012.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/013.xml b/collects/tests/xml/clark-tests/valid/sa/013.xml
new file mode 100644
index 0000000000..2f4aae4e28
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/013.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/014.xml b/collects/tests/xml/clark-tests/valid/sa/014.xml
new file mode 100644
index 0000000000..47f1f723e3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/014.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/015.xml b/collects/tests/xml/clark-tests/valid/sa/015.xml
new file mode 100644
index 0000000000..861df8a610
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/015.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/016.xml b/collects/tests/xml/clark-tests/valid/sa/016.xml
new file mode 100644
index 0000000000..66b1973c5d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/016.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/017.xml b/collects/tests/xml/clark-tests/valid/sa/017.xml
new file mode 100644
index 0000000000..827ba963bf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/017.xml
@@ -0,0 +1,4 @@
+
+]>
+ ?>
diff --git a/collects/tests/xml/clark-tests/valid/sa/018.xml b/collects/tests/xml/clark-tests/valid/sa/018.xml
new file mode 100644
index 0000000000..4570903fee
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/018.xml
@@ -0,0 +1,4 @@
+
+]>
+]]>
diff --git a/collects/tests/xml/clark-tests/valid/sa/019.xml b/collects/tests/xml/clark-tests/valid/sa/019.xml
new file mode 100644
index 0000000000..3e6b74cbf2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/019.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/020.xml b/collects/tests/xml/clark-tests/valid/sa/020.xml
new file mode 100644
index 0000000000..f749551a1b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/020.xml
@@ -0,0 +1,4 @@
+
+]>
+]]]>
diff --git a/collects/tests/xml/clark-tests/valid/sa/021.xml b/collects/tests/xml/clark-tests/valid/sa/021.xml
new file mode 100644
index 0000000000..13dda8c8a5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/021.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/022.xml b/collects/tests/xml/clark-tests/valid/sa/022.xml
new file mode 100644
index 0000000000..41d300e950
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/022.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/023.xml b/collects/tests/xml/clark-tests/valid/sa/023.xml
new file mode 100644
index 0000000000..3837b831ad
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/023.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/024.xml b/collects/tests/xml/clark-tests/valid/sa/024.xml
new file mode 100644
index 0000000000..b0655c634c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/024.xml
@@ -0,0 +1,6 @@
+
+
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/025.xml b/collects/tests/xml/clark-tests/valid/sa/025.xml
new file mode 100644
index 0000000000..ed01f36d89
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/025.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/026.xml b/collects/tests/xml/clark-tests/valid/sa/026.xml
new file mode 100644
index 0000000000..1ba033c1a7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/026.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/027.xml b/collects/tests/xml/clark-tests/valid/sa/027.xml
new file mode 100644
index 0000000000..ee02439051
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/027.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/028.xml b/collects/tests/xml/clark-tests/valid/sa/028.xml
new file mode 100644
index 0000000000..3d95747913
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/028.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/029.xml b/collects/tests/xml/clark-tests/valid/sa/029.xml
new file mode 100644
index 0000000000..909f6ff712
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/029.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/030.xml b/collects/tests/xml/clark-tests/valid/sa/030.xml
new file mode 100644
index 0000000000..3a7ddaa716
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/030.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/031.xml b/collects/tests/xml/clark-tests/valid/sa/031.xml
new file mode 100644
index 0000000000..a58e05867f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/031.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/032.xml b/collects/tests/xml/clark-tests/valid/sa/032.xml
new file mode 100644
index 0000000000..be55c8d721
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/032.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/033.xml b/collects/tests/xml/clark-tests/valid/sa/033.xml
new file mode 100644
index 0000000000..a3f9053868
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/033.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/034.xml b/collects/tests/xml/clark-tests/valid/sa/034.xml
new file mode 100644
index 0000000000..7d52f31c0e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/034.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/035.xml b/collects/tests/xml/clark-tests/valid/sa/035.xml
new file mode 100644
index 0000000000..f109a8b782
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/035.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/036.xml b/collects/tests/xml/clark-tests/valid/sa/036.xml
new file mode 100644
index 0000000000..8ab2b3fb16
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/036.xml
@@ -0,0 +1,5 @@
+
+]>
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/037.xml b/collects/tests/xml/clark-tests/valid/sa/037.xml
new file mode 100644
index 0000000000..f9b2113940
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/037.xml
@@ -0,0 +1,6 @@
+
+]>
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/038.xml b/collects/tests/xml/clark-tests/valid/sa/038.xml
new file mode 100644
index 0000000000..d14f41bfe2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/038.xml
@@ -0,0 +1,6 @@
+
+
+]>
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/039.xml b/collects/tests/xml/clark-tests/valid/sa/039.xml
new file mode 100644
index 0000000000..0897316e46
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/039.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/040.xml b/collects/tests/xml/clark-tests/valid/sa/040.xml
new file mode 100644
index 0000000000..12c419b65b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/040.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/041.xml b/collects/tests/xml/clark-tests/valid/sa/041.xml
new file mode 100644
index 0000000000..a59f536277
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/041.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/042.xml b/collects/tests/xml/clark-tests/valid/sa/042.xml
new file mode 100644
index 0000000000..5d7c650944
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/042.xml
@@ -0,0 +1,4 @@
+
+]>
+A
diff --git a/collects/tests/xml/clark-tests/valid/sa/043.xml b/collects/tests/xml/clark-tests/valid/sa/043.xml
new file mode 100644
index 0000000000..a8095dfe28
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/043.xml
@@ -0,0 +1,6 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/044.xml b/collects/tests/xml/clark-tests/valid/sa/044.xml
new file mode 100644
index 0000000000..bee1d23e1a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/044.xml
@@ -0,0 +1,10 @@
+
+
+
+]>
+
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/045.xml b/collects/tests/xml/clark-tests/valid/sa/045.xml
new file mode 100644
index 0000000000..e2567f532d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/045.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/046.xml b/collects/tests/xml/clark-tests/valid/sa/046.xml
new file mode 100644
index 0000000000..c50a2846f9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/046.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/047.xml b/collects/tests/xml/clark-tests/valid/sa/047.xml
new file mode 100644
index 0000000000..a4c688cf1a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/047.xml
@@ -0,0 +1,5 @@
+
+]>
+X
+Y
diff --git a/collects/tests/xml/clark-tests/valid/sa/048.xml b/collects/tests/xml/clark-tests/valid/sa/048.xml
new file mode 100644
index 0000000000..c6b2dedbba
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/048.xml
@@ -0,0 +1,4 @@
+
+]>
+]
diff --git a/collects/tests/xml/clark-tests/valid/sa/049.xml b/collects/tests/xml/clark-tests/valid/sa/049.xml
new file mode 100644
index 0000000000..c3cc797b59
Binary files /dev/null and b/collects/tests/xml/clark-tests/valid/sa/049.xml differ
diff --git a/collects/tests/xml/clark-tests/valid/sa/050.xml b/collects/tests/xml/clark-tests/valid/sa/050.xml
new file mode 100644
index 0000000000..12303b1af2
Binary files /dev/null and b/collects/tests/xml/clark-tests/valid/sa/050.xml differ
diff --git a/collects/tests/xml/clark-tests/valid/sa/051.xml b/collects/tests/xml/clark-tests/valid/sa/051.xml
new file mode 100644
index 0000000000..7ae8f6c73a
Binary files /dev/null and b/collects/tests/xml/clark-tests/valid/sa/051.xml differ
diff --git a/collects/tests/xml/clark-tests/valid/sa/052.xml b/collects/tests/xml/clark-tests/valid/sa/052.xml
new file mode 100644
index 0000000000..3f33a4c760
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/052.xml
@@ -0,0 +1,4 @@
+
+]>
+ð€€ô¿½
diff --git a/collects/tests/xml/clark-tests/valid/sa/053.xml b/collects/tests/xml/clark-tests/valid/sa/053.xml
new file mode 100644
index 0000000000..0d88f28718
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/053.xml
@@ -0,0 +1,6 @@
+">
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/054.xml b/collects/tests/xml/clark-tests/valid/sa/054.xml
new file mode 100644
index 0000000000..5d1c88b946
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/054.xml
@@ -0,0 +1,10 @@
+
+]>
+
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/055.xml b/collects/tests/xml/clark-tests/valid/sa/055.xml
new file mode 100644
index 0000000000..da0292c5bc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/055.xml
@@ -0,0 +1,5 @@
+
+]>
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/056.xml b/collects/tests/xml/clark-tests/valid/sa/056.xml
new file mode 100644
index 0000000000..144871b2a3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/056.xml
@@ -0,0 +1,4 @@
+
+]>
+A
diff --git a/collects/tests/xml/clark-tests/valid/sa/057.xml b/collects/tests/xml/clark-tests/valid/sa/057.xml
new file mode 100644
index 0000000000..c1ac849ed1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/057.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/058.xml b/collects/tests/xml/clark-tests/valid/sa/058.xml
new file mode 100644
index 0000000000..2ff23b233f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/058.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/059.xml b/collects/tests/xml/clark-tests/valid/sa/059.xml
new file mode 100644
index 0000000000..2171480ecf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/059.xml
@@ -0,0 +1,10 @@
+
+
+
+]>
+
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/060.xml b/collects/tests/xml/clark-tests/valid/sa/060.xml
new file mode 100644
index 0000000000..6cd6b4386b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/060.xml
@@ -0,0 +1,4 @@
+
+]>
+X
Y
diff --git a/collects/tests/xml/clark-tests/valid/sa/061.xml b/collects/tests/xml/clark-tests/valid/sa/061.xml
new file mode 100644
index 0000000000..bbdc152492
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/061.xml
@@ -0,0 +1,4 @@
+
+]>
+£
diff --git a/collects/tests/xml/clark-tests/valid/sa/062.xml b/collects/tests/xml/clark-tests/valid/sa/062.xml
new file mode 100644
index 0000000000..f4ba53090a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/062.xml
@@ -0,0 +1,4 @@
+
+]>
+เจมส์
diff --git a/collects/tests/xml/clark-tests/valid/sa/063.xml b/collects/tests/xml/clark-tests/valid/sa/063.xml
new file mode 100644
index 0000000000..9668f2da73
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/063.xml
@@ -0,0 +1,4 @@
+
+]>
+<เจมส์>เจมส์>
diff --git a/collects/tests/xml/clark-tests/valid/sa/064.xml b/collects/tests/xml/clark-tests/valid/sa/064.xml
new file mode 100644
index 0000000000..74a97aa431
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/064.xml
@@ -0,0 +1,4 @@
+
+]>
+𐀀
diff --git a/collects/tests/xml/clark-tests/valid/sa/065.xml b/collects/tests/xml/clark-tests/valid/sa/065.xml
new file mode 100644
index 0000000000..f708f2bc17
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/065.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/066.xml b/collects/tests/xml/clark-tests/valid/sa/066.xml
new file mode 100644
index 0000000000..a27340b9a7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/066.xml
@@ -0,0 +1,7 @@
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/067.xml b/collects/tests/xml/clark-tests/valid/sa/067.xml
new file mode 100644
index 0000000000..a0ccf772a5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/067.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/068.xml b/collects/tests/xml/clark-tests/valid/sa/068.xml
new file mode 100644
index 0000000000..8ed806b9a3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/068.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/069.xml b/collects/tests/xml/clark-tests/valid/sa/069.xml
new file mode 100644
index 0000000000..2437f60530
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/069.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/070.xml b/collects/tests/xml/clark-tests/valid/sa/070.xml
new file mode 100644
index 0000000000..eef097df76
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/070.xml
@@ -0,0 +1,5 @@
+">
+%e;
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/071.xml b/collects/tests/xml/clark-tests/valid/sa/071.xml
new file mode 100644
index 0000000000..ebfba230a4
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/071.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/072.xml b/collects/tests/xml/clark-tests/valid/sa/072.xml
new file mode 100644
index 0000000000..6ef39dc49e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/072.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/073.xml b/collects/tests/xml/clark-tests/valid/sa/073.xml
new file mode 100644
index 0000000000..217476d9a9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/073.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/074.xml b/collects/tests/xml/clark-tests/valid/sa/074.xml
new file mode 100644
index 0000000000..8b2354ff73
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/074.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/075.xml b/collects/tests/xml/clark-tests/valid/sa/075.xml
new file mode 100644
index 0000000000..33c012441a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/075.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/076.xml b/collects/tests/xml/clark-tests/valid/sa/076.xml
new file mode 100644
index 0000000000..65b731cf6d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/076.xml
@@ -0,0 +1,7 @@
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/077.xml b/collects/tests/xml/clark-tests/valid/sa/077.xml
new file mode 100644
index 0000000000..e5f301eac8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/077.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/078.xml b/collects/tests/xml/clark-tests/valid/sa/078.xml
new file mode 100644
index 0000000000..b31f40f94e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/078.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/079.xml b/collects/tests/xml/clark-tests/valid/sa/079.xml
new file mode 100644
index 0000000000..a3290d6cbb
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/079.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/080.xml b/collects/tests/xml/clark-tests/valid/sa/080.xml
new file mode 100644
index 0000000000..3208fa9aa5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/080.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/081.xml b/collects/tests/xml/clark-tests/valid/sa/081.xml
new file mode 100644
index 0000000000..51ee1a375c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/081.xml
@@ -0,0 +1,7 @@
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/082.xml b/collects/tests/xml/clark-tests/valid/sa/082.xml
new file mode 100644
index 0000000000..d5245ac51a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/082.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/083.xml b/collects/tests/xml/clark-tests/valid/sa/083.xml
new file mode 100644
index 0000000000..937cfc0bdd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/083.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/084.xml b/collects/tests/xml/clark-tests/valid/sa/084.xml
new file mode 100644
index 0000000000..82760767aa
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/084.xml
@@ -0,0 +1 @@
+]>
diff --git a/collects/tests/xml/clark-tests/valid/sa/085.xml b/collects/tests/xml/clark-tests/valid/sa/085.xml
new file mode 100644
index 0000000000..cf5834f2a5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/085.xml
@@ -0,0 +1,6 @@
+
+">
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/086.xml b/collects/tests/xml/clark-tests/valid/sa/086.xml
new file mode 100644
index 0000000000..bbc3080db6
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/086.xml
@@ -0,0 +1,6 @@
+
+
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/087.xml b/collects/tests/xml/clark-tests/valid/sa/087.xml
new file mode 100644
index 0000000000..34797a67d7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/087.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/088.xml b/collects/tests/xml/clark-tests/valid/sa/088.xml
new file mode 100644
index 0000000000..f97d96848d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/088.xml
@@ -0,0 +1,5 @@
+
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/089.xml b/collects/tests/xml/clark-tests/valid/sa/089.xml
new file mode 100644
index 0000000000..2d80c8f3fb
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/089.xml
@@ -0,0 +1,5 @@
+
+
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/090.xml b/collects/tests/xml/clark-tests/valid/sa/090.xml
new file mode 100644
index 0000000000..c392c96084
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/090.xml
@@ -0,0 +1,7 @@
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/091.xml b/collects/tests/xml/clark-tests/valid/sa/091.xml
new file mode 100644
index 0000000000..7343d0f795
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/091.xml
@@ -0,0 +1,7 @@
+
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/092.xml b/collects/tests/xml/clark-tests/valid/sa/092.xml
new file mode 100644
index 0000000000..627b74ecdf
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/092.xml
@@ -0,0 +1,10 @@
+
+
+]>
+
+
+
+
+
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/093.xml b/collects/tests/xml/clark-tests/valid/sa/093.xml
new file mode 100644
index 0000000000..968acb628f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/093.xml
@@ -0,0 +1,5 @@
+
+]>
+
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/094.xml b/collects/tests/xml/clark-tests/valid/sa/094.xml
new file mode 100644
index 0000000000..5726e7db6f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/094.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/095.xml b/collects/tests/xml/clark-tests/valid/sa/095.xml
new file mode 100644
index 0000000000..1fe69596da
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/095.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/096.xml b/collects/tests/xml/clark-tests/valid/sa/096.xml
new file mode 100644
index 0000000000..a6f8f43620
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/096.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/097.ent b/collects/tests/xml/clark-tests/valid/sa/097.ent
new file mode 100644
index 0000000000..e06554ace2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/097.ent
@@ -0,0 +1 @@
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/097.xml b/collects/tests/xml/clark-tests/valid/sa/097.xml
new file mode 100644
index 0000000000..c606afa97f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/097.xml
@@ -0,0 +1,8 @@
+
+
+
+%e;
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/098.xml b/collects/tests/xml/clark-tests/valid/sa/098.xml
new file mode 100644
index 0000000000..33a64ce5ae
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/098.xml
@@ -0,0 +1,5 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/099.xml b/collects/tests/xml/clark-tests/valid/sa/099.xml
new file mode 100644
index 0000000000..1b7214a137
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/099.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/100.xml b/collects/tests/xml/clark-tests/valid/sa/100.xml
new file mode 100644
index 0000000000..5b839e76bc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/100.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/101.xml b/collects/tests/xml/clark-tests/valid/sa/101.xml
new file mode 100644
index 0000000000..f464484bf5
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/101.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/102.xml b/collects/tests/xml/clark-tests/valid/sa/102.xml
new file mode 100644
index 0000000000..f239ff5fee
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/102.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/103.xml b/collects/tests/xml/clark-tests/valid/sa/103.xml
new file mode 100644
index 0000000000..1dbbd5bb7c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/103.xml
@@ -0,0 +1,4 @@
+
+]>
+<doc>
diff --git a/collects/tests/xml/clark-tests/valid/sa/104.xml b/collects/tests/xml/clark-tests/valid/sa/104.xml
new file mode 100644
index 0000000000..666f43de0f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/104.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/105.xml b/collects/tests/xml/clark-tests/valid/sa/105.xml
new file mode 100644
index 0000000000..6b3af2b847
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/105.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/106.xml b/collects/tests/xml/clark-tests/valid/sa/106.xml
new file mode 100644
index 0000000000..8757c0a5ae
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/106.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/107.xml b/collects/tests/xml/clark-tests/valid/sa/107.xml
new file mode 100644
index 0000000000..3d2c2566a7
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/107.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/108.xml b/collects/tests/xml/clark-tests/valid/sa/108.xml
new file mode 100644
index 0000000000..e919bf229a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/108.xml
@@ -0,0 +1,7 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/109.xml b/collects/tests/xml/clark-tests/valid/sa/109.xml
new file mode 100644
index 0000000000..33fa38e13b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/109.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/110.xml b/collects/tests/xml/clark-tests/valid/sa/110.xml
new file mode 100644
index 0000000000..0c61c65119
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/110.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/111.xml b/collects/tests/xml/clark-tests/valid/sa/111.xml
new file mode 100644
index 0000000000..cb56f264b0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/111.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/112.xml b/collects/tests/xml/clark-tests/valid/sa/112.xml
new file mode 100644
index 0000000000..27b6a4c793
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/112.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/113.xml b/collects/tests/xml/clark-tests/valid/sa/113.xml
new file mode 100644
index 0000000000..d2edd0f01d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/113.xml
@@ -0,0 +1,5 @@
+
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/114.xml b/collects/tests/xml/clark-tests/valid/sa/114.xml
new file mode 100644
index 0000000000..52e207096d
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/114.xml
@@ -0,0 +1,5 @@
+
+">
+]>
+&e;
diff --git a/collects/tests/xml/clark-tests/valid/sa/115.xml b/collects/tests/xml/clark-tests/valid/sa/115.xml
new file mode 100644
index 0000000000..d939a67010
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/115.xml
@@ -0,0 +1,6 @@
+
+
+
+]>
+&e1;
diff --git a/collects/tests/xml/clark-tests/valid/sa/116.xml b/collects/tests/xml/clark-tests/valid/sa/116.xml
new file mode 100644
index 0000000000..55ab49620b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/116.xml
@@ -0,0 +1,5 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/117.xml b/collects/tests/xml/clark-tests/valid/sa/117.xml
new file mode 100644
index 0000000000..e4f02b14c8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/117.xml
@@ -0,0 +1,5 @@
+
+
+]>
+]
diff --git a/collects/tests/xml/clark-tests/valid/sa/118.xml b/collects/tests/xml/clark-tests/valid/sa/118.xml
new file mode 100644
index 0000000000..fba6c44668
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/118.xml
@@ -0,0 +1,5 @@
+
+
+]>
+]
diff --git a/collects/tests/xml/clark-tests/valid/sa/119.xml b/collects/tests/xml/clark-tests/valid/sa/119.xml
new file mode 100644
index 0000000000..876e74730c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/119.xml
@@ -0,0 +1,4 @@
+
+]>
+
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/001.xml b/collects/tests/xml/clark-tests/valid/sa/out/001.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/001.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/002.xml b/collects/tests/xml/clark-tests/valid/sa/out/002.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/002.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/003.xml b/collects/tests/xml/clark-tests/valid/sa/out/003.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/003.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/004.xml b/collects/tests/xml/clark-tests/valid/sa/out/004.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/004.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/005.xml b/collects/tests/xml/clark-tests/valid/sa/out/005.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/005.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/006.xml b/collects/tests/xml/clark-tests/valid/sa/out/006.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/006.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/007.xml b/collects/tests/xml/clark-tests/valid/sa/out/007.xml
new file mode 100644
index 0000000000..97cf3e3b86
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/007.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/008.xml b/collects/tests/xml/clark-tests/valid/sa/out/008.xml
new file mode 100644
index 0000000000..3ea232c21a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/008.xml
@@ -0,0 +1 @@
+&<>"'
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/009.xml b/collects/tests/xml/clark-tests/valid/sa/out/009.xml
new file mode 100644
index 0000000000..97cf3e3b86
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/009.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/010.xml b/collects/tests/xml/clark-tests/valid/sa/out/010.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/010.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/011.xml b/collects/tests/xml/clark-tests/valid/sa/out/011.xml
new file mode 100644
index 0000000000..7293fb63dc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/011.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/012.xml b/collects/tests/xml/clark-tests/valid/sa/out/012.xml
new file mode 100644
index 0000000000..5a0c9831ae
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/012.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/013.xml b/collects/tests/xml/clark-tests/valid/sa/out/013.xml
new file mode 100644
index 0000000000..c9c7ec5da8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/013.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/014.xml b/collects/tests/xml/clark-tests/valid/sa/out/014.xml
new file mode 100644
index 0000000000..ac6b28f97a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/014.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/015.xml b/collects/tests/xml/clark-tests/valid/sa/out/015.xml
new file mode 100644
index 0000000000..8e216eb99b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/015.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/016.xml b/collects/tests/xml/clark-tests/valid/sa/out/016.xml
new file mode 100644
index 0000000000..4fc76928b2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/016.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/017.xml b/collects/tests/xml/clark-tests/valid/sa/out/017.xml
new file mode 100644
index 0000000000..3b9a2f8d4e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/017.xml
@@ -0,0 +1 @@
+ ?>
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/018.xml b/collects/tests/xml/clark-tests/valid/sa/out/018.xml
new file mode 100644
index 0000000000..a5471011df
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/018.xml
@@ -0,0 +1 @@
+<foo>
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/019.xml b/collects/tests/xml/clark-tests/valid/sa/out/019.xml
new file mode 100644
index 0000000000..05d4e2fcf9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/019.xml
@@ -0,0 +1 @@
+<&
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/020.xml b/collects/tests/xml/clark-tests/valid/sa/out/020.xml
new file mode 100644
index 0000000000..95ae08a12e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/020.xml
@@ -0,0 +1 @@
+<&]>]
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/021.xml b/collects/tests/xml/clark-tests/valid/sa/out/021.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/021.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/022.xml b/collects/tests/xml/clark-tests/valid/sa/out/022.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/022.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/023.xml b/collects/tests/xml/clark-tests/valid/sa/out/023.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/023.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/024.xml b/collects/tests/xml/clark-tests/valid/sa/out/024.xml
new file mode 100644
index 0000000000..a9aa2074ff
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/024.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/025.xml b/collects/tests/xml/clark-tests/valid/sa/out/025.xml
new file mode 100644
index 0000000000..de0f566020
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/025.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/026.xml b/collects/tests/xml/clark-tests/valid/sa/out/026.xml
new file mode 100644
index 0000000000..de0f566020
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/026.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/027.xml b/collects/tests/xml/clark-tests/valid/sa/out/027.xml
new file mode 100644
index 0000000000..de0f566020
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/027.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/028.xml b/collects/tests/xml/clark-tests/valid/sa/out/028.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/028.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/029.xml b/collects/tests/xml/clark-tests/valid/sa/out/029.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/029.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/030.xml b/collects/tests/xml/clark-tests/valid/sa/out/030.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/030.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/031.xml b/collects/tests/xml/clark-tests/valid/sa/out/031.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/031.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/032.xml b/collects/tests/xml/clark-tests/valid/sa/out/032.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/032.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/033.xml b/collects/tests/xml/clark-tests/valid/sa/out/033.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/033.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/034.xml b/collects/tests/xml/clark-tests/valid/sa/out/034.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/034.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/035.xml b/collects/tests/xml/clark-tests/valid/sa/out/035.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/035.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/036.xml b/collects/tests/xml/clark-tests/valid/sa/out/036.xml
new file mode 100644
index 0000000000..2bcfb06cf1
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/036.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/037.xml b/collects/tests/xml/clark-tests/valid/sa/out/037.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/037.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/038.xml b/collects/tests/xml/clark-tests/valid/sa/out/038.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/038.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/039.xml b/collects/tests/xml/clark-tests/valid/sa/out/039.xml
new file mode 100644
index 0000000000..82d117d492
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/039.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/040.xml b/collects/tests/xml/clark-tests/valid/sa/out/040.xml
new file mode 100644
index 0000000000..d79cfe1493
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/040.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/041.xml b/collects/tests/xml/clark-tests/valid/sa/out/041.xml
new file mode 100644
index 0000000000..6f2cd5832e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/041.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/042.xml b/collects/tests/xml/clark-tests/valid/sa/out/042.xml
new file mode 100644
index 0000000000..f683039a80
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/042.xml
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/043.xml b/collects/tests/xml/clark-tests/valid/sa/out/043.xml
new file mode 100644
index 0000000000..e162b76504
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/043.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/044.xml b/collects/tests/xml/clark-tests/valid/sa/out/044.xml
new file mode 100644
index 0000000000..78028b704b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/044.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/045.xml b/collects/tests/xml/clark-tests/valid/sa/out/045.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/045.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/046.xml b/collects/tests/xml/clark-tests/valid/sa/out/046.xml
new file mode 100644
index 0000000000..7293fb63dc
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/046.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/047.xml b/collects/tests/xml/clark-tests/valid/sa/out/047.xml
new file mode 100644
index 0000000000..b327ebd67f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/047.xml
@@ -0,0 +1 @@
+X
Y
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/048.xml b/collects/tests/xml/clark-tests/valid/sa/out/048.xml
new file mode 100644
index 0000000000..ced7d02719
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/048.xml
@@ -0,0 +1 @@
+]
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/049.xml b/collects/tests/xml/clark-tests/valid/sa/out/049.xml
new file mode 100644
index 0000000000..7cc53f9ea0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/049.xml
@@ -0,0 +1 @@
+£
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/050.xml b/collects/tests/xml/clark-tests/valid/sa/out/050.xml
new file mode 100644
index 0000000000..33703c7925
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/050.xml
@@ -0,0 +1 @@
+เจมส์
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/051.xml b/collects/tests/xml/clark-tests/valid/sa/out/051.xml
new file mode 100644
index 0000000000..cfeb5a5366
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/051.xml
@@ -0,0 +1 @@
+<เจมส์>เจมส์>
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/052.xml b/collects/tests/xml/clark-tests/valid/sa/out/052.xml
new file mode 100644
index 0000000000..f5a0484791
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/052.xml
@@ -0,0 +1 @@
+ð€€ô¿½
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/053.xml b/collects/tests/xml/clark-tests/valid/sa/out/053.xml
new file mode 100644
index 0000000000..c4083843d9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/053.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/054.xml b/collects/tests/xml/clark-tests/valid/sa/out/054.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/054.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/055.xml b/collects/tests/xml/clark-tests/valid/sa/out/055.xml
new file mode 100644
index 0000000000..82d117d492
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/055.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/056.xml b/collects/tests/xml/clark-tests/valid/sa/out/056.xml
new file mode 100644
index 0000000000..f683039a80
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/056.xml
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/057.xml b/collects/tests/xml/clark-tests/valid/sa/out/057.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/057.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/058.xml b/collects/tests/xml/clark-tests/valid/sa/out/058.xml
new file mode 100644
index 0000000000..f898cc8c98
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/058.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/059.xml b/collects/tests/xml/clark-tests/valid/sa/out/059.xml
new file mode 100644
index 0000000000..78028b704b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/059.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/060.xml b/collects/tests/xml/clark-tests/valid/sa/out/060.xml
new file mode 100644
index 0000000000..b327ebd67f
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/060.xml
@@ -0,0 +1 @@
+X
Y
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/061.xml b/collects/tests/xml/clark-tests/valid/sa/out/061.xml
new file mode 100644
index 0000000000..7cc53f9ea0
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/061.xml
@@ -0,0 +1 @@
+£
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/062.xml b/collects/tests/xml/clark-tests/valid/sa/out/062.xml
new file mode 100644
index 0000000000..33703c7925
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/062.xml
@@ -0,0 +1 @@
+เจมส์
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/063.xml b/collects/tests/xml/clark-tests/valid/sa/out/063.xml
new file mode 100644
index 0000000000..cfeb5a5366
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/063.xml
@@ -0,0 +1 @@
+<เจมส์>เจมส์>
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/064.xml b/collects/tests/xml/clark-tests/valid/sa/out/064.xml
new file mode 100644
index 0000000000..f5a0484791
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/064.xml
@@ -0,0 +1 @@
+ð€€ô¿½
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/065.xml b/collects/tests/xml/clark-tests/valid/sa/out/065.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/065.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/066.xml b/collects/tests/xml/clark-tests/valid/sa/out/066.xml
new file mode 100644
index 0000000000..7597d31bf9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/066.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/067.xml b/collects/tests/xml/clark-tests/valid/sa/out/067.xml
new file mode 100644
index 0000000000..4bbdad45ed
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/067.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/068.xml b/collects/tests/xml/clark-tests/valid/sa/out/068.xml
new file mode 100644
index 0000000000..4bbdad45ed
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/068.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/069.xml b/collects/tests/xml/clark-tests/valid/sa/out/069.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/069.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/070.xml b/collects/tests/xml/clark-tests/valid/sa/out/070.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/070.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/071.xml b/collects/tests/xml/clark-tests/valid/sa/out/071.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/071.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/072.xml b/collects/tests/xml/clark-tests/valid/sa/out/072.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/072.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/073.xml b/collects/tests/xml/clark-tests/valid/sa/out/073.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/073.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/074.xml b/collects/tests/xml/clark-tests/valid/sa/out/074.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/074.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/075.xml b/collects/tests/xml/clark-tests/valid/sa/out/075.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/075.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/076.xml b/collects/tests/xml/clark-tests/valid/sa/out/076.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/076.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/077.xml b/collects/tests/xml/clark-tests/valid/sa/out/077.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/077.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/078.xml b/collects/tests/xml/clark-tests/valid/sa/out/078.xml
new file mode 100644
index 0000000000..fcab0cd7ff
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/078.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/079.xml b/collects/tests/xml/clark-tests/valid/sa/out/079.xml
new file mode 100644
index 0000000000..fcab0cd7ff
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/079.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/080.xml b/collects/tests/xml/clark-tests/valid/sa/out/080.xml
new file mode 100644
index 0000000000..fcab0cd7ff
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/080.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/081.xml b/collects/tests/xml/clark-tests/valid/sa/out/081.xml
new file mode 100644
index 0000000000..e356e7e4db
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/081.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/082.xml b/collects/tests/xml/clark-tests/valid/sa/out/082.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/082.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/083.xml b/collects/tests/xml/clark-tests/valid/sa/out/083.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/083.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/084.xml b/collects/tests/xml/clark-tests/valid/sa/out/084.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/084.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/085.xml b/collects/tests/xml/clark-tests/valid/sa/out/085.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/085.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/086.xml b/collects/tests/xml/clark-tests/valid/sa/out/086.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/086.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/087.xml b/collects/tests/xml/clark-tests/valid/sa/out/087.xml
new file mode 100644
index 0000000000..a9aa2074ff
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/087.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/088.xml b/collects/tests/xml/clark-tests/valid/sa/out/088.xml
new file mode 100644
index 0000000000..a5471011df
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/088.xml
@@ -0,0 +1 @@
+<foo>
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/089.xml b/collects/tests/xml/clark-tests/valid/sa/out/089.xml
new file mode 100644
index 0000000000..e01d86e8d3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/089.xml
@@ -0,0 +1 @@
+ð€€ô¿½ô¿¿
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/090.xml b/collects/tests/xml/clark-tests/valid/sa/out/090.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/090.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/091.xml b/collects/tests/xml/clark-tests/valid/sa/out/091.xml
new file mode 100644
index 0000000000..dd3bbedf74
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/091.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/092.xml b/collects/tests/xml/clark-tests/valid/sa/out/092.xml
new file mode 100644
index 0000000000..87269f79d9
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/092.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/093.xml b/collects/tests/xml/clark-tests/valid/sa/out/093.xml
new file mode 100644
index 0000000000..631bfde91e
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/093.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/094.xml b/collects/tests/xml/clark-tests/valid/sa/out/094.xml
new file mode 100644
index 0000000000..636ab4729a
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/094.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/095.xml b/collects/tests/xml/clark-tests/valid/sa/out/095.xml
new file mode 100644
index 0000000000..a20706ee01
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/095.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/096.xml b/collects/tests/xml/clark-tests/valid/sa/out/096.xml
new file mode 100644
index 0000000000..f898cc8c98
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/096.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/097.xml b/collects/tests/xml/clark-tests/valid/sa/out/097.xml
new file mode 100644
index 0000000000..e05cfe6c31
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/097.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/098.xml b/collects/tests/xml/clark-tests/valid/sa/out/098.xml
new file mode 100644
index 0000000000..f6408de9b8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/098.xml
@@ -0,0 +1,2 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/099.xml b/collects/tests/xml/clark-tests/valid/sa/out/099.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/099.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/100.xml b/collects/tests/xml/clark-tests/valid/sa/out/100.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/100.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/101.xml b/collects/tests/xml/clark-tests/valid/sa/out/101.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/101.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/102.xml b/collects/tests/xml/clark-tests/valid/sa/out/102.xml
new file mode 100644
index 0000000000..6e66b8da21
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/102.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/103.xml b/collects/tests/xml/clark-tests/valid/sa/out/103.xml
new file mode 100644
index 0000000000..96495d45c3
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/103.xml
@@ -0,0 +1 @@
+<doc>
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/104.xml b/collects/tests/xml/clark-tests/valid/sa/out/104.xml
new file mode 100644
index 0000000000..cc3def3336
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/104.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/105.xml b/collects/tests/xml/clark-tests/valid/sa/out/105.xml
new file mode 100644
index 0000000000..5aed3d613b
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/105.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/106.xml b/collects/tests/xml/clark-tests/valid/sa/out/106.xml
new file mode 100644
index 0000000000..1197d2ff9c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/106.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/107.xml b/collects/tests/xml/clark-tests/valid/sa/out/107.xml
new file mode 100644
index 0000000000..288f23cdf2
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/107.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/108.xml b/collects/tests/xml/clark-tests/valid/sa/out/108.xml
new file mode 100644
index 0000000000..cc3def3336
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/108.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/109.xml b/collects/tests/xml/clark-tests/valid/sa/out/109.xml
new file mode 100644
index 0000000000..c43bdf9b9c
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/109.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/110.xml b/collects/tests/xml/clark-tests/valid/sa/out/110.xml
new file mode 100644
index 0000000000..a92237b4ec
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/110.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/111.xml b/collects/tests/xml/clark-tests/valid/sa/out/111.xml
new file mode 100644
index 0000000000..cc3def3336
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/111.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/112.xml b/collects/tests/xml/clark-tests/valid/sa/out/112.xml
new file mode 100644
index 0000000000..c82f47bca8
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/112.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/113.xml b/collects/tests/xml/clark-tests/valid/sa/out/113.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/113.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/114.xml b/collects/tests/xml/clark-tests/valid/sa/out/114.xml
new file mode 100644
index 0000000000..8e0722abad
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/114.xml
@@ -0,0 +1 @@
+&foo;
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/115.xml b/collects/tests/xml/clark-tests/valid/sa/out/115.xml
new file mode 100644
index 0000000000..682b8140ec
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/115.xml
@@ -0,0 +1 @@
+v
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/116.xml b/collects/tests/xml/clark-tests/valid/sa/out/116.xml
new file mode 100644
index 0000000000..a79dff65fd
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/116.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/117.xml b/collects/tests/xml/clark-tests/valid/sa/out/117.xml
new file mode 100644
index 0000000000..ced7d02719
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/117.xml
@@ -0,0 +1 @@
+]
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/118.xml b/collects/tests/xml/clark-tests/valid/sa/out/118.xml
new file mode 100644
index 0000000000..31e37a9398
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/118.xml
@@ -0,0 +1 @@
+]]
\ No newline at end of file
diff --git a/collects/tests/xml/clark-tests/valid/sa/out/119.xml b/collects/tests/xml/clark-tests/valid/sa/out/119.xml
new file mode 100644
index 0000000000..7e8f183484
--- /dev/null
+++ b/collects/tests/xml/clark-tests/valid/sa/out/119.xml
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/collects/tests/xml/test-clark.ss b/collects/tests/xml/test-clark.ss
new file mode 100644
index 0000000000..eeffd6ab2a
--- /dev/null
+++ b/collects/tests/xml/test-clark.ss
@@ -0,0 +1,90 @@
+#lang scheme
+(require (planet schematics/schemeunit:3)
+ (planet schematics/schemeunit:3/base)
+ (planet schematics/schemeunit:3/test-case)
+ (planet schematics/schemeunit:3/check)
+ (planet schematics/schemeunit:3/test-suite)
+ (planet schematics/schemeunit:3/text-ui)
+ xml
+ scheme/runtime-path)
+
+(define (validate-xml? xml)
+ (error 'validate-xml? "Not implemented"))
+(define (well-formed-xml? xml)
+ (error 'well-formed-xml? "Not implemented"))
+
+(define (read-xml/file f)
+ (with-input-from-file f
+ (lambda () (read-xml))))
+(define (dir->test-suite d name path->test-case)
+ (make-schemeunit-test-suite
+ name
+ (parameterize
+ ([current-test-case-around test-suite-test-case-around]
+ [current-check-around test-suite-check-around])
+ (map (lambda (p)
+ (path->test-case (build-path d p)))
+ (filter (lambda (p)
+ (define ext (filename-extension p))
+ (and ext (bytes=? #"xml" ext)))
+ (directory-list d))))
+ void
+ void))
+
+(define (not-wf-dir->test-suite d)
+ (define (path->test-case f)
+ (test-not-false
+ (path->string f)
+ (with-handlers ([exn:xml? (lambda _ #t)])
+ (not (well-formed-xml? (read-xml/file f))))))
+ (test-suite
+ "Not Well-Formed"
+ (dir->test-suite
+ (build-path d "sa") "Stand-alone"
+ path->test-case)
+ (dir->test-suite
+ (build-path d "ext-sa") "External Stand-alone"
+ path->test-case)
+ (dir->test-suite
+ (build-path d "not-sa") "Not Stand-alone"
+ path->test-case)))
+(define (invalid-dir->test-suite d)
+ (dir->test-suite
+ d "Invalid"
+ (lambda (f)
+ (test-false (path->string f)
+ (validate-xml? (read-xml/file f))))))
+; XXX also check canonical xml
+(define (valid-dir->test-suite d)
+ (define (path->test-case f)
+ (test-not-false (path->string f)
+ (validate-xml? (read-xml/file f))))
+ (test-suite
+ "Valid"
+ (dir->test-suite
+ (build-path d "sa") "Stand-alone"
+ path->test-case)
+ (dir->test-suite
+ (build-path d "ext-sa") "External Stand-alone"
+ path->test-case)
+ (dir->test-suite
+ (build-path d "not-sa") "Not Stand-alone"
+ path->test-case)))
+
+(define (directory->test-suite d)
+ (test-suite
+ "James Clark's XML Test Cases"
+
+ (not-wf-dir->test-suite (build-path d "not-wf"))
+ (invalid-dir->test-suite (build-path d "invalid"))
+ (valid-dir->test-suite (build-path d "valid"))))
+
+(define-runtime-path
+ clark-tests-dir
+ (list 'lib "xml/clark-tests" "tests"))
+
+(define clark-tests
+ (directory->test-suite
+ clark-tests-dir))
+
+(run-tests clark-tests)
\ No newline at end of file
diff --git a/collects/tests/xml/test.ss b/collects/tests/xml/test.ss
index 434c2106d1..6fd84aadf1 100644
--- a/collects/tests/xml/test.ss
+++ b/collects/tests/xml/test.ss
@@ -3,6 +3,7 @@
(planet schematics/schemeunit:3/text-ui)
xml
xml/plist
+ mzlib/etc
"to-list.ss")
;; test-bad-read-input : format-str str -> void
@@ -30,7 +31,7 @@
(define test-syntax:read-xml/element/exn (mk-test-read-xml/exn syntax:read-xml/element))
(define (test-syntax:read-xml/element str xml)
- (test-equal? str (syntax->datum (read-xml/element (open-input-string str))) xml))
+ (test-equal? str (syntax->datum (syntax:read-xml/element (open-input-string str))) xml))
(define (test-write-xml str)
(test-equal? str (with-output-to-string (lambda () (write-xml (read-xml (open-input-string str))))) str))
@@ -51,6 +52,57 @@
(test-suite
"XML"
+ (test-suite
+ "Legacy tests"
+
+ (test-suite
+ "DOCTYPE"
+
+ (let ()
+ (define source-string #<
+
+END
+ )
+
+ (define source-document
+ (read-xml (open-input-string source-string)))
+ (define result-string
+ (with-output-to-string (lambda () (write-xml source-document))))
+ (define expected-string #<