[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Nist/result nist-include-01.xml,1.1,1.2 nist-include-16.xml,1.1,1.2 nist-include-18.xml,1.1,1.2 nist-include-19.xml,1.1,1.2 nist-include-20.xml,1.1,1.2 nist-include-21.xml,1.1,1.2 nist-include-22.xml,1.1,1.2 nist-include-28.xml,1.1,1.2 nist-include-35.xml,1.1,1.2 nist-include-36.xml,1.1,1.2 nist-include-37.xml,1.1,1.2 nist-include-38.xml,1.1,1.2 nist-include-50.xml,1.1,1.2 nist-include-55.xml,1.1,1.2

[Oleg T. <he...@us...>]

Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11505/v1/test/XInclude-Test-Suite/Nist/result

Modified Files:
	nist-include-01.xml nist-include-16.xml nist-include-18.xml 
	nist-include-19.xml nist-include-20.xml nist-include-21.xml 
	nist-include-22.xml nist-include-28.xml nist-include-35.xml 
	nist-include-36.xml nist-include-37.xml nist-include-38.xml 
	nist-include-50.xml nist-include-55.xml 
Log Message:
XInclude Test Suite stuff.

Index: nist-include-28.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-28.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-28.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-28.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE book [
-<!ELEMENT book (doc)*>
-<!ELEMENT doc (isid)*>
+<!ELEMENT book (doc*)>
+<!ELEMENT doc (isid*)>
 <!ELEMENT isid EMPTY>
 <!ATTLIST isid myid ID #IMPLIED>
 ]>

Index: nist-include-22.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-22.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-22.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-22.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 <!-- Testing when the document (top level) element in the source infoset is an
 include element.-->
-<!DOCTYPE include>
 
 <book xml:base="../ents/books.xml">
 <chapter>chapter 1.

Index: nist-include-18.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-18.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-18.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-18.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Simple test of including a set of nodes from an XML document -->
    <chapter xml:base="../ents/books.xml">chapter 1.

Index: nist-include-37.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-37.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-37.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-37.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document using XPointer Framework.  
 	If the processor does not support the scheme used in a pointer part, it skip that pointer part. -->

Index: nist-include-50.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-50.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-50.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-50.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
     <!-- Test an include location identifying the document information item without an Xpointer, 
 the set of top-level included item should be the children of the acquired inforset's document

Index: nist-include-16.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-16.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-16.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-16.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Test the exclusion of the document type declaration information item when performing
 	an inclusion.-->

Index: nist-include-01.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-01.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-01.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-01.xml	17 Oct 2004 21:01:12 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Simple test of including another XML document -->
    <book xml:base="../ents/books.xml">

Index: nist-include-55.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-55.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-55.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-55.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,14 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE x [
-<!ELEMENT x (xinclude:include* , view*)>
+<!ELEMENT x (xinclude:include*, view*)>
 <!ELEMENT xinclude:include EMPTY>
-<!ATTLIST xinclude:include xmlns:xinclude CDATA #FIXED "http://www.w3.org/2001/XInclude">
-<!ATTLIST xinclude:include href CDATA #REQUIRED>
-<!ATTLIST xinclude:include parse (xml | text) "xml">
-<!ATTLIST xinclude:include encoding CDATA #IMPLIED>
-<!ELEMENT view EMPTY>
-<!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
-<!ATTLIST view sun ENTITY #IMPLIED>
+<!ATTLIST xinclude:include
+	xmlns:xinclude CDATA #FIXED "http://www.w3.org/2001/XInclude"
+	href	CDATA #REQUIRED
+	parse	(xml|text) "xml"
+	encoding CDATA #IMPLIED>
+ <!ELEMENT view EMPTY>
+ <!NOTATION jpg SYSTEM "jpg">
+ <!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
+ <!ATTLIST view sun ENTITY #IMPLIED>
 ]>
 <!-- Including a duplicate unparsed entity. Test should ignore duplicate unparsed entity. -->
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">

Index: nist-include-35.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-35.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-35.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-35.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document with ids using XPointer element schema. -->
    <doc xml:base="../ents/idtst.xml">

Index: nist-include-19.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-19.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-19.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-19.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Simple test of including a set of nodes from an XML document -->
    <chapter xml:base="../ents/books.xml">chapter 1.

Index: nist-include-38.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-38.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-38.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-38.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document using the XPointer Framework. -->
    <family fnumber="f2" xml:base="../ents/idtst.xml">Clark</family>

Index: nist-include-36.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-36.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-36.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-36.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including another XML document with ids using XPointer element schema. -->
    <family fnumber="f2" xml:base="../ents/idtst.xml">Clark</family>

Index: nist-include-20.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-20.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-20.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-20.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE x>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Test an include location identifying a document information item with
 	an xpointer  locating the document root. In this case

Index: nist-include-21.xml
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-21.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nist-include-21.xml	29 Sep 2004 07:46:15 -0000	1.1
+++ nist-include-21.xml	17 Oct 2004 21:01:13 -0000	1.2
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE x [
-<!ELEMENT x (view)*>
-<!ELEMENT view EMPTY>
-<!ATTLIST view sun ENTITY #IMPLIED>
-<!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
+ <!ELEMENT x (view*)>
+ <!ELEMENT view EMPTY>
+ <!ATTLIST view sun ENTITY #IMPLIED>
+ <!NOTATION jpg SYSTEM "jpg">
+ <!ENTITY image SYSTEM "gris.jpg" NDATA jpg>
 ]>
 <x xmlns:xinclude="http://www.w3.org/2001/XInclude">
    <!-- Including an XML document with an unparsed entity.  -->