Menu
▾
▴
[mvp-xml-cvs] XInclude/v1/test/XInclude-Test-Suite/Nist/result nist-include-21.xml,1.2,1.3 nist-include-28.xml,1.2,1.3 nist-include-29.xml,1.2,1.3 nist-include-30.xml,1.2,1.3 nist-include-34.xml,1.1,1.2 nist-include-51.xml,1.1,1.2 nist-include-52.xml,1.1,1.2 nist-include-55.xml,1.2,1.3
|
From: Oleg T. <he...@us...> - 2004-10-19 16:26:10
|
Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19600/v1/test/XInclude-Test-Suite/Nist/result Modified Files: nist-include-21.xml nist-include-28.xml nist-include-29.xml nist-include-30.xml nist-include-34.xml nist-include-51.xml nist-include-52.xml nist-include-55.xml Log Message: XInclude Test Suite updated Index: nist-include-30.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-30.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nist-include-30.xml 18 Oct 2004 18:19:23 -0000 1.2 +++ nist-include-30.xml 19 Oct 2004 16:24:57 -0000 1.3 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE x [ - <!ELEMENT x (family*)> - <!ELEMENT family (#PCDATA)> - <!ATTLIST family fnumber ID #REQUIRED> - <!ATTLIST family father IDREF #IMPLIED> - <!ATTLIST family mother IDREF #IMPLIED> +<!ELEMENT x (family)*> +<!ELEMENT family (#PCDATA)> +<!ATTLIST family fnumber ID #REQUIRED> +<!ATTLIST family father IDREF #IMPLIED> +<!ATTLIST family mother IDREF #IMPLIED> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using a shorthand pointer. --> 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.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nist-include-28.xml 17 Oct 2004 21:01:13 -0000 1.2 +++ nist-include-28.xml 19 Oct 2004 16:24:57 -0000 1.3 @@ -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-29.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-29.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nist-include-29.xml 18 Oct 2004 18:19:23 -0000 1.2 +++ nist-include-29.xml 19 Oct 2004 16:24:57 -0000 1.3 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE x [ - <!ELEMENT x (family*)> - <!ELEMENT family (#PCDATA)> - <!ATTLIST family fnumber ID #REQUIRED> - <!ATTLIST family father IDREF #IMPLIED> - <!ATTLIST family mother IDREF #IMPLIED> +<!ELEMENT x (family)*> +<!ELEMENT family (#PCDATA)> +<!ATTLIST family fnumber ID #REQUIRED> +<!ATTLIST family father IDREF #IMPLIED> +<!ATTLIST family mother IDREF #IMPLIED> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using a shorthand pointer. --> Index: nist-include-51.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-51.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nist-include-51.xml 29 Sep 2004 07:46:15 -0000 1.1 +++ nist-include-51.xml 19 Oct 2004 16:24:57 -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 comment. In this case the set of top level include items consist of the 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.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nist-include-21.xml 17 Oct 2004 21:01:13 -0000 1.2 +++ nist-include-21.xml 19 Oct 2004 16:24:57 -0000 1.3 @@ -1,10 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE x [ - <!ELEMENT x (view*)> - <!ELEMENT view EMPTY> - <!ATTLIST view sun ENTITY #IMPLIED> - <!NOTATION jpg SYSTEM "jpg"> - <!ENTITY image SYSTEM "gris.jpg" NDATA jpg> +<!ELEMENT x (view)*> +<!ELEMENT view EMPTY> +<!ATTLIST view sun ENTITY #IMPLIED> +<!ENTITY image SYSTEM "gris.jpg" NDATA jpg> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including an XML document with an unparsed entity. --> Index: nist-include-52.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-52.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nist-include-52.xml 29 Sep 2004 07:46:15 -0000 1.1 +++ nist-include-52.xml 19 Oct 2004 16:24:57 -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 processing instruction. In this case the set of top level included items consist of the 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.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nist-include-55.xml 17 Oct 2004 21:01:13 -0000 1.2 +++ nist-include-55.xml 19 Oct 2004 16:24:57 -0000 1.3 @@ -1,16 +1,14 @@ <?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" - 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> +<!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> ]> <!-- Including a duplicate unparsed entity. Test should ignore duplicate unparsed entity. --> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> Index: nist-include-34.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/result/nist-include-34.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nist-include-34.xml 29 Sep 2004 07:46:15 -0000 1.1 +++ nist-include-34.xml 19 Oct 2004 16:24:57 -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="f1" xml:base="../ents/idtst.xml">Lopez</family> |
