Menu
▾
▴
mvp-xml-cvs — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(174) |
Nov
(85) |
Dec
(14) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(56) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(1) |
Jul
(132) |
Aug
(5) |
Sep
|
Oct
(314) |
Nov
(133) |
Dec
(18) |
| 2006 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Oleg T. <he...@us...> - 2005-10-29 11:44:40
|
Update of /cvsroot/mvp-xml/XPointer/v2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30165/v2/src Modified Files: XPointerReader.cs Log Message: Index: XPointerReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v2/src/XPointerReader.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- XPointerReader.cs 28 Oct 2005 21:51:34 -0000 1.4 +++ XPointerReader.cs 29 Oct 2005 11:44:32 -0000 1.5 @@ -8,6 +8,7 @@ using System.Collections.Generic; using Mvp.Xml.Common.XPath; +using Mvp.Xml.Common; #endregion @@ -42,7 +43,7 @@ _pointedNodes = pointer.Evaluate(nav); //There is always at least one identified node //XPathNodeIterator is already at the first node - _reader = _pointedNodes.Current.ReadSubtree(); + _reader = new SubtreeXPathNavigator(_pointedNodes.Current).ReadSubtree(); } private XPathDocument CreateAndCacheDocument(XmlReader r) @@ -83,19 +84,19 @@ /// Creates <c>XPointerReader</c> instance with given uri and xpointer. /// </summary> public XPointerReader(string uri, string xpointer) - : this(new XmlTextReader(uri), xpointer) { } + : this(new XmlBaseAwareXmlTextReader(uri), xpointer) { } /// <summary> /// Creates <c>XPointerReader</c> instance with given uri, nametable and xpointer. /// </summary> public XPointerReader(string uri, XmlNameTable nt, string xpointer) - : this(new XmlTextReader(uri, nt), xpointer) { } + : this(new XmlBaseAwareXmlTextReader(uri, nt), xpointer) { } /// <summary> /// Creates <c>XPointerReader</c> instance with given uri, stream, nametable and xpointer. /// </summary> public XPointerReader(string uri, Stream stream, XmlNameTable nt, string xpointer) - : this(new XmlTextReader(uri, stream, nt), xpointer) { } + : this(new XmlBaseAwareXmlTextReader(uri, stream, nt), xpointer) { } /// <summary> /// Creates <c>XPointerReader</c> instance with given uri, stream and xpointer. @@ -145,8 +146,8 @@ } else { - //Not cached or GCollected - XmlReader r = XmlReader.Create(new StringReader(content), null, uri); + //Not cached or GCollected + XmlReader r = new XmlBaseAwareXmlTextReader(uri, new StringReader(content)); doc = CreateAndCacheDocument(r); } Init(doc.CreateNavigator(), xpointer); @@ -389,7 +390,7 @@ { if (_pointedNodes.MoveNext()) { - _reader = _pointedNodes.Current.ReadSubtree(); + _reader = new SubtreeXPathNavigator(_pointedNodes.Current).ReadSubtree(); return _reader.Read(); } } |
Update of /cvsroot/mvp-xml/XInclude/v2/test/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/tests Added Files: binary.bin caching.xml count.txt data.xml disclaimer.xml document.xml fallback.xml fallbacknotchildinclude.xml filenotfound.xml includechildofinclude.xml includesitself-nohref-text.xml includesitself.xml langtest.xml loop.xml nohref.xml nonxmlchar.xml nxslt.exe resolver.xml russian.xml table.xml test-Martin.xml test2.xml twofallbacks.xml unknownparseattr.xml working_example.xml working_example2.xml xpointer.xml Log Message: --- NEW FILE: filenotfound.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="thereisnosuchfile.xml"><foo></foo></xi:include> foo </document> --- NEW FILE: caching.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: twofallbacks.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer2.xml" parse="xml"> <foo><xi:include href="disclaimer.xml"/></foo> <xi:fallback> <xi:include href="disclaimer.xml"/> </xi:fallback> <xi:fallback> <xi:include href="disclaimer.xml"/> </xi:fallback> <foo></foo> </xi:include> foo </document> --- NEW FILE: working_example.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>This document has been accessed <xi:include href="count.txt" parse="text"/> times.</p> </document> --- NEW FILE: includechildofinclude.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer2.xml" parse="xml"> <foo><xi:include href="disclaimer.xml"/></foo> <xi:include href="disclaimer.xml"/> <xi:fallback> <xi:include href="disclaimer.xml"/> </xi:fallback> <foo></foo> </xi:include> foo </document> --- NEW FILE: table.xml --- <HTML> <BODY> <TABLE> <CAPTION>MyCaption</CAPTION> </TABLE> </BODY> </HTML> --- NEW FILE: fallbacknotchildinclude.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:fallback>N/A</xi:fallback> <xi:include href="disclaimer.xml" parse="xml"><foo></foo></xi:include> foo </document> --- NEW FILE: count.txt --- 324387 --- NEW FILE: binary.bin --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fallback.xml --- <?xml version="1.0" encoding="utf-8"?> <div xmlns:xi="http://www.w3.org/2003/XInclude"> <xi:include href="no-such-file.txt" parse="text"> <xi:fallback> <xi:include href="and-no-such-one.txt" parse="text"> <xi:fallback><a href="mailto:bo...@ex...">Report error</a></xi:fallback> </xi:include> </xi:fallback> </xi:include> </div> --- NEW FILE: nxslt.exe --- (This appears to be a binary file; contents omitted.) --- NEW FILE: unknownparseattr.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml" parse="foo"><foo></foo></xi:include> foo </document> --- NEW FILE: test2.xml --- <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE toinclude [ <!ELEMENT book (#PCDATA)> <!ATTLIST book id ID #IMPLIED > <!ELEMENT toinclude (book)> ]> <toinclude xmlns="foo.bar#"> <book id="f1">Books</book> </toinclude> --- NEW FILE: includesitself.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="includesitself.xml" parse="text"><foo></foo></xi:include> foo </document> --- NEW FILE: xpointer.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="test2.xml" xpointer="f1"/> </document> --- NEW FILE: russian.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: working_example2.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>The following is the source of the "data.xml" resource:</p> <example><xi:include href="data.xml" parse="text"/></example> </document> --- NEW FILE: document.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include hre2f="disclaimer.xml" parse="xml"><foo></foo></xi:include> foo </document> --- NEW FILE: includesitself-nohref-text.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: resolver.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <stream> <xi:include href="stream://whatever"/> </stream> <textreader> <xi:include href="textreader://whatever"/> </textreader> <xmlreader> <xi:include href="xmlreader://whatever"/> </xmlreader> <p>Filtered:</p> <xi:include href="textreader://whatever" xpointer="xpointer(//text())"/> </document> --- NEW FILE: disclaimer.xml --- <?xml version='1.0'?> <!-- comment --> <?pi foo ?> <disclaimer> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> --- NEW FILE: loop.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nohref.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include parse="xml"><foo></foo></xi:include> foo </document> --- NEW FILE: nonxmlchar.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="binary.bin" parse="text"/> foo </document> --- NEW FILE: langtest.xml --- <?xml version="1.0" encoding="utf-8" ?> <foo xmlns:xi="http://www.w3.org/2003/XInclude"> <bar xml:lang="en-us"> <baz>whatever</baz> <xi:include href="russian.xml"/> <xi:include href="russian.xml" xpointer="xpointer(//text2)"/> <xi:include href="russian.xml" xpointer="xpointer(//english)"/> <xi:include href="russian.xml" xpointer="xpointer(//eng)"/> <xi:include href="russian.xml" xpointer="xpointer(//eng2)"/> <xi:include href="russian.xml" xpointer="xpointer(//eng3)"/> <xi:include href="russian.xml" xpointer="xpointer(//eng4)"/> <xi:include href="russian.xml" xpointer="xpointer(//eng5)"/> </bar> </foo> --- NEW FILE: data.xml --- <?xml version='1.0'?> <data> <item><![CDATA[Brooks & Shields]]></item> </data> --- NEW FILE: test-Martin.xml --- <?xml version="1.0" encoding="UTF-8"?> <myXml xmlns:xi="http://www.w3.org/2001/XInclude">> <otherStuff> </otherStuff> <!--WORKS (found node)--> <xi:include href="table.xml" xpointer="xpointer(//HTML/BODY/TABLE[starts-with(CAPTION,'M')] )"> <xi:fallback> node not found </xi:fallback> </xi:include> <!--WORKS CORRECTLY (found node)--> <xi:include href="table.xml" xpointer="xpointer(//HTML/BODY/TABLE)"> <xi:fallback> node not found </xi:fallback> </xi:include> <!--WORKS CORRECTLY(fallback, node not found)--> <xi:include href="table.xml" xpointer="xpointer(//HTML/BODY/STUFF)"> <xi:fallback> node not found </xi:fallback> </xi:include> <!--DOES NOT WORK CORRECTLY (node does not exist, should do fallback but throws CircularReferenceException--> <xi:include href="table.xml" xpointer="xpointer(//HTML/BODY/TABLE[starts-with(STUFF,'M')] )"> <xi:fallback> node not found </xi:fallback> </xi:include> <!--DOES NOT WORK CORRECTLY (node does not exist, should do fallback but throws CircularReferenceException--> <xi:include href="table.xml" xpointer="xpointer(//HTML/BODY/STUFF[starts-with(CAPTION,'M')] )"> <xi:fallback> node not found </xi:fallback> </xi:include> <moreXML/> </myXml> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:43
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/results In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/results Added Files: caching.xml document.xml fallback.xml filenotfound.xml includesitself-nohref-text.xml includesitself.xml langtest.xml loop.xml nonxmlchar.xml resolver.xml test-Martin.xml working_example.xml working_example2.xml xpointer.xml Log Message: --- NEW FILE: resolver.xml --- <?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <stream> <document xmlns:xi="http://www.w3.org/2003/XInclude" xml:base="stream://whatever/"> <p>120 Mz is adequate for an average home user.</p> <!-- comment --> <?pi foo ?> <disclaimer xml:base="disclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> foo </document> </stream> <textreader> <text attr="val" xml:base="textreader://whatever/">From custom resolver (as TextReader)</text> </textreader> <xmlreader> <text attr="val" xml:base="xmlreader://whatever/">From custom resolver (as XmlReader)</text> </xmlreader> <p>Filtered:</p> From custom resolver (as TextReader)</document> --- NEW FILE: langtest.xml --- <?xml version="1.0" encoding="utf-8"?> <foo xmlns:xi="http://www.w3.org/2003/XInclude"> <bar xml:lang="en-us"> <baz>whatever</baz> <russian-text xml:base="russian.xml" xml:lang=""> <text xml:lang="ru-ru">Ð ÑÑÑкий ÑекÑÑ</text> Another neutral text. <text2 xml:lang="he-IL">hebrew</text2> <eng xml:lang="en-us" xml:base="whatever"> <english>english - en-us</english> </eng> <eng2 attr="23" xml:lang="en-us"> <english>english - en-us</english> </eng2> <eng3 xml:lang="en-gb" attr="22" xml:base="whatever"> <english>english - en-us</english> </eng3> <eng4 xml:lang="en-gb" xml:base="whatever" attr="dd"> <english>english - en-us</english> </eng4> <eng5 attr="ff" xml:lang="" xml:base="whatever" attr2="dd"> <english>english - en-us</english> </eng5> </russian-text> <text2 xml:base="russian.xml" xml:lang="he-IL">hebrew</text2> <english xml:base="russian.xml">english - en-us</english><english xml:base="russian.xml">english - en-us</english><english xml:base="russian.xml" xml:lang="en-gb">english - en-us</english><english xml:base="russian.xml" xml:lang="en-gb">english - en-us</english><english xml:base="russian.xml" xml:lang="">english - en-us</english> <eng xml:base="russian.xml"> <english>english - en-us</english> </eng> <eng2 attr="23" xml:base="russian.xml"> <english>english - en-us</english> </eng2> <eng3 attr="22" xml:base="russian.xml" xml:lang="en-gb"> <english>english - en-us</english> </eng3> <eng4 attr="dd" xml:base="russian.xml" xml:lang="en-gb"> <english>english - en-us</english> </eng4> <eng5 attr="ff" attr2="dd" xml:base="russian.xml" xml:lang=""> <english>english - en-us</english> </eng5> </bar> </foo> --- NEW FILE: loop.xml --- <?xml version="1.0" encoding="utf-8" ?> <test> <fault/> </test> --- NEW FILE: includesitself.xml --- <?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="includesitself.xml" parse="text"><foo></foo></xi:include> foo </document> foo </document> --- NEW FILE: xpointer.xml --- <?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <book id="f1" xml:base="test2.xml" xmlns="foo.bar#">Books</book> </document> --- NEW FILE: nonxmlchar.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="binary.bin" parse="text"/> foo </document> --- NEW FILE: document.xml --- <?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <!-- comment --> <?pi foo ?> <disclaimer xml:base="disclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> foo </document> --- NEW FILE: working_example2.xml --- <?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>The following is the source of the "data.xml" resource:</p> <example><?xml version='1.0'?> <data> <item><![CDATA[Brooks & Shields]]></item> </data></example> </document> --- NEW FILE: caching.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: filenotfound.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <foo></foo> foo </document> --- NEW FILE: fallback.xml --- <?xml version="1.0" encoding="utf-8"?> <div xmlns:xi="http://www.w3.org/2003/XInclude"> <a href="mailto:bo...@ex...">Report error</a> </div> --- NEW FILE: includesitself-nohref-text.xml --- <?xml version="1.0" encoding="utf-8"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include parse="text"><foo></foo></xi:include> foo </document> foo </document> --- NEW FILE: working_example.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: test-Martin.xml --- <?xml version="1.0" encoding="utf-8"?> <myXml xmlns:xi="http://www.w3.org/2001/XInclude">> <otherStuff> </otherStuff> <!--WORKS (found node)--> <TABLE xml:base="table.xml"> <CAPTION>MyCaption</CAPTION> </TABLE> <!--WORKS CORRECTLY (found node)--> <TABLE xml:base="table.xml"> <CAPTION>MyCaption</CAPTION> </TABLE> <!--WORKS CORRECTLY(fallback, node not found)--> node not found <!--DOES NOT WORK CORRECTLY (node does not exist, should do fallback but throws CircularReferenceException--> node not found <!--DOES NOT WORK CORRECTLY (node does not exist, should do fallback but throws CircularReferenceException--> node not found <moreXML /> </myXml> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:42
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite Added Files: README.cvs report.html testcases.dtd testdescr.xml xinclude.xsl Log Message: --- NEW FILE: report.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>XInclude Conformance Tests</title> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> <style type="text/css"> BODY { font-family: Lucida, Helvetica, Univers, sans-serif; } H2, H3, H4 { text-align: left; color: #0066CC; } </style> <style type="text/css"> a:hover { color: white; background-color: blue; [...3526 lines suppressed...] </table> </td><td bgcolor="#ccffff"> <p>Since the xpointer attribute is not a URI reference, %-escaping must not appear in the XPointer, nor is there any need for a processor to apply or reverse such escaping.</p> </td> </tr> </table> <a name="contrib"></a> <h3>4. Contributors (Non-normative)</h3> <p> A team of volunteer members have participated in the development of this work. Contributions have come from: </p> <ul> <li>Sandra I. Martinez, NIST</li> <li>Daniel Veillard, Red Hat Network</li> <li>John Evdemon, FourThought</li> <li>Richard Tobin, University of Edinburgh</li> <li>Elliotte Rusty Harold</li> </ul> </body> </html> --- NEW FILE: README.cvs --- <h1 align="center"><a href="http://www.w3.org/TR/xinclude">XInclude</a> Test Suite</h1> <p> This is the CVS base used to maintain the <a href="http://www.w3.org/XML/Test/XInclude/Overview.html">test suite</a> for the <a href="http://www.w3.org/TR/xinclude">XInclude</a> specification. <p> The file <em>testdescr.xml</em> describes the set of primary resources used by the test suite, the sections of the specification that are being checked, the author and date of each test. It also provide whether the test should fail with a fatal error or points to a result file if this is not the case. Please note that while we expect the testsuite to accurately reflect the XInclude specification it is not normative and may change if errors are found. <p> For more informations on the test suite or to download a packaged version of the tests, please visit the <a href="http://www.w3.org/XML/Test/XInclude/Overview.html">XInclude test suite page</a>. <p> This document has been produced by the <a href="http://www.w3.org/XML/Core/">W3C XML Core Working Group</a> as part of the <a href="http://www.w3.org/XML/">XML Activity</a>. <p> Feedback on the content of this test suite should be sent to the public mailing list <a href="mailto:www...@w3..." >www...@w3... </a> <a href="http://lists.w3.org/Archives/Public/www-xml-xinclude-comments/">(archive)</a>. --- NEW FILE: xinclude.xsl --- <?xml version='1.0'?> <!-- <<<<<<< xinclude.xsl Original version copyright 2002 by W3C. All Rights Reserved. ======= XSL Stylesheet for documenting XML Inclusions(XInclude) conformance tests. Tested against Xalan processor. >>>>>>> 1.0 XSL 2002-03-07 Stylesheet for documenting XInclude conformance tests. This expects to be run on a document matching the DTD that was defined for merging collections of self-descriptive XInclude tests. Since all those collections will have (by design) the same test architecture, this includes boilerplate describing that design, to be used by all test documentation. --> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> <xsl:output method="html" indent="yes"/> <!-- ROOT: write an HTML wrapper --> <xsl:variable name="root-path">http://xw2k.sdct.itl.nist.gov/carmelo/XInclude/</xsl:variable> <xsl:template match="/testsuite"> <!-- XHTML namespace --> <html><head> <title>XInclude Conformance Tests</title> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/> <style> <xsl:comment> BODY { font-family: Lucida, Helvetica, Univers, sans-serif; } H2, H3, H4 { text-align: left; color: #0066CC; } </xsl:comment> </style> <style> <xsl:comment> a:hover { color: white; background-color: blue; } </xsl:comment> </style> </head><body bgcolor='#ffffff'> <center><h1><font color="#0066cc">XInclude Test Suite</font></h1></center> <p/> <center> <table border="4" width="90%"> <tr > <td> <table> <tr > <td width="35%"><img src="http://www.w3.org/Icons/w3c_home" width="200" height="100"/></td> <td width="30%"/> <td width="35%" align="right"><img src="http://www.nist.gov/itl/div897/images/nist_home.gif" width="350" height="125"/></td> </tr> </table> <center> <table> <tr> <td ><b><font size="+2">A Joint Development Effort</font></b></td> </tr> </table> </center> </td> </tr> </table> </center> <p/> <h4>W3C XML Core Working Group<br/>XInclude 1.0 Test Suite<br/>13 February 2003</h4> <dl> <dt><b>This version:</b></dt> <dd><ul> <li><a href="http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html"> http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html</a> </li> </ul> </dd> <p/> <dt><b>Current version:</b></dt> <dd><ul> <li><a href="http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html"> http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude.html</a> </li> </ul> </dd> <p/> <dt><b>Test Archive:</b></dt> <dd><ul> <li><a href="http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude0322.zip">http://xw2k.sdct.itl.nist.gov/carmelo/xinclude/xinclude0322.zip</a> </li> </ul></dd> <p/> <dt><b>W3C XML Core Working Group:</b></dt> <dd><ul><li><a href="http://www.w3.org/">http://www.w3.org/</a> </li></ul></dd> <p/> <dt><b>XML Inclusions(XInclude) Version 1.0:</b></dt> <dd><ul><li><a href="http://www.w3.org/TR/xinclude">http://www.w3.org/TR/xinclude</a> </li></ul></dd> <p/> <dt><b>Comments:</b></dt> <dd><ul><li>Sandra Martinez, NIST <a href="mailto:san...@ni..."><san...@ni...></a> </li></ul></dd> <p/> </dl> <a name="contents"/> <h2>Table of Contents</h2> <ol > <li><a href="#intro">Introduction</a></li> <li><a href="#categories">Test Case Descriptions</a></li> <li><a href="#contrib">Contributors</a></li> </ol> <a name="intro"/> <h2>1. Introduction </h2> <p> XInclude is a generic mechanism that is used to merge XML documents. XInclude uses elements, attributes and URI references which are existing XML constructs.</p> <p> Conformance tests can be used by developers, content creators, and users alike to increase their level of confidence in product quality. In circumstances where interoperability is necessary, these tests can also be used to determine that differing implementations support the same set of features. </p> <p>This report provides supporting documentation for all of the tests contributed by members of the <i>W3C</i> XML Core Working Group. Sources from which these tests have been collected include: <em> <xsl:for-each select="testcases"> <xsl:value-of select="@creator"/> <xsl:text>; </xsl:text> </xsl:for-each> </em>. It is anticipated that this report will supplement the actual tests.</p> <p>Comments/suggestions should be forwarded to <a href="mailto:www...@w3...">public XInclude comments mailing list</a>.</p> <a name="categories"/> <h2>2. Test Case Description</h2> <p> This section of this report contains descriptions of test cases, each test case includes a binary test. The test suite consists of a series of simple binary conformance tests, whereby a processor is deemed either to accept (a positive test) or reject (a negative test) the test. An expected result document is provided for the positive tests to compare the output of the processor with the reference file. Expected results are as accurate as possible, it is conceivable that a few files may diverge somewhat from the testcase description, however the idea is still captured. Negative tests are intended to identify expected errors as defined by the specification. Negative test are not accompanied by expected results.</p> <p>For an implementation to claim conformance it must pass all positive and negative tescases, which means that the implementation performed exactly as expected. </p> <p>A description for each test is presented in the following table as well as a section identifier from the Xinclude recommendation and the Colletion from which the test was originated. The test description is intended to have enough detail to evaluate diagnostic messages. Given the Test ID and the Collection, each test can be uniquely identified.</p> <xsl:apply-templates select="testcases"/> <a name="contrib"/> <h3>4. Contributors (Non-normative)</h3> <p> A team of volunteer members have participated in the development of this work. Contributions have come from: </p> <ul> <li>Sandra I. Martinez, NIST</li> <li>Daniel Veillard, Red Hat Network</li> <li>John Evdemon, FourThought</li> </ul> </body></html> </xsl:template> <xsl:template match="testcases"> <xsl:variable name="num-of-tests"> <xsl:value-of select="count(testcase)"/> </xsl:variable> <xsl:choose> <xsl:when test="$num-of-tests=0"> <table> <tr> <td bgcolor="#ffffcc">Currently there ARE NOT any tests for this test suite</td> </tr> </table> </xsl:when> <xsl:otherwise> <xsl:for-each select="testcase"> <table width="100%"> <tr valign="top"> <td width='40%'><table bgcolor='#eeeeff' border='1' width='100%'> <tr> <td width='50%'><b>Sections [Rules]:</b></td> <td bgcolor='#ffffcc'> <xsl:value-of select="section"/></td> </tr> <tr valign="top"> <td width='50%'><b>Test ID:</b></td> <td bgcolor='#ffffcc'> <xsl:variable name="test-path"><xsl:value-of select="concat(../@creator,'/',@href)"/></xsl:variable> <a href="{$root-path}{$test-path}"><xsl:value-of select="@id"/></a> </td> </tr> <tr valign="top"> <td width='50%'><b>Collection:</b></td> <td bgcolor='#ffffcc'><xsl:value-of select="../@creator"/></td> </tr> </table> </td> <td bgcolor='#ccffff'> <p><xsl:value-of select="description"/></p> <xsl:if test="output"> <p>There is an output test associated with this input file.</p> </xsl:if> </td> </tr> </table> </xsl:for-each> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template match="EM"> <em><xsl:apply-templates/></em> </xsl:template> <xsl:template match="B"> <b><xsl:apply-templates/></b> </xsl:template> </xsl:stylesheet> --- NEW FILE: testcases.dtd --- <?xml version="1.0" encoding="UTF-8"?> <!-- @(#)testcases.dtd 04/22/02 Typical use : <DOCTYPE test-suite SYSTEM "testcases.dtd"> Purpose: To collect test cases for submission to the Xinclude Test Suite. Elements: testsuite : This is the root element of the XInclude test suite. It is a collection of testcases from various test suppliers. testcases: This element should be the root element for an individual test collection. contributor: This element can be used to name test contributors at the individual-person level. date: Date stamp on the testcase. Identifies date of creation or modification in the "qualifier" argument. testcase: An individual test in the test collection. It should provide with the following elements; description, section, contributor, date and output section: This element contains the resource argument to Point to the relevant sections in the specification. Provides a mechanism for examining the description element. Tests can apply to one or more particular SECTIONS. description: Contains the test description, used to evaluate the diagnostic produced on negative tests. People will generally read this to evaluate whether the test failed for the correct reasons (when applicable). This description will be used by the test system to be included in the tables of test cases. output: Output file (result-infoset) as expected by the submitter. This is an optional element for informational purposes only. Attributes: creator: This argument provides with the test collection originator. (tescases attribute) basedir: This argument is the base directory in which tests for this collection reside. href: Test name or reference to an individual test. id: ("test-case" attribute) Unique identifier for each test case. features: Any optional features that this test requires. Implementations not supporting a feature should skip the test. Values are: xpointer-scheme: requires the xpointer scheme unexpanded-entities: requires the parser to not expand external entities unparsed-entities: requires unparsed entity support lang-fixup: requires xml:lang fixup support qualifier: Indicates date of creation or modification of the test. resource: Pointer to the applicable section of the specification., ("section" attribute) --> <!--The root element of the whole collection is test-suite and The root element of a collection should be "testcases". --> <!ENTITY % URI "CDATA"> <!ENTITY % text "(#PCDATA | em | b | a)*"> <!ELEMENT testsuite (testcases+ )> <!ELEMENT testcases (testcase | testresult)*> <!ATTLIST testcases creator CDATA #IMPLIED basedir CDATA #IMPLIED> <!ELEMENT testcase (contributor,section+,date,description,output*)> <!ATTLIST testcase id ID #REQUIRED href %URI; #REQUIRED type (success|error|optional) #REQUIRED features NMTOKENS #IMPLIED> <!ELEMENT description (#PCDATA)> <!ELEMENT section (#PCDATA)> <!ATTLIST section resource %URI; #REQUIRED> <!ELEMENT contributor (#PCDATA)> <!ELEMENT date (#PCDATA)> <!ATTLIST date qualifier (created|modified) "created"> <!ELEMENT output (#PCDATA)> <!-- Really basic HTML font tweaks, to support highlighting some aspects of test descriptions ... EM == emphasis (e.g. italics, fun colors) B == bold --> <!ELEMENT em (#PCDATA | b)*> <!ELEMENT b (#PCDATA | em)*> <!-- We also allow for hyperlinks in text (e.g., to include references to supporting evidence within SPECPROBLEM and TESTPROBLEM). --> <!ELEMENT a (#PCDATA | b | em)*> <!ATTLIST a href %URI; #REQUIRED > <!-- The TESTRESULT element is used to record test results. It has a required ID attribute which identifies the TEST. It has a required AGREEMENT attribute that indicates whether the results are in full agreement with the expected results as described in the TEST case or not. The textual contents of the TESTRESULT element should describe the results of the test and any issues or further information. The target of the optional RESULTS attribute could be an XML Infoset The optional FUTURESUPPORT attribute is used to indicate expected future support of the feature tested by this test case. The optional SPECPROBLEM attribute indicates if there is any ambiguity or other problem found in the spec that relates to this test. Especially if the results weren't as expected because of a misinterpretation of the spec, this should be documented here. Details/discussion should appear in the textual contents of the TESTRESULT element. The optional TESTPROBLEM attribute indicates if there is any issue with the TEST case and the expected results it suggests. Especially if the results of the test differ from that given as "expected" by the test case but are, in fact, believed to be the correct results, this should be documented here. Details/discussion should appear in the textual contents of the TESTRESULT element. --> <!ELEMENT testresult %text;> <!ATTLIST testresult id CDATA #REQUIRED agreement (full|issues) #REQUIRED results %URI; #IMPLIED futuresupport (full|partial|none) #IMPLIED specproblem (yes|no) "no" testproblem (yes|no) "no" > --- NEW FILE: testdescr.xml --- <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE testsuite SYSTEM "testcases.dtd"> <testsuite> <testcases creator="Redhat" basedir="Imaq/test/XInclude/docs"> <testcase id="imaq-include-xml-01" href="include.xml" type="success"> <contributor>Daniel Veillard</contributor> <section resource="http://www.w3.org/TR/xinclude/#xml-included-items">4.2</section> <date qualifier="created">8-Mar-2002</date> <description>Simple test of including another XML document.</description> <output>../../../result/XInclude/include.xml</output> </testcase> <testcase id="imaq-include-xml-02" href="recursive.xml" type="success"> <contributor>Daniel Veillard</contributor> <section resource="http://www.w3.org/TR/xinclude/#loops">4.2.7</section> <date qualifier="created">8-Mar-2002</date> <description>Test recursive inclusion.</description> [...1554 lines suppressed...] <testcase id="harold-96" href="badelementschemedata.xml" type="success"> <contributor>Elliotte Rusty Harold</contributor> <section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section> <date qualifier="created">12-Sep-2004</date> <description>Test that a non-child sequence in an xpointer is treated as a resource error.</description> <output>../result/badelementschemedata.xml</output> </testcase> <testcase id="harold-97" href="xpointerwithpercentescape.xml" type="error"> <contributor>Elliotte Rusty Harold</contributor> <section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section> <date qualifier="created">13-Oct-2004</date> <description>Since the xpointer attribute is not a URI reference, %-escaping must not appear in the XPointer, nor is there any need for a processor to apply or reverse such escaping.</description> </testcase> </testcases> </testsuite> |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Nist/test/ents In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Nist/test/ents Added Files: 004.ent books.xml chapter.txt extref.xml getnodes.xml idtst.xml include.txt include1.xml morebooks.xml nwf1.xml nwf2.xml nwfsomething.xml part1.xml prtids.xml ptrtst.xml reluriref.ent something.txt something.xml spec.dtd unparent.xml Log Message: --- NEW FILE: nwf1.xml --- <doc>Wrong ordering between prolog and element!</doc> <?xml version="1.0"?> <!DOCTYPE doc [ <!ELEMENT doc ANY> ]> --- NEW FILE: extref.xml --- <!DOCTYPE doc [ <!ELEMENT doc (#PCDATA)> <!ENTITY e SYSTEM "../ents/004.ent"> ]> <doc>&e;</doc> --- NEW FILE: getnodes.xml --- <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE BOOKCONTENT [ <!ELEMENT book (chapter+)> <!ELEMENT chapter (pcdata)> ]> <book> <chapter>chapter 1. <!-- Comment for chapter 1. --> <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <?some processing instructions ?> <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </book> --- NEW FILE: morebooks.xml --- <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE BOOKCONTENT [ <!ELEMENT book (chapter+)> <!ELEMENT chapter (pcdata)> ]> <book> <chapter>chapter 1. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>Second subtitle</subtitle> <subtitle>Third subtitle</subtitle> </chapter> </book> --- NEW FILE: unparent.xml --- <?xml version="1.0"?> <!DOCTYPE view [ <!ELEMENT view EMPTY> <!NOTATION jpg SYSTEM "jpg"> <!ENTITY image SYSTEM "gris.jpg" NDATA jpg> <!ATTLIST view sun ENTITY #IMPLIED> ]> <view sun = "image"/> --- NEW FILE: ptrtst.xml --- <book> <chapter> <p>Sentence 1. Sentence 2.</p> <p><i>Sentence 3. Sentence 4.</i> Sentence 5.</p> </chapter> </book> --- NEW FILE: something.xml --- <doc> <p>something</p> <p>really</p> <p>simple</p> </doc> --- NEW FILE: 004.ent --- Data --- NEW FILE: books.xml --- <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE BOOKCONTENT [ <!ELEMENT book (chapter+)> <!ELEMENT chapter (pcdata)> ]> <book> <chapter>chapter 1. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </book> --- NEW FILE: part1.xml --- <chapter>xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="chapter.txt" parse="text"/></chapter> --- NEW FILE: reluriref.ent --- <sub-inc><xinc:include href="include.txt" parse="text" xmlns:xinc="http://www.w3.org/2001/XInclude"/></sub-inc> --- NEW FILE: spec.dtd --- <!-- ............................................................... --> <!-- XML specification DTD ......................................... --> <!-- ............................................................... --> <!-- TYPICAL INVOCATION: # <!DOCTYPE spec PUBLIC # "-//W3C//DTD Specification::19980323//EN" # "http://www.w3.org/XML/Group/DTD/xmlspec.dtd"> PURPOSE: This DTD was developed for use with the XML family of W3C specifications. It is an XML-compliant DTD based in part on the TEI Lite and Sweb DTDs. DEPENDENCIES: None. CHANGE HISTORY: The list of changes is at the end of the DTD. For all details, see the design report at: <http://www.w3.org/XML/Group/DTD/xmlspec-report.htm> The "typical invocation" FPI always gets updated to reflect the date of the most recent changes. Search this file for "#" in the first column to see change history comments. MAINTAINER: Eve Maler ArborText Inc. el...@ar... voice: +1 781 270 5750 fax: +1 781 273 3760 --> <!-- ............................................................... --> <!-- Entities for characters and symbols ........................... --> <!-- #1998-03-10: maler: Added “ and ”. # Used 8879:1986-compatible decimal character # references. # Merged charent.mod file back into main file. --> <!ENTITY lt "&#60;"> <!ENTITY gt ">"> <!ENTITY amp "&#38;"> <!ENTITY apos "'"> <!ENTITY quot """> <!ENTITY mdash "--"> <!ENTITY nbsp " "> <!ENTITY ldquo "#x201C;"> <!ENTITY rdquo "#x201D;"> <!-- ............................................................... --> <!-- Entities for classes of standalone elements ................... --> <!-- #1997-10-16: maler: Added table to %illus.class;. #1997-11-28: maler: Added htable to %illus.class;. #1997-12-29: maler: IGNOREd table. #1998-03-10: maler: Removed SGML Open-specific %illus.class;. # Added "local" entities for customization. --> <!ENTITY % local.p.class ""> <!ENTITY % p.class "p %local.p.class;"> <!ENTITY % local.statusp.class ""> <!ENTITY % statusp.class "statusp %local.statusp.class;"> <!ENTITY % local.list.class ""> <!ENTITY % list.class "ulist|olist|slist|glist %local.list.class;"> <!ENTITY % local.speclist.class ""> <!ENTITY % speclist.class "orglist|blist %local.speclist.class;"> <!ENTITY % local.note.class ""> <!ENTITY % note.class "note|wfcnote|vcnote %local.note.class;"> <!ENTITY % local.illus.class ""> <!ENTITY % illus.class "eg|graphic|scrap|htable %local.illus.class;"> <!-- ............................................................... --> <!-- Entities for classes of phrase-level elements ................. --> <!-- #1997-12-29: maler: Added xspecref to %ref.class;. #1998-03-10: maler: Added %ednote.class;. # Added "local" entities for customization. --> <!ENTITY % local.annot.class ""> <!ENTITY % annot.class "footnote %local.annot.class;"> <!ENTITY % local.termdef.class ""> <!ENTITY % termdef.class "termdef|term %local.termdef.class;"> <!ENTITY % local.emph.class ""> <!ENTITY % emph.class "emph|quote %local.emph.class;"> <!ENTITY % local.ref.class ""> <!ENTITY % ref.class "bibref|specref|termref|titleref |xspecref|xtermref %local.ref.class;"> <!ENTITY % local.loc.class ""> <!ENTITY % loc.class "loc %local.loc.class;"> <!ENTITY % local.tech.class ""> <!ENTITY % tech.class "kw|nt|xnt|code %local.tech.class;"> <!ENTITY % local.ednote.class ""> <!ENTITY % ednote.class "ednote %local.ednote.class;"> <!-- ............................................................... --> <!-- Entities for mixtures of standalone elements .................. --> <!-- #1997-09-30: maler: Created %p.mix; to eliminate p from self. #1997-09-30: maler: Added %speclist.class; to %obj.mix; and %p.mix;. #1997-09-30: maler: Added %note.class; to %obj.mix; and %p.mix;. #1997-10-16: maler: Created %entry.mix;. Note that some elements # left out here are still allowed in termdef, # which entry can contain through %p.pcd.mix;. #1997-11-28: maler: Added %p.class; to %statusobj.mix;. #1998-03-10: maler: Added %ednote.class; to all mixtures, except # %p.mix; and %statusobj.mix;, because paragraphs # and status paragraphs will contain ednote # through %p.pcd.mix;. #1998-03-123: maler: Added %termdef.mix; (broken out from # %termdef.pcd.mix;). --> <!ENTITY % div.mix "%p.class;|%list.class;|%speclist.class;|%note.class; |%illus.class;|%ednote.class;"> <!ENTITY % obj.mix "%p.class;|%list.class;|%speclist.class;|%note.class; |%illus.class;|%ednote.class;"> <!ENTITY % p.mix "%list.class;|%speclist.class;|%note.class;|%illus.class;"> <!ENTITY % entry.mix "%list.class;|note|eg|graphic|%ednote.class;"> <!ENTITY % statusobj.mix "%p.class;|%statusp.class;|%list.class;"> <!ENTITY % hdr.mix "%p.class;|%list.class;|%ednote.class;"> <!ENTITY % termdef.mix "%note.class;|%illus.class;"> <!-- ............................................................... --> <!-- Entities for mixtures of #PCDATA and phrase-level elements .... --> <!-- Note that %termdef.pcd.mix contains %note.class; and %illus.class;, considered standalone elements. --> <!-- #1997-09-30: maler: Added scrap and %note.class; to %termdef.pcd.mix;. #1997-11-28: maler: Added %loc.class; to %p.pcd.mix;. #1998-03-10: maler: Added %ednote.class; to all mixtures. #1998-03-23: maler: Moved some %termdef.pcd.mix; stuff out to # %termdef.mix;. --> <!ENTITY % p.pcd.mix "#PCDATA|%annot.class;|%termdef.class;|%emph.class; |%ref.class;|%tech.class;|%loc.class;|%ednote.class;"> <!ENTITY % statusp.pcd.mix "#PCDATA|%annot.class;|%termdef.class;|%emph.class; |%ref.class;|%tech.class;|%loc.class;|%ednote.class;"> <!ENTITY % head.pcd.mix "#PCDATA|%annot.class;|%emph.class;|%tech.class;|%ednote.class;"> <!ENTITY % label.pcd.mix "#PCDATA|%annot.class;|%termdef.class;|%emph.class;|%tech.class; |%ednote.class;"> <!ENTITY % eg.pcd.mix "#PCDATA|%annot.class;|%emph.class;|%ednote.class;"> <!ENTITY % termdef.pcd.mix "#PCDATA|term|%emph.class;|%ref.class;|%tech.class; |%ednote.class;"> <!ENTITY % bibl.pcd.mix "#PCDATA|%emph.class;|%ref.class;|%loc.class;|%ednote.class;"> <!ENTITY % tech.pcd.mix "#PCDATA|%ednote.class;"> <!ENTITY % loc.pcd.mix "#PCDATA|%loc.class;|%ednote.class;"> <!-- ............................................................... --> <!-- Entities for customizable content models ...................... --> <!-- #1998-03-10: maler: Added customization entities. --> <!ENTITY % spec.mdl "header, front?, body, back?"> <!ENTITY % header.mdl "title, subtitle?, version, w3c-designation, w3c-doctype, pubdate, notice*, publoc, prevlocs?, latestloc?, authlist, status, abstract, pubstmt?, sourcedesc?, langusage, revisiondesc"> <!ENTITY % pubdate.mdl "day?, month, year"> <!-- ............................................................... --> <!-- Entities for common attributes ................................ --> <!-- key attribute: Optionally provides a sorting or indexing key, for cases when the element content is inappropriate for this purpose. --> <!ENTITY % key.att 'key CDATA #IMPLIED'> <!-- def attribute: Points to the element where the relevant definition can be found, using the IDREF mechanism. %def.att; is for optional def attributes, and %def-req.att; is for required def attributes. --> <!ENTITY % def.att 'def IDREF #IMPLIED'> <!ENTITY % def-req.att 'def IDREF #REQUIRED'> <!-- ref attribute: Points to the element where more information can be found, using the IDREF mechanism. %ref.att; is for optional ref attributes, and %ref-req.att; is for required ref attributes. --> <!ENTITY % ref.att 'ref IDREF #IMPLIED'> <!ENTITY % ref-req.att 'ref IDREF #REQUIRED'> <!-- #1998-03-23: maler: Added show and actuate attributes to href. # Added semi-common xml:space attribute. --> <!-- HREF and source attributes: Points to the element where more information or source data can be found, using the URL (XLL simple link) mechanism. For some purposes, is associated with additional XLL attributes. %href.att; is for optional HREF attributes, and %href-req.att; is for required HREF attributes. %source-req.att; is for the source attribute, which is always required. --> <!-- #1998-5-23: brownell: Turned "xml:link" into "xml-link" to # match usage in the XML spec, so that # validation errors aren't reported. --> <!ENTITY % href.att 'xml-link CDATA #FIXED "simple" href CDATA #IMPLIED show CDATA #FIXED "embed" actuate CDATA #FIXED "auto"'> <!ENTITY % href-req.att 'xml-link CDATA #FIXED "simple" href CDATA #REQUIRED show CDATA #FIXED "embed" actuate CDATA #FIXED "auto"'> <!ENTITY % source-req.att 'xml-link CDATA #FIXED "simple" xml:attributes NMTOKENS #FIXED "href source" source CDATA #REQUIRED show CDATA #FIXED "embed" actuate CDATA #FIXED "auto"'> <!-- xml:space attribute: Indicates that the element contains white space that the formatter or other application should retain, as appropriate to its function. --> <!ENTITY % xmlspace.att 'xml:space (default |preserve) #FIXED "preserve"'> <!-- Common attributes: Every element has an ID attribute (sometimes required, but usually optional) for links, and a Role attribute for extending the useful life of the DTD by allowing authors to make subclasses for any element. %common.att; is for common attributes where the ID is optional, and %common-idreq.att; is for common attributes where the ID is required. --> <!ENTITY % common.att 'id ID #IMPLIED role NMTOKEN #IMPLIED'> <!ENTITY % common-idreq.att 'id ID #REQUIRED role NMTOKEN #IMPLIED'> <!-- ............................................................... --> <!-- Common elements ............................................... --> <!-- head: Title on divisions, productions, and the like --> <!ELEMENT head (%head.pcd.mix;)*> <!ATTLIST head %common.att;> <!-- ............................................................... --> <!-- Major specification structure ................................. --> <!-- #1998-03-10: maler: Made spec content model easily customizable. --> <!ELEMENT spec (%spec.mdl;)> <!ATTLIST spec %common.att;> <!ELEMENT front (div1+)> <!ATTLIST front %common.att;> <!ELEMENT body (div1+)> <!ATTLIST body %common.att;> <!-- #1997-09-30: maler: Added inform-div1 to back content. --> <!ELEMENT back ((div1+, inform-div1*) | inform-div1+)> <!ATTLIST back %common.att;> <!ELEMENT div1 (head, (%div.mix;)*, div2*)> <!ATTLIST div1 %common.att;> <!-- #1997-09-30: maler: Added inform-div1 declarations. --> <!-- inform-div1: Non-normative division in back matter --> <!ELEMENT inform-div1 (head, (%div.mix;)*, div2*)> <!ATTLIST inform-div1 %common.att;> <!ELEMENT div2 (head, (%div.mix;)*, div3*)> <!ATTLIST div2 %common.att;> <!ELEMENT div3 (head, (%div.mix;)*, div4*)> <!ATTLIST div3 %common.att;> <!ELEMENT div4 (head, (%div.mix;)*)> <!ATTLIST div4 %common.att;> <!-- Specification header .......... --> <!-- #1998-03-10: maler: Made header content model easily customizable. --> <!ELEMENT header (%header.mdl;)> <!ATTLIST header %common.att;> <!-- Example of title: "Extensible Cheese Language (XCL)" --> <!ELEMENT title (#PCDATA)> <!ATTLIST title %common.att;> <!-- Example of subtitle: "A Cheesy Specification" --> <!ELEMENT subtitle (#PCDATA)> <!ATTLIST subtitle %common.att;> <!-- Example of version: "Version 666.0" --> <!ELEMENT version (#PCDATA)> <!ATTLIST version %common.att;> <!-- Example of w3c-designation: "WD-xcl-19991231" --> <!ELEMENT w3c-designation (#PCDATA)> <!ATTLIST w3c-designation %common.att;> <!-- Example of w3c-doctype: "World Wide Web Consortium Working Draft" --> <!ELEMENT w3c-doctype (#PCDATA)> <!ATTLIST w3c-doctype %common.att;> <!-- #1998-03-10: maler: Made pubdate content model easily customizable. --> <!ELEMENT pubdate (%pubdate.mdl;)> <!ATTLIST pubdate %common.att;> <!ELEMENT day (#PCDATA)> <!ATTLIST day %common.att;> <!ELEMENT month (#PCDATA)> <!ATTLIST month %common.att;> <!ELEMENT year (#PCDATA)> <!ATTLIST year %common.att;> <!-- Example of notice: "This draft is for public comment..." --> <!ELEMENT notice (%hdr.mix;)+> <!ATTLIST notice %common.att;> <!ELEMENT publoc (loc+)> <!ATTLIST publoc %common.att;> <!ELEMENT prevlocs (loc+)> <!ATTLIST prevlocs %common.att;> <!ELEMENT latestloc (loc+)> <!ATTLIST latestloc %common.att;> <!-- loc (defined in "Phrase-level elements" below) --> <!ELEMENT authlist (author+)> <!ATTLIST authlist %common.att;> <!-- #1997-09-30: maler: Made affiliation optional. #1998-03-10: maler: Made email optional. --> <!ELEMENT author (name, affiliation?, email?)> <!ATTLIST author %common.att;> <!ELEMENT name (#PCDATA)> <!ATTLIST name %common.att; %key.att;> <!ELEMENT affiliation (#PCDATA)> <!ATTLIST affiliation %common.att;> <!ELEMENT email (#PCDATA)> <!-- HREF attribute: email functions as a hypertext reference through this required attribute. Typically the reference would use the mailto: scheme. --> <!ATTLIST email %common.att; %href-req.att;> <!-- The status element now contains both statusp and p, and the latter now allows loc. Use p; statusp will be removed eventually. --> <!ELEMENT status (%statusobj.mix;)+> <!ATTLIST status %common.att;> <!ELEMENT abstract (%hdr.mix;)*> <!ATTLIST abstract %common.att;> <!ELEMENT pubstmt (%hdr.mix;)+> <!ATTLIST pubstmt %common.att;> <!ELEMENT sourcedesc (%hdr.mix;)+> <!ATTLIST sourcedesc %common.att;> <!ELEMENT langusage (language+)> <!ATTLIST langusage %common.att;> <!ELEMENT language (#PCDATA)> <!ATTLIST language %common.att;> <!ELEMENT revisiondesc (%hdr.mix;)+> <!ATTLIST revisiondesc %common.att;> <!-- ............................................................... --> <!-- Standalone elements ........................................... --> <!-- Paragraphs .................... --> <!-- #1997-09-30: maler: Changed from %obj.mix; to %p.mix;. #1997-12-29: maler: Changed order of %p.mix; and %p.pcd.mix; references. #1997-12-29: maler: Changed order of %statusobj.mix; and %statusp.pcd.mix; # references. --> <!ELEMENT p (%p.pcd.mix;|%p.mix;)*> <!ATTLIST p %common.att;> <!-- statusp: Special paragraph that allows loc inside it (note that p now also allows loc) --> <!ELEMENT statusp (%statusp.pcd.mix;|%statusobj.mix;)*> <!ATTLIST statusp %common.att;> <!-- Lists ......................... --> <!ELEMENT ulist (item+)> <!-- spacing attribute: Use "normal" to get normal vertical spacing for items; use "compact" to get less spacing. The default is dependent on the stylesheet. --> <!ATTLIST ulist %common.att; spacing (normal|compact) #IMPLIED> <!ELEMENT olist (item+)> <!-- spacing attribute: Use "normal" to get normal vertical spacing for items; use "compact" to get less spacing. The default is dependent on the stylesheet. --> <!ATTLIST olist %common.att; spacing (normal|compact) #IMPLIED> <!ELEMENT item (%obj.mix;)+> <!ATTLIST item %common.att;> <!ELEMENT slist (sitem+)> <!ATTLIST slist %common.att;> <!ELEMENT sitem (%p.pcd.mix;)*> <!ATTLIST sitem %common.att;> <!ELEMENT glist (gitem+)> <!ATTLIST glist %common.att;> <!ELEMENT gitem (label, def)> <!ATTLIST gitem %common.att;> <!ELEMENT label (%label.pcd.mix;)*> <!ATTLIST label %common.att;> <!ELEMENT def (%obj.mix;)*> <!ATTLIST def %common.att;> <!-- Special lists ................. --> <!ELEMENT blist (bibl+)> <!ATTLIST blist %common.att;> <!ELEMENT bibl (%bibl.pcd.mix;)*> <!-- HREF attribute: bibl optionally functions as a hypertext reference to the referred-to resource through this attribute. --> <!ATTLIST bibl %common.att; %href.att; %key.att;> <!ELEMENT orglist (member+)> <!ATTLIST orglist %common.att;> <!-- #1997-09-30: maler: Added optional affiliation. --> <!ELEMENT member (name, affiliation?, role?)> <!ATTLIST member %common.att;> <!-- name (defined in "Specification header" above) --> <!-- affiliation (defined in "Specification header" above) --> <!ELEMENT role (#PCDATA)> <!ATTLIST role %common.att;> <!-- Notes ......................... --> <!ELEMENT note (%obj.mix;)+> <!ATTLIST note %common.att;> <!ELEMENT wfcnote (head, (%obj.mix;)+)> <!-- ID attribute: wfcnote must have an ID so that it can be pointed to from a wfc element in a production. --> <!ATTLIST wfcnote %common-idreq.att;> <!ELEMENT vcnote (head, (%obj.mix;)+)> <!-- ID attribute: vcnote must have an ID so that it can be pointed to from a vc element in a production. --> <!ATTLIST vcnote %common-idreq.att;> <!-- Illustrations ................. --> <!-- #1998-03-23: maler: Added xml:space attribute. --> <!ELEMENT eg (%eg.pcd.mix;)*> <!ATTLIST eg %common.att; %xmlspace.att;> <!ELEMENT graphic EMPTY> <!-- source attribute: The graphic data must reside at the location pointed to. This is a hypertext reference, but for practical purposes, for now it should just be a pathname. --> <!ATTLIST graphic %common.att; %source-req.att; alt CDATA #IMPLIED> <!-- #1997-11-28: maler: Added prodgroup to scrap and defined it. --> <!ELEMENT scrap (head, (prodgroup+ | prod+ | bnf))> <!-- lang attribute: The scrap can link to a description of the language used, found in a language element in the header. --> <!ATTLIST scrap %common.att; lang IDREF #IMPLIED> <!ELEMENT prodgroup (prod+)> <!-- pcw<n> attributes: Presentational attributes to control the width of the "pseudo-table" columns used to output groups of productions. --> <!ATTLIST prodgroup %common.att; pcw1 CDATA #IMPLIED pcw2 CDATA #IMPLIED pcw3 CDATA #IMPLIED pcw4 CDATA #IMPLIED pcw5 CDATA #IMPLIED > <!ELEMENT prod (lhs, (rhs, (com|wfc|vc)*)+)> <!-- ID attribute: The production must have an ID so that cross-references (specref) and mentions of nonterminals (nt) can link to it. --> <!ATTLIST prod %common-idreq.att;> <!ELEMENT lhs (#PCDATA)> <!ATTLIST lhs %common.att;> <!ELEMENT rhs (#PCDATA|nt|xnt|com)*> <!ATTLIST rhs %common.att;> <!-- nt and xnt (defined in "Phrase-level elements" below) --> <!-- #1997-11-28: maler: Added loc and bibref to com content. --> <!ELEMENT com (#PCDATA|loc|bibref)*> <!ATTLIST com %common.att;> <!-- wfc: Should generate the head of the wfcnote pointed to --> <!ELEMENT wfc EMPTY> <!-- def attribute: Each well formedness tagline in a production must link to the wfcnote that defines it. --> <!ATTLIST wfc %def-req.att; %common.att;> <!-- vc: Should generate the head of the vcnote pointed to --> <!ELEMENT vc EMPTY> <!-- def attribute: Each validity tagline in a production must link to the vcnote that defines it. --> <!ATTLIST vc %def-req.att; %common.att;> <!-- #1998-03-23: maler: Added xml:space attribute. --> <!-- bnf: Un-marked-up production --> <!ELEMENT bnf (%eg.pcd.mix;)*> <!ATTLIST bnf %common.att; %xmlspace.att;> <!-- #1997-10-16: maler: Added table mechanism. #1997-11-28: maler: Added non-null system ID to entity declaration. # Added HTML table module. #1997-12-29: maler: IGNOREd SGML Open table model. #1998-03-10: maler: Removed SGML Open table model. # Merged html-tbl.mod file into main file. # Added %common.att; to all HTML table elements. --> <!-- TR and TD attributes: Alignment attributes. No default. --> <!ENTITY % trtd.att "align (left |center |right) #IMPLIED valign (top |middle |bottom) #IMPLIED"> <!ELEMENT htable (htbody+)> <!ATTLIST htable border CDATA "0" cellpadding CDATA "0" align (left |center |right) "left"> <!ELEMENT htbody (tr+)> <!ATTLIST htbody %common.att;> <!ELEMENT tr (td+)> <!ATTLIST tr %common.att; %trtd.att;> <!ELEMENT td (%p.pcd.mix;)*> <!ATTLIST td %common.att; %trtd.att; bgcolor CDATA #IMPLIED rowspan CDATA "1" colspan CDATA "1"> <!-- ............................................................... --> <!-- Phrase-level elements ......................................... --> <!-- bibref: Should generate, in square brackets, "key" on bibl --> <!ELEMENT bibref EMPTY> <!-- ref attribute: A bibliography reference must link to the bibl element that describes the resource. --> <!ATTLIST bibref %common.att; %ref-req.att;> <!ELEMENT code (%tech.pcd.mix;)*> <!ATTLIST code %common.att;> <!-- #1998-03-10: maler: Declared ednote and related elements. --> <!ELEMENT ednote (name?, date?, edtext)> <!ATTLIST ednote %common.att;> <!ELEMENT date (#PCDATA)> <!ATTLIST date %common.att;> <!ELEMENT edtext (#PCDATA)> <!ATTLIST edtext %common.att;> <!ELEMENT emph (#PCDATA)> <!ATTLIST emph %common.att;> <!-- footnote: Both footnote content and call to footnote --> <!ELEMENT footnote (%obj.mix;)+> <!ATTLIST footnote %common.att;> <!ELEMENT kw (%tech.pcd.mix;)*> <!ATTLIST kw %common.att;> <!ELEMENT loc (#PCDATA)> <!-- HREF attribute: The purpose of a loc element is to function as a hypertext link to a resource. (Ideally, the content of loc will also mention the URI of the resource, so that readers of the printed version will be able to locate the resource.) --> <!ATTLIST loc %common.att; %href-req.att;> <!ELEMENT nt (#PCDATA)> <!-- def attribute: The nonterminal must link to the production that defines it. --> <!ATTLIST nt %common.att; %def-req.att;> <!-- #1998-03-10: maler: Declared quote. --> <!-- quote: Scare quotes and other purely presentational quotes --> <!ELEMENT quote (%p.pcd.mix;)*> <!ATTLIST quote %common.att;> <!-- specref: Should generate italic "[n.n], Section Title" for div, "n" for numbered item, or "[n]" for production --> <!ELEMENT specref EMPTY> <!-- ref attribute: The purpose of a specref element is to link to a div, item in an olist, or production in the current spec. --> <!ATTLIST specref %common.att; %ref-req.att;> <!ELEMENT term (#PCDATA)> <!ATTLIST term %common.att;> <!ELEMENT termdef (%termdef.pcd.mix;|%termdef.mix;)*> <!-- ID attribute: A term definition must have an ID so that it can be linked to from termref elements. --> <!-- term attribute: The canonical form of the term or phrase being defined must appear in this attribute, even if the term or phrase also appears in the element content in identical form (e.g., in the term element). --> <!ATTLIST termdef %common-idreq.att; term CDATA #REQUIRED> <!ELEMENT termref (#PCDATA)> <!-- ref attribute: A term reference must link to the termdef element that defines the term. --> <!ATTLIST termref %common.att; %def-req.att;> <!ELEMENT titleref (#PCDATA)> <!-- HREF attribute: A title reference can optionally function as a hypertext link to the resource with this title. --> <!ATTLIST titleref %common.att; %href.att;> <!ELEMENT xnt (#PCDATA)> <!-- HREF attribute: The nonterminal must hyperlink to a resource that serves to define it (e.g., a production in a related XML specification). --> <!ATTLIST xnt %common.att; %href-req.att;> <!-- #1997-12-29: maler: Declared xspecref. --> <!ELEMENT xspecref (#PCDATA)> <!-- HREF attribute: The spec reference must hyperlink to the resource to cross-refer to (e.g., a section in a related XML specification). --> <!ATTLIST xspecref %common.att; %href-req.att;> <!ELEMENT xtermref (#PCDATA)> <!-- HREF attribute: The term reference must hyperlink to the resource that serves to define the term (e.g., a term definition in a related XML specification). --> <!ATTLIST xtermref %common.att; %href-req.att;> <!-- ............................................................... --> <!-- Unused elements for ADEPT ..................................... --> <!-- #1997-09-30: maler: Added unusued elements. #1997-10-14: maler: Fixed div to move nested div to the mixture. --> <!-- The following elements are purposely declared but never referenced. Declaring them allows them to be pasted from an HTML document into a document using this DTD in ADEPT. The ATD Context Transformation mechanism will try to convert them to the appropriate element for this DTD. While this conversion will not work for all fragments, it does allow many cases to work reasonably well. --> <!ELEMENT div (head?, (%div.mix;|ul|ol|h1|h2|h3|h4|h5|h6|div)*)> <!ELEMENT h1 (%head.pcd.mix;|em|a)*> <!ELEMENT h2 (%head.pcd.mix;|em|a)*> <!ELEMENT h3 (%head.pcd.mix;|em|a)*> <!ELEMENT h4 (%head.pcd.mix;|em|a)*> <!ELEMENT h5 (%head.pcd.mix;|em|a)*> <!ELEMENT h6 (%head.pcd.mix;|em|a)*> <!ELEMENT pre (%eg.pcd.mix;|em)*> <!ELEMENT ul (item|li)*> <!ELEMENT ol (item|li)*> <!ELEMENT li (#PCDATA|%obj.mix;)*> <!ELEMENT em (#PCDATA)> <!ELEMENT a (#PCDATA)> <!-- ............................................................... --> <!-- Change history ................................................ --> <!-- #1997-08-18: maler #- Did a major revision. #1997-09-10: maler #- Updated FPI. #- Removed namekey element and put key attribute on name element. #- Made statusp element and supporting entities. #- Added slist element with sitem+ content. #- Required head on scrap and added new bnf subelement. #- Added an xnt element and allowed it and nt in regular text and rhs. #- Removed the ntref element. #- Added back the com element to the content of rhs. #- Added a key attribute to bibl. #- Removed the ident element. #- Added a term element to be used inside termdef. #- Added an xtermref element parallel to termref. #- Beefed up DTD comments. #1997-09-12: maler #- Allowed term element in general text. #- Changed bibref to EMPTY. #- Added ref.class to termdef.pcd.mix. #1997-09-14: maler #- Changed main attribute of xtermref from def to href. #- Added termdef.class to label contents. #1997-09-30: maler #- Added character entity module and added new entities. #- Removed p from appearing directly in self; created %p.mix;. #- Added inform-div (non-normative division) element. #- Fixed xtermref comment to mention HREF, not ref. #- Extended orglist model to allow optional affiliation. #- Modified author to make affiliation optional. #- Added %speclist.class; and %note.class; to %obj.mix; and %p.mix;. #- Added %note.class; and %illus.class; to %termdef.pcd.mix;. #- Added unused HTML elements. #- Put empty system ID next to public ID in entity declarations. #1997-10-14: maler #- Fixed "unused" div content model to move nested div to mixture. #1997-10-16: maler #- Added SGML Open Exchange tables. #1997-11-28: maler #- Added support for prodgroup and its attributes. #- Added support for HTML tables. #- Added loc and bibref to content of com. #- Added loc to general p content models. #- Allowed p as alternative to statusp in status. #- Added non-null system IDs to external parameter entity declarations. #- (Modified the SGML Open table module to make it XML-compliant.) #- (Modified the character entity module.) #1997-12-29: maler #- Moved #PCDATA occurrences to come before GIs in content models. #- Removed use of the SGML Open table module. #- Added xspecref element. #- Ensured that all FPIs contain 4-digit year. #- (Modified the character entity module.) #1997-03-10: maler #- Merged the character entity and table modules into the main file. #- Added ldquo and rdquo entities. #- Added common attributes to prodgroup. #- Made the email element in header optional. #- Removed reference to the SGML Open table model. #- Added ednote element. #- Added quote element. #- Updated XLink usage to reflect 3 March 1998 WD. #- Added "local" entities to the class entities for customization. #- Parameterized several content models to allow for customization. #1997-03-23: maler #- Cleaned up some comments and removed some others. #- Added xml:space semi-common attribute to eg and bnf elements. #- Added show and embed attributes on all the uses of href. #- Added %common.att; to all HTML table elements. #- Added a real URI to the "typical invocation" comment. --> <!-- ............................................................... --> <!-- End of XML specification DTD .................................. --> <!-- ............................................................... --> --- NEW FILE: nwf2.xml --- <?xml version="1.0"?> <!DOCTYPE doc [ <!ELEMENT doc ANY> <!ELEMENT title ANY> ]> <doc>Wrong combination!</doc> <?PI after document element?> <title>Wrong combination!</title> <?PI after title element?> --- NEW FILE: nwfsomething.xml --- doc> <p>something</p> <p>really</p> <p>simple</p> </doc> --- NEW FILE: idtst.xml --- <?xml version='1.0'?> <!DOCTYPE doc [ <!ELEMENT doc (family*)> <!ELEMENT family (#PCDATA)> <!ATTLIST family fnumber ID #REQUIRED> <!ATTLIST family father IDREF #IMPLIED> <!ATTLIST family mother IDREF #IMPLIED> ]> <doc> <family fnumber="f1">Lopez</family> <family fnumber="f2">Clark</family> <family fnumber="f3" mother="f1" father="f2">Jackson</family> <family fnumber="f4" mother="f1" father="f2">Medina</family> </doc> --- NEW FILE: include1.xml --- <?xml version='1.0' encoding='utf-8'?> <foo/> --- NEW FILE: chapter.txt --- Chapter1. --- NEW FILE: something.txt --- this is some text in ASCII --- NEW FILE: include.txt --- testing relative uri reference. --- NEW FILE: prtids.xml --- <!DOCTYPE doc [ <!ELEMENT doc (isid*, lud*)> <!ELEMENT isid EMPTY> <!ELEMENT lud EMPTY> <!ATTLIST isid myid ID #IMPLIED> ]> <doc> <isid myid="dup"/> <isid myid="foo"/> <isid myid="bar"/> <lud>just an additional element.</lud> </doc> |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Nist/result In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Nist/result Added Files: nist-include-01.xml nist-include-02.xml nist-include-04.xml nist-include-06.xml nist-include-07.xml nist-include-09.xml nist-include-10.xml nist-include-13.xml nist-include-14.xml nist-include-16.xml nist-include-17.xml nist-include-18.xml nist-include-19.xml nist-include-20.xml nist-include-21.xml nist-include-22.xml nist-include-26.xml nist-include-27.xml nist-include-28.xml nist-include-29.xml nist-include-30.xml nist-include-31.xml nist-include-34.xml nist-include-35.xml nist-include-36.xml nist-include-37.xml nist-include-38.xml nist-include-39.xml nist-include-40.xml nist-include-49.xml nist-include-50.xml nist-include-51.xml nist-include-52.xml nist-include-55.xml Log Message: --- NEW FILE: nist-include-28.xml --- <?xml version="1.0"?> <!DOCTYPE book [ <!ELEMENT book (doc)*> <!ELEMENT doc (isid)*> <!ELEMENT isid EMPTY> <!ATTLIST isid myid ID #IMPLIED> ]> <book> <doc> <isid myid="mine"/> <isid myid="dup"/> </doc> <!-- including another XML document with IDs, using a shorthand pointer. --> <isid myid="dup" xml:base="../ents/prtids.xml"/> </book> --- NEW FILE: nist-include-02.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that the encoding attribute of the XInclude element has no efect when parse="xml"--> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-34.xml --- <?xml version="1.0"?> <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> </x> --- NEW FILE: nist-include-26.xml --- <?xml version="1.0"?> <this><sub-inc xml:base="../ents/reluriref.ent">testing relative uri reference. </sub-inc></this> --- NEW FILE: nist-include-01.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including another XML document --> <book xml:base="../ents/books.xml"> <chapter>chapter 1. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </book> </x> --- NEW FILE: nist-include-13.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that a fallback element content is not dependent on the value of the parse attribute. --> <doc>With something else.</doc> </x> --- NEW FILE: nist-include-10.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test content other than the fallback, in the xinclude element. This content must be ignored. --> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-22.xml --- <?xml version="1.0"?> <!-- Testing when the document (top level) element in the source infoset is an include element.--> <book xml:base="../ents/books.xml"> <chapter>chapter 1. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </book> --- NEW FILE: nist-include-50.xml --- <?xml version="1.0" encoding="UTF-8"?> <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 information item, except for the document type declaration information item. --> <doc xml:base="../ents/idtst.xml"> <family fnumber="f1">Lopez</family> <family fnumber="f2">Clark</family> <family fnumber="f3" mother="f1" father="f2">Jackson</family> <family fnumber="f4" mother="f1" father="f2">Medina</family> </doc> </x> --- NEW FILE: nist-include-55.xml --- <?xml version="1.0"?> <!DOCTYPE x [ <!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> ]> <!-- Including a duplicate unparsed entity. Test should ignore duplicate unparsed entity. --> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <view sun="image" xml:base="../ents/unparent.xml"/> <view sun="image"/> </x> --- NEW FILE: nist-include-39.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. The comment should be ignored. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-16.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test the exclusion of the document type declaration information item when performing an inclusion.--> <book xml:base="../ents/books.xml"> <chapter>chapter 1. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </book> </x> --- NEW FILE: nist-include-38.xml --- <?xml version="1.0"?> <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> </x> --- NEW FILE: nist-include-51.xml --- <?xml version="1.0"?> <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 information item corresponding to the comment node in the acquired infoset. --> <!-- Comment for chapter 1. --> </x> --- NEW FILE: nist-include-36.xml --- <?xml version="1.0"?> <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> </x> --- NEW FILE: nist-include-52.xml --- <?xml version="1.0"?> <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 information item corresponding to the processing node in the acquired infoset. --> <?some processing instructions ?> </x> --- NEW FILE: nist-include-19.xml --- <?xml version="1.0"?> <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. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </x> --- NEW FILE: nist-include-18.xml --- <?xml version="1.0"?> <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. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter><chapter xml:base="../ents/books.xml">chapter 2. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter><chapter xml:base="../ents/books.xml">chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </x> --- NEW FILE: nist-include-37.xml --- <?xml version="1.0"?> <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. --> <family fnumber="f2" xml:base="../ents/idtst.xml">Clark</family> </x> --- NEW FILE: nist-include-27.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that the encoding attribute of the XInclude element has no efect when parse="xml"--> <foo xml:base="../ents/include1.xml"/> </x> --- NEW FILE: nist-include-04.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test the fallback as a child of an xinclude element. Resource should be fetch. This test should pass. --> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-30.xml --- <?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> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using a shorthand pointer. --> <family fnumber="f3" mother="f1" father="f2" xml:base="../ents/idtst.xml">Jackson</family> </x> --- NEW FILE: nist-include-35.xml --- <?xml version="1.0"?> <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"> <family fnumber="f1">Lopez</family> <family fnumber="f2">Clark</family> <family fnumber="f3" mother="f1" father="f2">Jackson</family> <family fnumber="f4" mother="f1" father="f2">Medina</family> </doc> </x> --- NEW FILE: nist-include-40.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. The element elem should be ignored. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-17.xml --- <?xml version="1.0"?> <x xmlns:xinc="http://www.w3.org/2001/XInclude"> <!-- Test intra-document reference within include elements. --> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-14.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test a fallback element containing text even when xml is specified in the parse aurgument.--> Add something else. </x> --- NEW FILE: nist-include-29.xml --- <?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> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using a shorthand pointer. --> <family fnumber="f1" xml:base="../ents/idtst.xml">Lopez</family> </x> --- NEW FILE: nist-include-31.xml --- <?xml version="1.0"?> <!-- Including an XML document using an XPointer element schema. --> <document> <p>The relevant excerpt is:</p> <quotation> <p xml:base="../ents/ptrtst.xml">Sentence 1. Sentence 2.</p> </quotation> </document> --- NEW FILE: nist-include-49.xml --- <?xml version="1.0"?> <!DOCTYPE x [ <!ENTITY e SYSTEM "../ents/004.ent"> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document that contains an unexpanded entity reference. --> <doc xml:base="../ents/extref.xml">&e;</doc> </x> --- NEW FILE: nist-include-06.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test a fallback when a resource error occurs. --> <doc> <p>with</p> <p>something</p> <p>else</p> </doc> </x> --- NEW FILE: nist-include-09.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test unqualified attributes in the xinclude element --> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: nist-include-07.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test an empty fallback element. The include element is removed from the results. --> </x> --- NEW FILE: nist-include-20.xml --- <?xml version="1.0"?> <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 the set of top level include items is the children of acquired infoset's document information item, except for the document type information item. --> <book xml:base="../ents/books.xml"> <chapter>chapter 1. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 2. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> <chapter>chapter 3. <subtitle>first subtitle</subtitle> <subtitle>Second subtitle</subtitle> </chapter> </book> </x> --- NEW FILE: nist-include-21.xml --- <?xml version="1.0"?> <!DOCTYPE x [ <!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. --> <view sun="image" xml:base="../ents/unparent.xml"/> </x> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:29
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Imaq/test/XInclude/ents In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Imaq/test/XInclude/ents Added Files: ids.xml inc.txt something.txt something.xml sub-inc.ent Log Message: --- NEW FILE: ids.xml --- <!DOCTYPE doc [ <!ELEMENT doc (isid*)> <!ELEMENT isid EMPTY> <!ATTLIST isid myid ID #IMPLIED> ]> <doc> <isid myid="dup"/> <isid myid="foo"/> <isid myid="bar"/> </doc> --- NEW FILE: inc.txt --- is a test --- NEW FILE: sub-inc.ent --- <sub-inc><xinc:include href="inc.txt" parse="text" xmlns:xinc="http://www.w3.org/2001/XInclude"/></sub-inc> --- NEW FILE: something.xml --- <doc> <p>something</p> <p>really</p> <p>simple</p> </doc> --- NEW FILE: something.txt --- this is some text in ASCII |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Nist/test/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Nist/test/docs Added Files: nist-include-01.xml nist-include-02.xml nist-include-03.xml nist-include-04.xml nist-include-05.xml nist-include-06.xml nist-include-07.xml nist-include-08.xml nist-include-09.xml nist-include-10.xml nist-include-11.xml nist-include-12.xml nist-include-13.xml nist-include-14.xml nist-include-15.xml nist-include-16.xml nist-include-17.xml nist-include-18.xml nist-include-19.xml nist-include-20.xml nist-include-21.xml nist-include-22.xml nist-include-23.xml nist-include-24.xml nist-include-25.xml nist-include-26.xml nist-include-27.xml nist-include-28.xml nist-include-29.xml nist-include-30.xml nist-include-31.xml nist-include-32.xml nist-include-33.xml nist-include-34.xml nist-include-35.xml nist-include-36.xml nist-include-37.xml nist-include-38.xml nist-include-39.xml nist-include-40.xml nist-include-41.xml nist-include-42.xml nist-include-43.xml nist-include-44.xml nist-include-45.xml nist-include-46.xml nist-include-47.xml nist-include-48.xml nist-include-49.xml nist-include-50.xml nist-include-51.xml nist-include-52.xml nist-include-53.xml nist-include-54.xml nist-include-55.xml nist-include-56.xml Log Message: --- NEW FILE: nist-include-56.xml --- <?xml version="1.0"?> <!DOCTYPE x [ <!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 "bkgris.jpg" NDATA jpg> <!ATTLIST view sun ENTITY #IMPLIED> ]> <!-- Including an unparsed entity with same name, but different sysid. Test should fail. --> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including duplicate unparsed entity. --> <xinclude:include href="../ents/unparent.xml" parse="xml"/> <view sun="image"/> </x> --- NEW FILE: nist-include-44.xml --- <?xml version="1.0"?> <!-- Test a resource that contain not-well-formed XML. This test should resultin a fatal error. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/incl.xml"> <xi:fallback><xi:include href="../ents/nwf1.xml" parse="xml"/></xi:fallback> </xi:include> </x> --- NEW FILE: nist-include-28.xml --- <!DOCTYPE book [ <!ELEMENT book (doc*)> <!ELEMENT doc (isid*)> <!ELEMENT isid EMPTY> <!ATTLIST isid myid ID #IMPLIED> ]> <book> <doc> <isid myid="mine"/> <isid myid="dup"/> </doc> <!-- including another XML document with IDs, using a shorthand pointer. --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="../ents/prtids.xml" xpointer="dup"/> </book> --- NEW FILE: nist-include-24.xml --- <!-- Testing an include element in the document (top-level) element in the source doc. Test should fail because is including a processing instruction. --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="../ents/getnodes.xml" xpointer="xpointer(//processing-instruction())"/> --- NEW FILE: nist-include-34.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using XPointer element schema. --> <xinclude:include href="../ents/idtst.xml" xpointer="element(f1)"/> </x> --- NEW FILE: nist-include-23.xml --- <!-- Testing an include element in the document (top-level) element in the source doc. Test should fail because is including more than one element. --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="../ents/books.xml" xpointer="xpointer(//chapter)"/> --- NEW FILE: nist-include-03.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that values other than "xml" and "text" in the parse attribute of the XInclude element will generate a fatal error. Negative test.--> <xinclude:include href="../ents/something.xml" parse="xtext"/> </x> --- NEW FILE: nist-include-26.xml --- <this><xinc:include href="../ents/reluriref.ent" parse="xml" xmlns:xinc="http://www.w3.org/2001/XInclude"/></this> --- NEW FILE: nist-include-01.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including another XML document --> <xinclude:include href="../ents/books.xml" parse="xml"/> </x> --- NEW FILE: nist-include-08.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that when the fallback element is missing, from the include element, a resource error results in a fatal error. Negative test. --> <xinclude:include href="../ents/something.xml"/> <xinclude:include href="../ents/some.txt" parse="text"/> </x> --- NEW FILE: nist-include-48.xml --- <!DOCTYPE doc [ <!ELEMENT doc (#PCDATA)> <!ENTITY e SYSTEM "../ents/004.ent"> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- An attempt to resolve an xpointer schema on a documenent that contains unexpanded entity reference. This test should fail.--> <xinclude:include href="../ents/extref.xml" xpointer="xpointer(//doc)" parse="xml"/> </x> --- NEW FILE: nist-include-13.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that a fallback element content is not dependent on the value of the parse attribute. --> <xinclude:include href="../ents/some.xml" parse="text"> <xinclude:fallback><doc>With something else.</doc></xinclude:fallback> </xinclude:include> </x> --- NEW FILE: nist-include-10.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test content other than the fallback, in the xinclude element. This content must be ignored. --> <xinclude:include href="../ents/something.xml"> This content should be ignored </xinclude:include> </x> --- NEW FILE: nist-include-22.xml --- <!-- Testing when the document (top level) element in the source infoset is an include element.--> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="../ents/books.xml" parse="xml"/> --- NEW FILE: nist-include-50.xml --- <?xml version="1.0" encoding="UTF-8" ?> <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 information item, except for the document type declaration information item. --> <xinclude:include href="../ents/idtst.xml"/> </x> --- NEW FILE: nist-include-55.xml --- <?xml version="1.0"?> <!DOCTYPE x [ <!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> ]> <!-- Including a duplicate unparsed entity. Test should ignore duplicate unparsed entity. --> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <xinclude:include href="../ents/unparent.xml" parse="xml"/> <view sun="image"/> </x> --- NEW FILE: nist-include-54.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that an include location identifying an attribute node will result in a fatal error. --> <xinclude:include href="../ents/idtst.xml" xpointer="xpointer(//family/@fnumber)"/> </x> --- NEW FILE: nist-include-39.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. The comment should be ignored. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/something.xml"> <!-- This comment must be ignored. --> </xi:include> </x> --- NEW FILE: nist-include-16.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test the exclusion of the document type declaration information item when performing an inclusion.--> <xinclude:include href="../ents/books.xml" parse="xml"/> </x> --- NEW FILE: nist-include-38.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document using the XPointer Framework. --> <xinclude:include href="../ents/idtst.xml" xpointer="xpointer(id('f2'))element(/1/2)"/> </x> --- NEW FILE: nist-include-51.xml --- <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 information item corresponding to the comment node in the acquired infoset. --> <xinclude:include href="../ents/getnodes.xml" xpointer="xpointer(//comment())"/> </x> --- NEW FILE: nist-include-36.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using XPointer element schema. --> <xinclude:include href="../ents/idtst.xml" xpointer="element(/1/2)"/> </x> --- NEW FILE: nist-include-52.xml --- <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 information item corresponding to the processing node in the acquired infoset. --> <xinclude:include href="../ents/getnodes.xml" xpointer="xpointer(//processing-instruction())"/> </x> --- NEW FILE: nist-include-33.xml --- <?xml version='1.0'?> <!-- Including an XML document using an XPointer element schema. --> <document> <quotation> <include xmlns="http://www.w3.org/2001/XInclude" href="../ents/ptrtst.xml" xpointer="element(chapter)"/> </quotation> </document> --- NEW FILE: nist-include-32.xml --- <?xml version='1.0'?> <!-- Including an XML document using an XPointer element schema. --> <document> <p>The relevant excerpt is:</p> <quotation> <include xmlns="http://www.w3.org/2001/XInclude" href="../ents/ptrtst.xml" xpointer="element(book/1)"/> </quotation> </document> --- NEW FILE: nist-include-41.xml --- <?xml version="1.0"?> <!-- The content of the include element is another include element, this test should result in a fatal error. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <p>The report is available.</p> <xi:include href="../ents/something.xml"> <xi:include href="../ents/something.xml"/> </xi:include> </x> --- NEW FILE: nist-include-53.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that an include location identifying an attribute node will result in a fatal error. --> <xinclude:include href="../ents/idtst.xml" xpointer="xpointer(//@*)"/> </x> --- NEW FILE: nist-include-11.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test the inclusion of a non-well-formed resource. The inclusion should generate a fatal error. --> <xinclude:include href="../ents/nwfsomething.xml"/> </x> --- NEW FILE: nist-include-37.xml --- <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. --> <xinclude:include href="../ents/idtst.xml" xpointer="element(/1/2)xpointer(id('f2'))"/> </x> --- NEW FILE: nist-include-07.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test an empty fallback element. The include element is removed from the results. --> <xinclude:include href="../ents/some.txt" parse="text"> <xinclude:fallback/> </xinclude:include> </x> --- NEW FILE: nist-include-27.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that the encoding attribute of the XInclude element has no efect when parse="xml"--> <xinclude:include href="../ents/include1.xml" parse="xml" encoding="utf-16"/> </x> --- NEW FILE: nist-include-04.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test the fallback as a child of an xinclude element. Resource should be fetch. This test should pass. --> <xinclude:include href="../ents/something.xml"> <xinclude:fallback>some text in ascii</xinclude:fallback> </xinclude:include> </x> --- NEW FILE: nist-include-30.xml --- <?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> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using a shorthand pointer. --> <xinclude:include href="../ents/idtst.xml" xpointer="f3"/> </x> --- NEW FILE: nist-include-15.xml --- <this><xinc:include href="nist-include-15.xml" parse="xml" xmlns:xinc="http://www.w3.org/2001/XInclude"/></this> --- NEW FILE: nist-include-35.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using XPointer element schema. --> <xinclude:include href="../ents/idtst.xml" xpointer="element(/1)"/> </x> --- NEW FILE: nist-include-12.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that is a fatal error for an include element to contain more than one fallback elements.--> <xinclude:include href="../ents/something.xml"> <xinclude:fallback> <doc> <p>with</p> <p>something</p> <p>else</p> </doc> </xinclude:fallback> <xinclude:fallback>only one fallback is allowed</xinclude:fallback> </xinclude:include> </x> --- NEW FILE: nist-include-40.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. The element elem should be ignored. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/something.xml"> <xi:fallback>Resource not available.</xi:fallback> <elem>This element must be ignored.</elem> </xi:include> </x> --- NEW FILE: nist-include-18.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including a set of nodes from an XML document --> <xinclude:include href="../ents/books.xml" xpointer="xpointer(//chapter)"/> </x> --- NEW FILE: nist-include-17.xml --- <x xmlns:xinc="http://www.w3.org/2001/XInclude"> <!-- Test intra-document reference within include elements. --> <xinc:include href="../ents/something.xml"/> <xinc:include xpointer="element(/1/1)" parse="xml"/> </x> --- NEW FILE: nist-include-02.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test that the encoding attribute of the XInclude element has no efect when parse="xml"--> <xinclude:include href="../ents/something.xml" parse="xml" encoding="iso-2022-jp"/> </x> --- NEW FILE: nist-include-14.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test a fallback element containing text even when xml is specified in the parse aurgument.--> <xinclude:include href="../ents/some.xml" parse="xml"> <xinclude:fallback> Add something else. </xinclude:fallback> </xinclude:include> </x> --- NEW FILE: nist-include-29.xml --- <?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> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document with ids using a shorthand pointer. --> <xinclude:include href="../ents/idtst.xml" xpointer="f1"/> </x> --- NEW FILE: nist-include-31.xml --- <?xml version='1.0'?> <!-- Including an XML document using an XPointer element schema. --> <document> <p>The relevant excerpt is:</p> <quotation> <include xmlns="http://www.w3.org/2001/XInclude" href="../ents/ptrtst.xml" xpointer="element(/1/1/1)"/> </quotation> </document> --- NEW FILE: nist-include-49.xml --- <!DOCTYPE x [ <!ENTITY e SYSTEM "../ents/004.ent"> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document that contains an unexpanded entity reference. --> <xinclude:include href="../ents/extref.xml" parse="xml"/> </x> --- NEW FILE: nist-include-47.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. The xinclude element may contain a fallback element; other elements from the xinclude namespace result in a fatal error.--> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/include1.xml"> <xi:include href="../ents/something.xml"/> </xi:include> </x> --- NEW FILE: nist-include-42.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. This test should result in a fatal error. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/some.xml"> <xi:fallback>A resource is missing.</xi:fallback> <xi:include href="../ents/something.xml"/> </xi:include> </x> --- NEW FILE: nist-include-43.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. This test should result in a fatal error. The content must be one fallback. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/something.xml"> <xi:fallback><xi:include href="../ents/include1.xml"/></xi:fallback> <xi:fallback>Resource not available.</xi:fallback> </xi:include> </x> --- NEW FILE: nist-include-06.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test a fallback when a resource error occurs. --> <xinclude:include href="../ents/some.xml"> <xinclude:fallback> <doc> <p>with</p> <p>something</p> <p>else</p> </doc> </xinclude:fallback> </xinclude:include> </x> --- NEW FILE: nist-include-19.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including a set of nodes from an XML document --> <xinclude:include href="../ents/books.xml" xpointer="xpointer(//book/chapter[1])"/> </x> --- NEW FILE: nist-include-09.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test unqualified attributes in the xinclude element --> <xinclude:include href="../ents/something.xml" arg="mustignore"/> </x> --- NEW FILE: nist-include-05.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Test a fallback element not appearing as a direct child of an xinclude element. A fatal error should be generated. --> <xinclude:include href="../ents/something.xml"/> <somelem>I am part of the source infoset</somelem> <xinclude:fallback>some text in ascii.</xinclude:fallback> </x> --- NEW FILE: nist-include-46.xml --- <?xml version="1.0"?> <!-- Testing the content of the xinclude element. The xinclude element may contain a fallback element; other elements from the xinclude namespace result in a fatal error. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/something.xml"> <xi:fallback>Resource not available.</xi:fallback> <xi:include href="../ents/include1.xml"/> </xi:include> </x> --- NEW FILE: nist-include-25.xml --- <!-- Testing an include element in the document (top-level) element in the source doc. Test should fail because is including only a comment. --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="../ents/getnodes.xml" xpointer="xpointer(//comment())"/> --- NEW FILE: nist-include-45.xml --- <?xml version="1.0"?> <!-- Test a resource that contain not-well-formed XML. This test should result in a fatal error. --> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="../ents/nwf2.xml"/> </x> --- NEW FILE: nist-include-20.xml --- <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 the set of top level include items is the children of acquired infoset's document information item, except for the document type information item. --> <xinclude:include href="../ents/books.xml" xpointer="xpointer(/book)"/> </x> --- NEW FILE: nist-include-21.xml --- <?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> ]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including an XML document with an unparsed entity. --> <xinclude:include href="../ents/unparent.xml" parse="xml"/> </x> |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Imaq/test/XInclude/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Imaq/test/XInclude/docs Added Files: docids.xml fallback.xml include.xml nodes.xml recursive.xml txtinclude.xml Log Message: --- NEW FILE: docids.xml --- <!DOCTYPE book [ <!ELEMENT book (doc*)> <!ELEMENT doc (isid*)> <!ELEMENT isid EMPTY> <!ATTLIST isid myid ID #IMPLIED> ]> <book> <doc> <isid myid="mine"/> <isid myid="dup"/> </doc> <!-- including another XML document with IDs --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="../ents/ids.xml"/> </book> --- NEW FILE: include.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including another XML document --> <xinclude:include href="../ents/something.xml"/> </x> --- NEW FILE: txtinclude.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including another text document --> <xinclude:include href="../ents/something.txt" parse="text"/> </x> --- NEW FILE: nodes.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including a set of nodes from an XML document --> <xinclude:include href="../ents/something.xml" xpointer="xpointer(//p)"/> </x> --- NEW FILE: fallback.xml --- <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of a fallback on unavailble URI --> <xinclude:include href="something.xml"> <xinclude:fallback><warning>Inclusion failed</warning></xinclude:fallback> </xinclude:include> </x> --- NEW FILE: recursive.xml --- <this><xinc:include href="../ents/sub-inc.ent" parse="xml" xmlns:xinc="http://www.w3.org/2001/XInclude"/></this> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:28
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Imaq/result/XInclude In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Imaq/result/XInclude Added Files: docids.xml fallback.xml include.xml nodes.xml recursive.xml txtinclude.xml Log Message: --- NEW FILE: docids.xml --- <?xml version="1.0"?> <!DOCTYPE book [ <!ELEMENT book (doc)*> <!ELEMENT doc (isid)*> <!ELEMENT isid EMPTY> <!ATTLIST isid myid ID #IMPLIED> ]> <book> <doc> <isid myid="mine"/> <isid myid="dup"/> </doc> <!-- including another XML document with IDs --> <doc xml:base="../ents/ids.xml"> <isid myid="dup"/> <isid myid="foo"/> <isid myid="bar"/> </doc> </book> --- NEW FILE: include.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including another XML document --> <doc xml:base="../ents/something.xml"> <p>something</p> <p>really</p> <p>simple</p> </doc> </x> --- NEW FILE: txtinclude.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including another text document --> this is some text in ASCII </x> --- NEW FILE: nodes.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of including a set of nodes from an XML document --> <p xml:base="../ents/something.xml">something</p><p xml:base="../ents/something.xml">really</p><p xml:base="../ents/something.xml">simple</p> </x> --- NEW FILE: fallback.xml --- <?xml version="1.0"?> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Simple test of a fallback on unavailble URI --> <warning>Inclusion failed</warning> </x> --- NEW FILE: recursive.xml --- <?xml version="1.0"?> <this><sub-inc xml:base="../ents/sub-inc.ent">is a test </sub-inc></this> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:24
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Harold/test/basedata In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Harold/test/basedata Added Files: red.xml Log Message: --- NEW FILE: red.xml --- <?xml version="1.0"?> <red> test data </red> |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Harold/test/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Harold/test/text Added Files: EBCDIC.xml UTF32BE.xml UTF32LE.xml UTF8.xml UnicodeBigUnmarked.xml UnicodeLittleUnmarked.xml Log Message: --- NEW FILE: EBCDIC.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: UTF8.xml --- <?xml version="1.0"?> <p>data</p> --- NEW FILE: UnicodeLittleUnmarked.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: UTF32LE.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: UTF32BE.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: UnicodeBigUnmarked.xml --- (This appears to be a binary file; contents omitted.) |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:24
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Harold/test/b In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Harold/test/b Added Files: b.xml Log Message: --- NEW FILE: b.xml --- <p>This is from file B in directory b</p> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:24
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Harold/test/a In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Harold/test/a Added Files: a.xml Log Message: --- NEW FILE: a.xml --- <p>This is from file a.xml in directory a</p> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:23
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/EdUni/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/EdUni/test Added Files: book.xml chap1.xml chap2.xml extract.xml lang-samples.xml lang.xml Log Message: --- NEW FILE: lang.xml --- <sentences xmlns:xi="http://www.w3.org/2001/XInclude"> <sentence>The cat sat on the mat.</sentence> <sentence xml:lang="en-gb">Jackdaws love my big sphinx of quartz.</sentence> <xi:include href="lang-samples.xml" xpointer="none"/> <xi:include href="lang-samples.xml" xpointer="none2"/> <xi:include href="lang-samples.xml" xpointer="english"/> <xi:include href="lang-samples.xml" xpointer="english2"/> <xi:include href="lang-samples.xml" xpointer="french"/> <xi:include href="lang-samples.xml" xpointer="german"/> <xi:include href="lang-samples.xml" xpointer="australian"/> <sentences xml:lang="en-gb"> <xi:include href="lang-samples.xml" xpointer="none"/> <xi:include href="lang-samples.xml" xpointer="none2"/> <xi:include href="lang-samples.xml" xpointer="english"/> <xi:include href="lang-samples.xml" xpointer="english2"/> <xi:include href="lang-samples.xml" xpointer="french"/> <xi:include href="lang-samples.xml" xpointer="german"/> <xi:include href="lang-samples.xml" xpointer="australian"/> </sentences> </sentences> --- NEW FILE: lang-samples.xml --- <!DOCTYPE sentences [ <!ELEMENT sentence (#PCDATA)> <!ATTLIST sentence id ID #IMPLIED> ]> <sentences> <sentence id="none">Hi.</sentence> <sentence id="english" xml:lang="en-gb">Hello.</sentence> <sentence id="french" xml:lang="fr">Bonjour.</sentence> <sentences xml:lang="en-gb"> <sentence id="english2">Hello.</sentence> </sentences> <sentences xml:lang="de"> <sentence id="german">Guten Tag.</sentence> <sentences xml:lang="en-au"> <sentence id="australian">G'day mate.</sentence> </sentences> <sentences xml:lang=""> <sentence id="none2">Yo..</sentence> </sentences> </sentences> </sentences> --- NEW FILE: chap2.xml --- <!DOCTYPE chapter [ <!ELEMENT chapter (#PCDATA)> <!ATTLIST chapter id ID #IMPLIED> ]> <chapter id="chap2"> And the all lived happily ever after. </chapter> --- NEW FILE: extract.xml --- <!DOCTYPE extract [ <!ELEMENT include (#PCDATA)> <!ATTLIST include xmlns CDATA #FIXED "http://www.w3.org/2001/XInclude"> ]> <extract> <include href="book.xml" xpointer="intro"/> <include href="book.xml" xpointer="chap1"/> </extract> --- NEW FILE: chap1.xml --- <!DOCTYPE chapter [ <!ELEMENT chapter (#PCDATA)> <!ATTLIST chapter id ID #IMPLIED> ]> <chapter id="chap1"> It was a dark and stormy night. </chapter> --- NEW FILE: book.xml --- <!DOCTYPE book [ <!ELEMENT intro (#PCDATA)> <!ELEMENT include (#PCDATA)> <!ATTLIST intro id ID #IMPLIED> <!ATTLIST include xmlns CDATA #FIXED "http://www.w3.org/2001/XInclude"> <!ELEMENT chapter (#PCDATA)> <!ATTLIST chapter id ID #IMPLIED> ]> <book> <intro id="intro"> You will enjoy this book. </intro> <include href="chap1.xml"/> <include href="chap2.xml"/> </book> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2 Added Files: .cvsignore XInclude.sln Log Message: --- NEW FILE: .cvsignore --- bin obj *.user *.suo --- NEW FILE: XInclude.sln --- Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XInclude", "src\XInclude.csproj", "{3750FAB1-FD0E-425A-9DAA-87543A556319}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIncludeTest", "test\XIncludeTest.csproj", "{D766C1F9-D2DA-4088-9AE1-52EA369B555F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3750FAB1-FD0E-425A-9DAA-87543A556319}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3750FAB1-FD0E-425A-9DAA-87543A556319}.Debug|Any CPU.Build.0 = Debug|Any CPU {3750FAB1-FD0E-425A-9DAA-87543A556319}.Release|Any CPU.ActiveCfg = Release|Any CPU {3750FAB1-FD0E-425A-9DAA-87543A556319}.Release|Any CPU.Build.0 = Release|Any CPU {D766C1F9-D2DA-4088-9AE1-52EA369B555F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D766C1F9-D2DA-4088-9AE1-52EA369B555F}.Debug|Any CPU.Build.0 = Debug|Any CPU {D766C1F9-D2DA-4088-9AE1-52EA369B555F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D766C1F9-D2DA-4088-9AE1-52EA369B555F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection EndGlobal |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/doc Added Files: changelog.txt Log Message: --- NEW FILE: changelog.txt --- --------------------------------------------------------- September 28, 2004 Initial setup. Folder contains any documentation related to the module. |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/EdUni/result In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/EdUni/result Added Files: book.xml extract.xml lang.xml Log Message: --- NEW FILE: lang.xml --- <sentences xmlns:xi="http://www.w3.org/2001/XInclude"> <sentence>The cat sat on the mat.</sentence> <sentence xml:lang="en-gb">Jackdaws love my big sphinx of quartz.</sentence> <sentence id="none" xml:base="lang-samples.xml">Hi.</sentence> <sentence id="none2" xml:base="lang-samples.xml">Yo..</sentence> <sentence xml:lang="en-gb" id="english" xml:base="lang-samples.xml">Hello.</sentence> <sentence xml:lang="en-gb" id="english2" xml:base="lang-samples.xml">Hello.</sentence> <sentence xml:lang="fr" id="french" xml:base="lang-samples.xml">Bonjour.</sentence> <sentence xml:lang="de" id="german" xml:base="lang-samples.xml">Guten Tag.</sentence> <sentence xml:lang="en-au" id="australian" xml:base="lang-samples.xml">G'day mate.</sentence> <sentences xml:lang="en-gb"> <sentence xml:lang="" id="none" xml:base="lang-samples.xml">Hi.</sentence> <sentence xml:lang="" id="none2" xml:base="lang-samples.xml">Yo..</sentence> <sentence xml:lang="en-gb" id="english" xml:base="lang-samples.xml">Hello.</sentence> <sentence id="english2" xml:base="lang-samples.xml">Hello.</sentence> <sentence xml:lang="fr" id="french" xml:base="lang-samples.xml">Bonjour.</sentence> <sentence xml:lang="de" id="german" xml:base="lang-samples.xml">Guten Tag.</sentence> <sentence xml:lang="en-au" id="australian" xml:base="lang-samples.xml">G'day mate.</sentence> </sentences> </sentences> --- NEW FILE: book.xml --- <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE book [ <!ELEMENT intro (#PCDATA)> <!ELEMENT include (#PCDATA)> <!ATTLIST intro id ID #IMPLIED> <!ATTLIST include xmlns CDATA #FIXED "http://www.w3.org/2001/XInclude"> <!ELEMENT chapter (#PCDATA)> <!ATTLIST chapter id ID #IMPLIED> ]> <book> <intro id="intro"> You will enjoy this book. </intro> <chapter id="chap1" xml:base="chap1.xml"> It was a dark and stormy night. </chapter> <chapter id="chap2" xml:base="chap2.xml"> And the all lived happily ever after. </chapter> </book> --- NEW FILE: extract.xml --- <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE extract [ <!ELEMENT include (#PCDATA)> <!ATTLIST include xmlns CDATA #FIXED "http://www.w3.org/2001/XInclude"> ]> <extract> <intro id="intro" xml:base="book.xml"> You will enjoy this book. </intro> <chapter id="chap1" xml:base="chap1.xml"> It was a dark and stormy night. </chapter> </extract> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2/src/XPointer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/src/XPointer Added Files: dummy.txt Log Message: --- NEW FILE: dummy.txt --- Dummy file to prevent pruning of the directory. |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2/src/Common/XPath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/src/Common/XPath Added Files: dummy.txt Log Message: --- NEW FILE: dummy.txt --- Dummy file to prevent pruning of the directory. |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/lib Added Files: changelog.txt Log Message: --- NEW FILE: changelog.txt --- --------------------------------------------------------- September 28, 2004 Initial setup. Will contain external libraries referenced by the project. |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:22
|
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/FourThought/test/XInclude/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/FourThought/test/XInclude/docs Added Files: ft-include1.xml ft-include2.xml ft-include3.xml ft-include4.xml ft-include5.xml ft-include6.xml ft-include7.xml include1.xml include2.xml include3.xml include4.xml Log Message: --- NEW FILE: ft-include1.xml --- <?xml version='1.0'?> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include1.xml"/> </x> --- NEW FILE: include3.xml --- <?xml version = "1.0"?> <ADDRBOOK> <ENTRY ID="pa"> <NAME>Pieter Aaron</NAME> <EMAIL>pie...@in...</EMAIL> </ENTRY> </ADDRBOOK> --- NEW FILE: ft-include6.xml --- <?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include3.xml" xpointer="xpointer(/ADDRBOOK)"/> </x> --- NEW FILE: ft-include4.xml --- <?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include3.xml" xpointer="xpointer(/ADDRBOOK/ENTRY)"/> </x> --- NEW FILE: ft-include5.xml --- <?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include4.xml" xpointer="xpointer(/ADDRBOOK/ENTRY)"/> </x> --- NEW FILE: ft-include3.xml --- <?xml version='1.0'?> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include2.xml" parse='text'/> </x> --- NEW FILE: include4.xml --- <?xml version = "1.0"?> <ADDRBOOK> <ENTRY ID="pa"> <NAME>Pieter Aaron</NAME> <EMAIL>pie...@in...</EMAIL> </ENTRY> <ENTRY ID="en"> <NAME>Emeka Ndubuisi</NAME> <EMAIL>end...@sp...</EMAIL> </ENTRY> <ENTRY ID="vz"> <NAME>Vasia Zhugenev</NAME> <EMAIL>vx...@go...</EMAIL> </ENTRY> </ADDRBOOK> --- NEW FILE: include1.xml --- <?xml version='1.0' encoding='utf-8'?> <foo/> --- NEW FILE: ft-include7.xml --- <?xml version='1.0'?><x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include3.xml" xpointer="xpointer(/ADDRBOOK/ENTRY/NAME)"/> </x> --- NEW FILE: include2.xml --- <?xml version='1.0' encoding='utf-8'?> <foo xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include1.xml"/> </foo> --- NEW FILE: ft-include2.xml --- <?xml version='1.0'?> <x xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="include2.xml"/> </x> |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Harold/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Harold/test Added Files: EBCDIC.xml UCS4BE.xml UCS4LE.xml UTF16BigEndianWithByteOrderMark.xml UTF16LittleEndianWithByteOrderMark.xml UTF32BE.xml UTF32LE.xml UTF8WithByteOrderMark.xml UnicodeBigUnmarked.xml UnicodeLittleUnmarked.xml acceptenglish.xml acceptfrench.xml accepthtml.xml acceptplaintext.xml badaccept1.xml badaccept2.xml badelementschemedata.xml badiri.xml badiri2.xml badparseattribute.xml badxptr.xml badxptr2.xml badxptr3.xml badxptr4.xml baseinclude.xml bdisclaimer.xml c1.xml c2.xml c3.xml c5.xml circle1.xml circle2a.xml circle2b.xml circleback.xml circlepointer1.xml circlepointer2.xml circlepointer3.xml colonizedschemename.xml count.txt d1.xml data.xml disclaimer.xml docwithid.xml docwithidandtumbler.xml emptyfallback.xml encodingheuristicstest.xml extraattributes.xml fallbackbadparseattribute.xml fallbackbadxpointer.xml fallbackcontainsfallback.xml fallbackinternalxpointer.xml fallbacknohreforparse.xml fallbacktest.xml fallbacktest2.xml fallbacktest3.xml fallbacktotext.xml fallbackxpointerpointsnowhere.xml french.xml french2.xml goodiri.xml ignoresfragmentid.xml includedocumentwithintradocumentreferences.xml includefromsamedocumentwithbase.xml internalcircular.xml internalcircularviaancestor.xml langtest1.xml langtest2.xml langtest3.xml laterfailure.xml laterfailure2.xml latin1.xml legalcircle.xml lineends.txt lineends.xml marshtest.xml marshtestwithxmlbase.xml marshtestwithxmlbaseandemptyhref.xml meaninglessfragmentid.xml metafallbacktest.xml metafallbacktest2.xml metafallbacktest3.xml metafallbacktest4.xml metafallbacktest5.xml metafallbacktest6.xml metafallbacktestwithfragmentid.xml metafallbacktestwithxpointer.xml metafallbacktestwithxpointer2.xml metafallbacktotexttest.xml metafallbackwithbadxpointertest.xml metamissingfallbacktestwithxpointer.xml missingfile.xml missinghref.xml multiplefallbacks.xml multiplefallbacks2.xml nakedfallback.xml namespaceinner.xml namespacetest.xml nestedxinclude.xml nestedxincludenamespace.xml nofallbacktest.xml nolang.xml onedown.xml onlyxpointer.xml paralleltest.xml parseequalxml.xml recursewithinsamedocument.xml red.dtd resolvethruxpointer.xml rootfailuretest.xml roottest.xml roottest2.xml simple.xml simple2.xml test.xml test0.xml test2.xml test3.xml tobinbottom.xml tobinmiddle.xml tobintop.xml toplevel.xml ucs4bigendian.xml ucs4littleendian.xml unrecognizedscheme.xml unrecognizedschemewithfallback.xml utf16.txt utf16.xml utf16be.txt utf16be.xml utf16le.xml utf8.xml utf8bom.xml xmlbasetest.xml xmlbasetest2.xml xmlbasetest3.xml xpointeroverridesfragmentid.xml xpointerselectsnonelements.xml xpointerwithpercentescape.xml xptr2tumblertest.xml xptrdoubletumblertest.xml xptrfallback.xml xptridandtumblertest.xml xptridtest.xml xptridtest2.xml xptrsyntaxerrorbutfallback.xml xptrtumblerfailsbutfallback.xml xptrtumblertest.xml xptrtumblertest2.xml xptrtumblertest3.xml Log Message: --- NEW FILE: test0.xml --- <?xml version="1.0"?> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <xinclude:include href="test2.xml"/> </test> --- NEW FILE: nestedxincludenamespace.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml"> It is illegal for one xi:include element to contain anything from the XInclude namespace except a single fallback element. <xi:nonesuch href="`c2.xml"/> </xi:include> </document> --- NEW FILE: metafallbacktotexttest.xml --- <root> <xi:include href="fallbacktest3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: laterfailure.xml --- <?xml version='1.0'?> <root> This tests whether a syntax error in the <strong>second</strong> XPointer part will throw the exception as required. Nothing should be included. Instead, there should be failure. <xi:include href="docwithid.xml" xpointer="element(/1/1)element(^^^)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: test3.xml --- <root> <element1/> <element2/> </root> --- NEW FILE: xptrtumblertest3.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="element(/1/12/3) element(/1/2) element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: circle2a.xml --- <?xml version='1.0'?> <circle> This file is just for making sure my XIncluder can detect circular references. <xi:include href="circle2b.xml" parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </circle> --- NEW FILE: namespaceinner.xml --- <inner> <test2 xmlns:svg="http://www.w3.org/2000/svg"> <svg:svg> The above tag should have a mapped prefix </svg:svg> </test2> <test3 xmlns:xlink="http://www.w3.org/2000/xlink" xlink:type="simple"> Make sure the XLinks come across </test3> </inner> --- NEW FILE: badxptr3.xml --- <?xml version='1.0'?> <root> There should be a syntax error resolving this due to the illegal XPointer syntax <xi:include href="docwithid.xml" xpointer="element(p:l/2/3)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: metafallbacktestwithfragmentid.xml --- <root> <xi:include href="fallbacktest.xml#element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: EBCDIC.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include parse="text" href="text/EBCDIC.xml"/> </document> --- NEW FILE: c3.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>The following is the source of the "data.xml" resource:</p> <example><xi:include href="data.xml" parse="text"/></example> </document> --- NEW FILE: utf8.xml --- trjsagdkasgdhasdgashgdhsadgashdg --- NEW FILE: utf8bom.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: xmlbasetest3.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xml:base attribute in unincluded element still applies in merged document <xi:include href="baseinclude.xml" xpointer="element(/1/1)"/> </root> --- NEW FILE: extraattributes.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml" name="value" something="something"/> </document> --- NEW FILE: UTF16BigEndianWithByteOrderMark.xml --- <?xml version='1.0'?> <root><xi:include href="utf16be.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/></root> --- NEW FILE: metafallbacktest3.xml --- <root> <xi:include href="fallbackbadparseattribute.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: tobinbottom.xml --- <bottom> <bottom1/> <bottom2/> <bottom3/> </bottom> --- NEW FILE: acceptenglish.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="http://www.cafeconleche.org/tests/data.txt" parse="text" accept-language="en"/></root> --- NEW FILE: xptr2tumblertest.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include xpointer="element(/1/12/3)element(/1/2)element(/1/1)" href="docwithid.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: xmlbasetest2.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xml:base attribute is used to resolve href attributes <xi:include href="red.xml" xml:base="basedata/"/> </root> --- NEW FILE: c2.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This document has been accessed <xi:include href="count.txt" parse="text"/> times.</p> </document> --- NEW FILE: fallbacktest2.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="simple.xml"/></xi:fallback></xi:include> </test> --- NEW FILE: laterfailure2.xml --- <?xml version='1.0'?> <root> This tests whether a syntax error in the <strong>second</strong> XPointer part will throw the exception as required. Specifically, I'm looking to see if a missing last parenthesis causes the necessary exception. Nothing should be included. Instead, there should be failure. <xi:include href="docwithid.xml" xpointer="element(/1/1)element(/1/2" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: utf16be.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: unrecognizedschemewithfallback.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml" xpointer="unknown(somedata)"> <xi:fallback>Oops!</xi:fallback> </xi:include> </document> --- NEW FILE: metamissingfallbacktestwithxpointer.xml --- <root> <xi:include href="nofallbacktest.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: UTF32LE.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include parse="text" href="text/UTF32LE.xml"/> </document> --- NEW FILE: xptrsyntaxerrorbutfallback.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="element(///)" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback><p id="p1" xml:base="docwithid.xml">Test worked</p></xi:fallback> </xi:include> </root> --- NEW FILE: fallbackinternalxpointer.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="" xpointer="element(/1/2)"/></xi:fallback></xi:include> <data>test</data> </test> --- NEW FILE: red.dtd --- <!-- Comment in DTD --> --- NEW FILE: marshtestwithxmlbaseandemptyhref.xml --- <!DOCTYPE root [ <!ELEMENT x (#PCDATA)> <!ATTLIST x id ID #IMPLIED> ]> <root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="http://www.example.org/"> <xi:include href="" xpointer="foo"/> <x id="foo"> <xi:include href="" xpointer="bar"/> </x> <x id="bar"/> </root> --- NEW FILE: onlyxpointer.xml --- <?xml version='1.0'?> <root> Test that a document can include a piece of itself using an xpointer attribute. <xi:include xpointer="element(/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude" /> <data> This will be copied </data> </root> --- NEW FILE: circle1.xml --- <?xml version='1.0'?> <circle> <xi:include href="circle1.xml" parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </circle> --- NEW FILE: xmlbasetest.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="basedata/"> Test that xml:base attribute is used to resolve href attributes <xi:include href="red.xml" /> </root> --- NEW FILE: metafallbacktest5.xml --- <root> <xi:include href="fallbackxpointerpointsnowhere.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: circleback.xml --- <?xml version='1.0'?> <document> <xi:include href="legalcircle.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </document> --- NEW FILE: fallbackcontainsfallback.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback> <test>some data</test> <xi:fallback> <test>some data</test> </xi:fallback> </xi:fallback> </xi:include> </test> --- NEW FILE: baseinclude.xml --- <root xml:base="http://www.example.com/"> <child /> </root> --- NEW FILE: fallbacknohreforparse.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include/></xi:fallback></xi:include> </test> --- NEW FILE: lineends.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"><xi:include href="lineends.txt" parse="text"/></root> --- NEW FILE: metafallbacktestwithxpointer.xml --- <root> <xi:include href="fallbacktest.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: nolang.xml --- <document> <test>Zut Alors!</test> </document> --- NEW FILE: roottest2.xml --- <?xml version="1.0"?> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="simple2.xml"/> --- NEW FILE: accepthtml.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="http://www.cafeconleche.org/tests/content" parse="text" accept="text/html"/></root> --- NEW FILE: badaccept1.xml --- <document xmlns:xi='http://www.w3.org/2001/XInclude'> <p>120 MHz is adequate for an average home user.</p> <xi:include href='http://www.example.com' accept='text/html
Something: bad'/> </document> --- NEW FILE: test2.xml --- <?xml version="1.0"?> <!-- comment before root --> <!DOCTYPE red SYSTEM "red.dtd"> <red xmlns:xinclude="http://www.w3.org/2001/XInclude"> <blue> <xinclude:include href="utf8.xml" parse="text"/> </blue> </red> <!-- comment after root --> --- NEW FILE: UTF16LittleEndianWithByteOrderMark.xml --- <?xml version='1.0'?> <root><xi:include href="utf16le.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/></root> --- NEW FILE: metafallbacktest2.xml --- <root> <xi:include href="fallbacktotext.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: fallbackxpointerpointsnowhere.xml --- <?xml version='1.0'?> <test> <xi:include href="disclaimer.xml" xpointer="element(/1/17/82)" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>fallback text</xi:fallback></xi:include> </test> --- NEW FILE: docwithid.xml --- <!DOCTYPE test [ <!ELEMENT p (#PCDATA)> <!ATTLIST p id ID #REQUIRED> ]> <test> <p id="p1">Test worked</p> No, it didn't the Test failed! </test> --- NEW FILE: fallbackbadparseattribute.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="simple.xml" parse="no"/></xi:fallback></xi:include> </test> --- NEW FILE: circlepointer1.xml --- <?xml version="1.0"?> <root> <xi:include href="circlepointer2.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </root> --- NEW FILE: UnicodeLittleUnmarked.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include parse="text" href="text/UnicodeLittleUnmarked.xml"/> </document> --- NEW FILE: onedown.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include/> </document> --- NEW FILE: goodiri.xml --- <document xmlns:xi='http://www.w3.org/2001/XInclude'><xi:include href='scheme://www.example.com/a.html'><xi:fallback>Correct!</xi:fallback></xi:include></document> --- NEW FILE: includefromsamedocumentwithbase.xml --- <?xml version='1.0'?> <test> Make sure base URIs are preserved when including from the same document. <xi:include xpointer="element(/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude"/> <data xml:base="http://www.example.org/">This should be duplicated</data> </test> --- NEW FILE: namespacetest.xml --- <simple> <test2 xmlns:svg="http://www.w3.org/2000/svg"> <svg:svg> The above tag should have a mapped prefix </svg:svg> </test2> <test3 xmlns:xlink="http://www.w3.org/2000/xlink" xlink:type="simple"> Make sure the XLinks come across </test3> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> <xinclude:include href="utf8.xml" parse="text"/> <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <xinclude:include href="namespaceinner.xml"/> </test> </simple> --- NEW FILE: nestedxinclude.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml"> It is illegal for one xi:include element to contain another, even when the resource is avaialable. <xi:include href="c2.xml"/> </xi:include> </document> --- NEW FILE: c5.xml --- <?xml version='1.0'?> <div> <xi:include href="example.txt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback> <xi:include href="fallback-example.txt" parse="text"> <xi:fallback><a href="mailto:bo...@ex...">Report error</a></xi:fallback> </xi:include> </xi:fallback> </xi:include> </div> --- NEW FILE: emptyfallback.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback /></xi:include> </test> --- NEW FILE: utf16.xml --- <?xml version='1.0'?> <test> <xi:include parse="text" encoding="UTF-16" href="utf16.txt" xmlns:xi="http://www.w3.org/2001/XInclude"/> </test> --- NEW FILE: metafallbacktestwithxpointer2.xml --- <root> <xi:include href="fallbacktest3.xml" xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: encodingheuristicstest.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p><xi:include parse="text" href="encoding/ascii.txt"/></p> </document> --- NEW FILE: xptrfallback.xml --- <?xml version='1.0'?> <root> There should be a resource error resolving this due to the illegal XPointer syntax which causes the fallback to be used: <xi:include href="docwithid.xml" xpointer="xlimit(1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback>Fallback worked!</xi:fallback> </xi:include> </root> --- NEW FILE: toplevel.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="onedown.xml"/> </document> --- NEW FILE: badaccept2.xml --- <document xmlns:xi='http://www.w3.org/2001/XInclude'> <p>120 MHz is adequate for an average home user.</p> <xi:include href='http://www.example.com' accept='text/html Something: bad'/> </document> --- NEW FILE: multiplefallbacks2.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml"> Multiple fallbacks are illegal even when the resource exists and the fallbacks aren't processed. <xi:fallback>First fallback</xi:fallback> <xi:fallback>Second fallback</xi:fallback> </xi:include> </document> --- NEW FILE: acceptfrench.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="http://www.cafeconleche.org/tests/data.txt" parse="text" accept-language="fr"/></root> --- NEW FILE: langtest2.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="french2.xml" xpointer="element(/1/1)"/> </document> --- NEW FILE: legalcircle.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This will be duplicated if we're successful</p> <xi:include href="circleback.xml"/> </document> --- NEW FILE: badparseattribute.xml --- <?xml version='1.0'?> <test> This file is just for making sure my XIncluder can detect bad values for parse attributes. <xi:include parse="nonesuch" href="simple.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </test> --- NEW FILE: multiplefallbacks.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="no_such_file.xml"> <xi:fallback>First fallback</xi:fallback> <xi:fallback>Second fallback</xi:fallback> </xi:include> </document> --- NEW FILE: count.txt --- 324387 --- NEW FILE: metafallbacktest.xml --- <root> <xi:include href="fallbacktest.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: resolvethruxpointer.xml --- <?xml version="1.0"?> <root> <xi:include href="c1.xml" xpointer="element(/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </root> --- NEW FILE: simple.xml --- <simple> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> <xinclude:include href="utf8.xml" parse="text"/> <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <xinclude:include href="test2.xml"/> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> --- NEW FILE: circlepointer2.xml --- <?xml version="1.0"?> <root> <xi:include href="circlepointer3.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </root> --- NEW FILE: includedocumentwithintradocumentreferences.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="marshtest.xml"/> </document> --- NEW FILE: UCS4BE.xml --- <?xml version='1.0'?> <root><xi:include href="ucs4bigendian.xml" parse="text" xmlns:xi="http://www.w3.org/2003/XInclude"/></root> --- NEW FILE: simple2.xml --- <!-- comment before root 1 --> <simple> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> <xinclude:include href="utf8.xml" parse="text"/> <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <xinclude:include href="test2.xml"/> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> <!-- comment after root 1 --> --- NEW FILE: badelementschemedata.xml --- <?xml version='1.0'?> <root> This tests whether syntactically incorrect element scheme data simply fails to identify a subresource. <xi:include href="docwithid.xml" xpointer="element(***)" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>success!</xi:fallback> </xi:include> </root> --- NEW FILE: tobintop.xml --- <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <xinclude:include href="tobinmiddle.xml" xpointer="element(/1/1/2)"/> </test> --- NEW FILE: fallbacktotext.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="simple.xml" parse="text"/></xi:fallback></xi:include> </test> --- NEW FILE: ucs4bigendian.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ucs4littleendian.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fallbacktest3.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback>some data<!--comment-->more data</xi:fallback></xi:include> </test> --- NEW FILE: test.xml --- <?xml version="1.0"?> <!-- comment before root --> <!DOCTYPE test [ <!ELEMENT test (latin1, test2)> ]> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> <xinclude:include href="utf8.xml" parse="text"/> <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <xinclude:include href="test2.xml"/> </test2> </test> <!-- comment after root --> --- NEW FILE: rootfailuretest.xml --- <?xml version="1.0"?> <!-- comment before root 1 --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="simple.xml"/> <!-- comment after root 1 --> --- NEW FILE: french.xml --- <test xml:lang='fr'>Zut Alors!</test> --- NEW FILE: fallbacktest.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><test>some data</test></xi:fallback></xi:include> </test> --- NEW FILE: recursewithinsamedocument.xml --- <?xml version='1.0'?> <root> Test that a document can include pieces of itself while recursively following xincludes <xi:include xpointer="element(/1/3)" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" /> <data> This will be copied </data> </root> --- NEW FILE: utf16le.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: circlepointer3.xml --- <?xml version="1.0"?> <root> <xi:include href="circlepointer1.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </root> --- NEW FILE: xptrtumblertest2.xml --- <?xml version='1.0'?> <root> You should see no other elements besides the root because the ID does not exist in the document being pointed to. <xi:include href="docwithid.xml" xpointer="element(/1/3)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: UnicodeBigUnmarked.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include parse="text" href="text/UnicodeBigUnmarked.xml"/> </document> --- NEW FILE: circle2b.xml --- <?xml version='1.0'?> <circle> <xi:include href="circle2a.xml" parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </circle> --- NEW FILE: badxptr2.xml --- <?xml version='1.0'?> <root> There should be a resource error resolving this due to the illegal XPointer syntax. Specifically, the space in initial ID. <xi:include href="docwithid.xml#element(rose red/1/1)" xpointer="element(rose red/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: disclaimer.xml --- <?xml version='1.0'?> <disclaimer> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> --- NEW FILE: ignoresfragmentid.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xpointer is used and fragment ID isn't <xi:include href="test3.xml#element(/1/1)"/> </root> --- NEW FILE: marshtestwithxmlbase.xml --- <!DOCTYPE root [ <!ELEMENT x (#PCDATA)> <!ATTLIST x id ID #IMPLIED> ]> <root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="http://www.example.org/"> <xi:include xpointer="foo"/> <x id="foo"> <xi:include xpointer="bar"/> </x> <x id="bar"/> </root> --- NEW FILE: badxptr4.xml --- <?xml version='1.0'?> <root> There should be a syntax error resolving this due to the illegal XPointer syntax <xi:include href="docwithid.xml" xpointer="element(p^l/2/3)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: xptrtumblerfailsbutfallback.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="element(/1/12/3)" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:fallback><p id="p1" xml:base="docwithid.xml">Test worked</p></xi:fallback> </xi:include> </root> --- NEW FILE: c1.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml"/> </document> --- NEW FILE: badiri.xml --- <document xmlns:xi='http://www.w3.org/2001/XInclude'> <xi:include href='http://www.example.com/a%5.html'> <xi:fallback>Ooops!</xi:fallback></xi:include></document> --- NEW FILE: xptridtest.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="p1" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: metafallbacktest6.xml --- <root> <xi:include href="fallbackinternalxpointer.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: xpointerselectsnonelements.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml"/> </document> --- NEW FILE: badxptr.xml --- <?xml version='1.0'?> <root> There should be a resource error resolving this due to the illegal XPointer syntax <xi:include href="docwithid.xml" xpointer="/1/1" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: parseequalxml.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml" parse="xml"/> </document> --- NEW FILE: fallbackbadxpointer.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"><xi:fallback><xi:include href="disclaimer.xml" xpointer="badscheme(/1/1)"/></xi:fallback></xi:include> </test> --- NEW FILE: internalcircularviaancestor.xml --- <?xml version='1.0'?> <test> This file is just for making sure my XIncluder can detect circular local links. <xi:include xpointer="element(/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </test> --- NEW FILE: missingfile.xml --- <?xml version='1.0'?> <test> This file is just for making sure my XIncluder can detect missing links. <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </test> --- NEW FILE: UTF8WithByteOrderMark.xml --- <?xml version='1.0'?> <root><xi:include href="utf8bom.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"/></root> --- NEW FILE: internalcircular.xml --- <?xml version='1.0'?> <test> This file is just for making sure my XIncluder can detect circular local links. <xi:include xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </test> --- NEW FILE: metafallbacktest4.xml --- <root> <xi:include href="fallbacknohreforparse.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: nakedfallback.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:fallback>It is illegal to have a fallback that is not a child of an include element.</xi:fallback> </document> --- NEW FILE: acceptplaintext.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="http://www.cafeconleche.org/tests/content" parse="text" accept="text/plain"/></root> --- NEW FILE: docwithidandtumbler.xml --- <!DOCTYPE test [ <!ELEMENT p (#PCDATA)> <!ATTLIST p id ID #REQUIRED> ]> <test> <p id="p1"> <t> <p/> <q>If you only see the q element the test worked</q> <r>bad!</r> </t> <r/> <u>If you see me, the test failed</u> </p> </test> --- NEW FILE: colonizedschemename.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="test:xpath(somedata)element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: UCS4LE.xml --- <?xml version='1.0'?> <root><xi:include href="ucs4littleendian.xml" parse="text" xmlns:xi="http://www.w3.org/2003/XInclude"/></root> --- NEW FILE: missinghref.xml --- <?xml version='1.0'?> <test> This file is just for making sure my XIncluder can detect missing href attributes. <xi:include parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </test> --- NEW FILE: xptrdoubletumblertest.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="element(book/1)element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: paralleltest.xml --- <root xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="a/a.xml"/> <xi:include href="b/b.xml"/> </root> --- NEW FILE: roottest.xml --- <?xml version="1.0"?> <!-- comment before root 1 --> <xinclude:include xmlns:xinclude="http://www.w3.org/2001/XInclude" href="simple.xml"/> <!-- comment after root 1 --> --- NEW FILE: french2.xml --- <document xml:lang='fr'> <test>Zut Alors!</test> </document> --- NEW FILE: tobinmiddle.xml --- <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <xinclude:include href="tobinbottom.xml"/> </test> --- NEW FILE: xptridandtumblertest.xml --- <?xml version='1.0'?> <root> You should see a q element: <xi:include href="docwithidandtumbler.xml" xpointer="element(p1/1/2)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: xptrtumblertest.xml --- <?xml version='1.0'?> <root> You should see a p element: <xi:include href="docwithid.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: unrecognizedscheme.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="disclaimer.xml" xpointer="unknown(somedata)"/> </document> --- NEW FILE: nofallbacktest.xml --- <?xml version='1.0'?> <test> <xi:include href="missing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </test> --- NEW FILE: xptridtest2.xml --- <?xml version='1.0'?> <root> You should see no other elements besides the root because the ID does not exist in the document being pointed to. <xi:include href="docwithid.xml" xpointer="nonesuch" xmlns:xi="http://www.w3.org/2001/XInclude" /> </root> --- NEW FILE: UTF32BE.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include parse="text" href="text/UTF32BE.xml"/> </document> --- NEW FILE: utf16.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: xpointerwithpercentescape.xml --- <?xml version="1.0"?> <root> <xi:include href="c1.xml" xpointer="element(/1/%32)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </root> --- NEW FILE: bdisclaimer.xml --- <?xml version='1.0'?> <disclaimer> <b><p>The opinions represented herein represent those of the individual and should not be interpreted <b/>as official policy endorsed by this organization.</p></b> </disclaimer> --- NEW FILE: d1.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="bdisclaimer.xml"/> </document> --- NEW FILE: langtest3.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="nolang.xml" xpointer="element(/1/1)"/> </document> --- NEW FILE: latin1.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: utf16be.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: lineends.txt --- linefeed CRLF carriage return --- NEW FILE: xpointeroverridesfragmentid.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xpointer is used and fragment ID isn't <xi:include href="test3.xml#element(/1/1)" xpointer="element(/1/2)"/> </root> --- NEW FILE: langtest1.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en"> <p>120 Mz is adequate for an average home user.</p> <xi:include href="french.xml"/> </document> --- NEW FILE: data.xml --- <?xml version='1.0'?> <data> <item><![CDATA[Brooks & Shields]]></item> </data> --- NEW FILE: meaninglessfragmentid.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xpointer is used and fragment ID isn't <xi:include href="test3.xml#nonesuch(/1/name*)"/> </root> --- NEW FILE: badiri2.xml --- <doc xmlns:xi='http://www.w3.org/2001/XInclude'> <xi:include href='scheme://www.example.com/a%5.html'> <xi:fallback>Ooops!</xi:fallback></xi:include></doc> --- NEW FILE: metafallbackwithbadxpointertest.xml --- <root> <xi:include href="fallbackbadxpointer.xml" xpointer="element(/1/1)" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include> </root> --- NEW FILE: marshtest.xml --- <!DOCTYPE root [ <!ELEMENT x (#PCDATA)> <!ATTLIST x id ID #IMPLIED> ]> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include xpointer="foo"/> <x id="foo"> <xi:include xpointer="bar"/> </x> <x id="bar"/> </root> |
Update of /cvsroot/mvp-xml/XInclude/v2/test/XInclude-Test-Suite/Harold/result In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/test/XInclude-Test-Suite/Harold/result Added Files: EBCDIC.xml UTF16BigEndianWithByteOrderMark.xml UTF16LittleEndianWithByteOrderMark.xml UTF32BE.xml UTF32LE.xml UTF8WithByteOrderMark.xml UnicodeBigUnmarked.xml UnicodeLittleUnmarked.xml acceptascii.xml acceptenglish.xml acceptfrench.xml accepthtml.xml acceptjis.xml acceptplaintext.xml badelementschemedata.xml c1.xml c1a.xml c1b.xml c2.xml c2a.xml c2b.xml c2c.xml c2d.xml c3.xml c5.xml d1.xml disclaimer.xml emptyfallback.xml encodingheuristicstest.xml fallbacktest.xml fallbacktest2.xml goodiri.xml ignoresfragmentid.xml includedocumentwithintradocumentreferences.xml includefromsamedocumentwithbase.xml langtest1.xml langtest2.xml langtest3.xml latin1.xml legalcircle.xml lineends.xml marshtest.xml marshtestwithxmlbase.xml metafallbacktest.xml metafallbacktest2.xml metafallbacktest5.xml metafallbacktest6.xml metafallbacktestwithxpointer.xml metafallbacktestwithxpointer2.xml metafallbacktotexttest.xml namespacetest.xml onlyxpointer.xml paralleltest.xml recursewithinsamedocument.xml resolvethruxpointer.xml roottest.xml roottest2.xml simple.xml test.xml tobintop.xml triple.xml unrecognizedschemewithfallback.xml utf16.txt utf16.xml xmlbasetest.xml xmlbasetest2.xml xmlbasetest3.xml xpointeroverridesfragmentid.xml xptrdandtumblertest.xml xptrfallback.xml xptridandtumblertest.xml xptridtest.xml xptridtest2.xml xptrtumblertest.xml Log Message: --- NEW FILE: metafallbacktest6.xml --- <root> <data xml:base="fallbackinternalxpointer.xml">test</data> </root> --- NEW FILE: encodingheuristicstest.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This is working</p> </document> --- NEW FILE: metafallbacktotexttest.xml --- <root> <test xml:base="fallbacktest3.xml"> some data<!--comment-->more data </test> </root> --- NEW FILE: UTF8WithByteOrderMark.xml --- <?xml version='1.0'?> <root><t>0123456789</t></root> --- NEW FILE: triple.xml --- <?xml version="1.0" encoding="UTF-8"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <disclaimer xml:base="disclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p><p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p><p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> </document> --- NEW FILE: langtest3.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en"> <p>120 Mz is adequate for an average home user.</p> <test xml:lang='' xml:base="nolang.xml">Zut Alors!</test> </document> --- NEW FILE: xptrfallback.xml --- <?xml version="1.0"?> <root> There should be a resource error resolving this due to the illegal XPointer syntax which causes the fallback to be used: Fallback worked! </root> --- NEW FILE: onlyxpointer.xml --- <?xml version='1.0'?> <root> Test that a document can include a piece of itself using an xpointer attribute. <data> This will be copied </data> <data> This will be copied </data> </root> --- NEW FILE: c1a.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <c xml:base="disclaimer.xml"> <c>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</c> </c> </document> --- NEW FILE: metafallbacktest5.xml --- <root> fallback text </root> --- NEW FILE: acceptenglish.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> data </root> --- NEW FILE: acceptfrench.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> donnees </root> --- NEW FILE: langtest2.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en"> <p>120 Mz is adequate for an average home user.</p> <test xml:lang='fr' xml:base="french2.xml">Zut Alors!</test> </document> --- NEW FILE: c3.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>The following is the source of the "data.xml" resource:</p> <example><?xml version='1.0'?> <data> <item><![CDATA[Brooks & Shields]]></item> </data></example> </document> --- NEW FILE: legalcircle.xml --- <?xml version="1.0" encoding="UTF-8"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This will be duplicated if we're successful</p> <document xml:base="circleback.xml"> <p xml:base="legalcircle.xml">This will be duplicated if we're successful</p> </document> </document> --- NEW FILE: lineends.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude">linefeed CRLF carriage return </root> --- NEW FILE: metafallbacktestwithxpointer.xml --- <?xml version="1.0"?> <root> <test xml:base="fallbacktest.xml">some data</test> </root> --- NEW FILE: c2a.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This document has been accessed times.</p> </document> --- NEW FILE: acceptplaintext.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> plain text </root> --- NEW FILE: metafallbacktest.xml --- <?xml version="1.0"?> <root> <test xml:base="fallbacktest.xml"> <test>some data</test> </test> </root> --- NEW FILE: roottest2.xml --- <?xml version="1.0"?> <!-- comment before root 1 --> <simple xml:base="simple2.xml"> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> trjsagdkasgdhasdgashgdhsadgashdg <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <!-- comment before root --><red xml:base="test2.xml" xmlns:xinclude="http://www.w3.org/2001/XInclude"> <blue> trjsagdkasgdhasdgashgdhsadgashdg </blue> </red><!-- comment after root --> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> <!-- comment after root 1 --> --- NEW FILE: c2d.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This document has been accessed <empty1/><empty2/> times.</p> </document> --- NEW FILE: UTF16BigEndianWithByteOrderMark.xml --- <?xml version='1.0'?> <root><t>0123456789</t></root> --- NEW FILE: disclaimer.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <disclaimer xml:base="disclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> </document> --- NEW FILE: xmlbasetest3.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xml:base attribute in unincluded element still applies in merged document <child xml:base="http://www.example.com/"/> </root> --- NEW FILE: paralleltest.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <p xml:base="a/a.xml">This is from file a.xml in directory a</p> <p xml:base="b/b.xml">This is from file B in directory b</p> </root> --- NEW FILE: simple.xml --- <?xml version="1.0"?> <simple> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> trjsagdkasgdhasdgashgdhsadgashdg <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <!-- comment before root --><red xml:base="test2.xml" xmlns:xinclude="http://www.w3.org/2001/XInclude"> <blue> trjsagdkasgdhasdgashgdhsadgashdg </blue> </red><!-- comment after root --> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> --- NEW FILE: accepthtml.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <![CDATA[<html><body>content</body></html>]]> </root> --- NEW FILE: c1b.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <disclaimer xml:base="disclaimer.xml" /> </document> --- NEW FILE: EBCDIC.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <?xml version="1.0" encoding="Cp037"?> <p>data</p> </document> --- NEW FILE: includedocumentwithintradocumentreferences.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="marshtest.xml"> <x id="foo"> <x id="bar"/> </x> <x id="foo"> <x id="bar"/> </x> <x id="bar"/> </root> </document> --- NEW FILE: acceptascii.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> euc </root> --- NEW FILE: roottest.xml --- <?xml version="1.0"?> <!-- comment before root 1 --> <simple xml:base="simple.xml"> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> trjsagdkasgdhasdgashgdhsadgashdg <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <!-- comment before root --><red xml:base="test2.xml" xmlns:xinclude="http://www.w3.org/2001/XInclude"> <blue> trjsagdkasgdhasdgashgdhsadgashdg </blue> </red><!-- comment after root --> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> <!-- comment after root 1 --> --- NEW FILE: xptridandtumblertest.xml --- <?xml version="1.0"?> <root> You should see a q element: <q xml:base="docwithidandtumbler.xml">If you only see the q element the test worked</q> </root> --- NEW FILE: xptrtumblertest.xml --- <?xml version="1.0"?> <root> You should see a p element: <p id="p1" xml:base="docwithid.xml">Test worked</p> </root> --- NEW FILE: tobintop.xml --- <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <bottom2 xml:base="tobinbottom.xml"/> </test> --- NEW FILE: xptridtest2.xml --- <?xml version="1.0"?> <root> You should see no other elements besides the root because the ID does not exist in the document being pointed to. </root> --- NEW FILE: metafallbacktest2.xml --- <root> <test xml:base="fallbacktotext.xml"> <![CDATA[<simple> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> <xinclude:include href="utf8.xml" parse="text"/> <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <xinclude:include href="test2.xml"/> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> ]]> </test> </root> --- NEW FILE: goodiri.xml --- <document xmlns:xi="http://www.w3.org/2001/XInclude">Correct!</document> --- NEW FILE: test.xml --- <?xml version="1.0"?> <!-- comment before root --> <!DOCTYPE test [ <!ELEMENT test (latin1 , test2)> ]> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> trjsagdkasgdhasdgashgdhsadgashdg <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <!-- comment before root --><red xml:base="test2.xml"> <blue> trjsagdkasgdhasdgashgdhsadgashdg </blue> </red><!-- comment after root --> </test2> </test> <!-- comment after root --> --- NEW FILE: xmlbasetest2.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xml:base attribute is used to resolve href attributes <red xml:base="basedata/red.xml"> test data </red> </root> --- NEW FILE: c2.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This document has been accessed 324387 times.</p> </document> --- NEW FILE: UTF32LE.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <?xml version="1.0"?> <p>data</p> </document> --- NEW FILE: UTF32BE.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2003/XInclude"> <?xml version="1.0"?> <p>data</p> </document> --- NEW FILE: fallbacktest2.xml --- <?xml version="1.0"?> <test> <simple xml:base="simple.xml"> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> trjsagdkasgdhasdgashgdhsadgashdg <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <test2> <!-- comment before root --><red xml:base="test2.xml" xmlns:xinclude="http://www.w3.org/2001/XInclude"> <blue> trjsagdkasgdhasdgashgdhsadgashdg </blue> </red><!-- comment after root --> </test2> <test3> <!-- <xinclude:include href="roottest.xml"/> --> </test3> </test> </simple> </test> --- NEW FILE: utf16.txt --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fallbacktest.xml --- <?xml version='1.0'?> <test> <test>some data</test> </test> --- NEW FILE: UnicodeLittleUnmarked.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <?xml version="1.0"?> <p>data</p> </document> --- NEW FILE: d1.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <disclaimer xml:base="bdisclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> </document> --- NEW FILE: recursewithinsamedocument.xml --- <?xml version='1.0'?> <root> Test that a document can include pieces of itself while recursively following xincludes <data> This will be copied </data> <data> This will be copied </data> <data> This will be copied </data> </root> --- NEW FILE: latin1.xml --- (This appears to be a binary file; contents omitted.) --- NEW FILE: resolvethruxpointer.xml --- <?xml version="1.0"?> <root> <disclaimer xml:base="disclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> </root> --- NEW FILE: marshtestwithxmlbase.xml --- <!DOCTYPE root [ <!ATTLIST x id ID #IMPLIED> ]> <root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="http://www.example.org/"> <x id="foo"> <x id="bar"/> </x> <x id="foo"> <x id="bar"/> </x> <x id="bar"/> </root> --- NEW FILE: UnicodeBigUnmarked.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <?xml version="1.0"?> <p>data</p> </document> --- NEW FILE: xptrdandtumblertest.xml --- <?xml version="1.0"?> <!DOCTYPE root> <root> You should see a p element: <q>If you only see the q element the test worked</q> </root> --- NEW FILE: unrecognizedschemewithfallback.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> Oops! </document> --- NEW FILE: xpointeroverridesfragmentid.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xpointer is used and fragment ID isn't <element2 xml:base="test3.xml"/> </root> --- NEW FILE: includefromsamedocumentwithbase.xml --- <?xml version='1.0'?> <test> Make sure base URIs are preserved when including from the same document. <data xml:base="http://www.example.org/">This should be duplicated</data> <data xml:base="http://www.example.org/">This should be duplicated</data> </test> --- NEW FILE: namespacetest.xml --- <?xml version="1.0"?> <simple> <test2 xmlns:svg="http://www.w3.org/2000/svg"> <svg:svg> The above tag should have a mapped prefix </svg:svg> </test2> <test3 xmlns:xlink="http://www.w3.org/2000/xlink" xlink:type="simple"> Make sure the XLinks come across </test3> <test xmlns:xinclude="http://www.w3.org/2001/XInclude"> <latin1> <firstElement/> trjsagdkasgdhasdgashgdhsadgashdg <insideChildren/> <another> <deeper>text</deeper> </another> </latin1> <inner xml:base="namespaceinner.xml"> <test2 xmlns:svg="http://www.w3.org/2000/svg"> <svg:svg> The above tag should have a mapped prefix </svg:svg> </test2> <test3 xmlns:xlink="http://www.w3.org/2000/xlink" xlink:type="simple"> Make sure the XLinks come across </test3> </inner> </test> </simple> --- NEW FILE: ignoresfragmentid.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> Test that xpointer is used and fragment ID isn't <root xml:base="test3.xml"> <element1/> <element2/> </root> </root> --- NEW FILE: c5.xml --- <?xml version='1.0'?> <div> <a href="mailto:bo...@ex...">Report error</a> </div> --- NEW FILE: langtest1.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude" xml:lang="en"> <p>120 Mz is adequate for an average home user.</p> <test xml:lang='fr' xml:base="french.xml">Zut Alors!</test> </document> --- NEW FILE: xptridtest.xml --- <?xml version="1.0"?> <root> You should see a p element: <p id="p1" xml:base="docwithid.xml">Test worked</p> </root> --- NEW FILE: acceptjis.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude"> jis </root> --- NEW FILE: metafallbacktestwithxpointer2.xml --- <root> <test xml:base="fallbacktest3.xml"> some data<!--comment-->more data </test> </root> --- NEW FILE: UTF16LittleEndianWithByteOrderMark.xml --- <?xml version='1.0'?> <root><t>0123456789</t></root> --- NEW FILE: marshtest.xml --- <!DOCTYPE root [ <!ATTLIST x id ID #IMPLIED>]> <root xmlns:xi="http://www.w3.org/2001/XInclude"> <x id="foo"> <x id="bar"/> </x> <x id="foo"> <x id="bar"/> </x> <x id="bar"/> </root> --- NEW FILE: xmlbasetest.xml --- <?xml version="1.0"?> <root xmlns:xi="http://www.w3.org/2001/XInclude" xml:base="basedata/"> Test that xml:base attribute is used to resolve href attributes <red xml:base="red.xml"> test data </red> </root> --- NEW FILE: c1.xml --- <?xml version="1.0"?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>120 Mz is adequate for an average home user.</p> <disclaimer xml:base="disclaimer.xml"> <p>The opinions represented herein represent those of the individual and should not be interpreted as official policy endorsed by this organization.</p> </disclaimer> </document> --- NEW FILE: emptyfallback.xml --- <?xml version='1.0'?> <test> </test> --- NEW FILE: c2b.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p>This document has been accessed <!--324387--> times.</p> </document> --- NEW FILE: badelementschemedata.xml --- <?xml version='1.0'?> <root> This tests whether syntactically incorrect element scheme data simply fails to identify a subresource. success! </root> --- NEW FILE: c2c.xml --- <?xml version='1.0'?> <document xmlns:xi="http://www.w3.org/2001/XInclude"> <p name="324387">This document has been accessed times.</p> </document> --- NEW FILE: utf16.xml --- <?xml version='1.0'?> <test> some UTF-16 data </test> |
|
From: Oleg T. <he...@us...> - 2005-10-28 22:29:12
|
Update of /cvsroot/mvp-xml/XInclude/v2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20225/v2/src Added Files: .cvsignore AssemblyInfo.cs SR.cs SR.resx TextIncludingReader.cs TextUtils.cs XInclude.csproj XIncludeException.cs XIncludeKeywords.cs XIncludingReader.cs XIncludingReaderState.cs Log Message: --- NEW FILE: .cvsignore --- bin obj *.user *.suo --- NEW FILE: XIncludeException.cs --- #region using using System; #endregion namespace Mvp.Xml.XInclude { /// <summary> /// Generic XInclude exception. /// </summary> public abstract class XIncludeException : Exception { /// <summary> /// Initializes a new instance of the <see cref="XIncludeException"/> /// class with a specified error message. /// </summary> /// <param name="message">Error message</param> public XIncludeException(string message) : base(message) {} /// <summary> /// Initializes a new instance of the <see cref="XIncludeException"/> /// class with a specified error message and a reference to the /// inner exception that is the cause of this exception. /// </summary> /// <param name="message">Error message</param> /// <param name="innerException">Inner exceptiion</param> public XIncludeException(string message, Exception innerException) : base(message, innerException) {} } /// <summary> /// <c>ResourceException</c> represents resource error as per XInclude specification. /// </summary> /// <remarks> /// Resource error is internal error and should lead to the fallback processing. /// <c>ResourceException</c> therefore should never be thrown outside /// the XInclude Processor. /// </remarks> internal class ResourceException : XIncludeException { /// <summary> /// Initializes a new instance of the <see cref="ResourceException"/> /// class with a specified error message. /// </summary> /// <param name="message">Error message</param> public ResourceException(string message) : base(message) {} /// <summary> /// Initializes a new instance of the <see cref="ResourceException"/> /// class with a specified error message and a reference to the /// inner exception that is the cause of this exception. /// </summary> /// <param name="message">Error message</param> /// <param name="innerException">Inner exceptiion</param> public ResourceException(string message, Exception innerException) : base(message, innerException) {} } /// <summary> /// <c>FatalException</c> represents fatal error as per XInclude spcification. /// </summary> public abstract class FatalException : XIncludeException { /// <summary> /// Initializes a new instance of the <see cref="FatalException"/> /// class with a specified error message. /// </summary> /// <param name="message">Error message</param> public FatalException(string message) : base(message) {} /// <summary> /// Initializes a new instance of the <see cref="FatalException"/> /// class with a specified error message and a reference to the /// inner exception that is the cause of this exception. /// </summary> /// <param name="message">Error message</param> /// <param name="innerException">Inner exceptiion</param> public FatalException(string message, Exception innerException) : base(message, innerException) {} } /// <summary> /// Non XML character in a document to include exception. /// </summary> public class NonXmlCharacterException : FatalException { /// <summary> /// Initializes a new instance of the <see cref="NonXmlCharacterException"/> /// class with a specified invalid character. /// </summary> /// <param name="c">Invalid character</param> public NonXmlCharacterException(char c) : base(SR.GetString("NonXmlCharacter", ((int)c).ToString("X2"))) {} } /// <summary> /// Circular inclusion exception. /// </summary> public class CircularInclusionException : FatalException { /// <summary> /// Initializes a new instance of the <see cref="CircularInclusionException"/> /// class with a specified Uri that causes inclusion loop. /// </summary> /// <param name="uri">Uri that causes inclusion loop</param> public CircularInclusionException(Uri uri) : base(SR.GetString("CircularInclusion", uri.AbsoluteUri)) {} /// <summary> /// Initializes a new instance of the <see cref="CircularInclusionException"/> /// class with a specified Uri that causes inclusion loop and error location within /// XML document. /// </summary> /// <param name="uri">Uri that causes inclusion loop</param> /// <param name="line">Line number</param> /// <param name="locationUri">Location Uri</param> /// <param name="position">Column number</param> public CircularInclusionException(Uri uri, string locationUri, int line, int position) : base(SR.GetString("CircularInclusionLong", uri.AbsoluteUri, locationUri, line, position)) {} } /// <summary> /// Resource error not backed up by xi:fallback exception. /// </summary> public class FatalResourceException : FatalException { /// <summary> /// Initializes a new instance of the <see cref="FatalResourceException"/> /// class with the specified inner exception that is the cause of this exception. /// </summary> /// <param name="re">Inner exceptiion</param> public FatalResourceException(Exception re) : base(SR.GetString("FatalResourceException", re.Message), re) {} } /// <summary> /// XInclude syntax error exception. /// </summary> public class XIncludeSyntaxError : FatalException { /// <summary> /// Initializes a new instance of the <see cref="XIncludeSyntaxError"/> /// class with a specified error message. /// </summary> /// <param name="message">Error message</param> public XIncludeSyntaxError(string message) : base(message) {} } /// <summary> /// Include location identifies an attribute or namespace node. /// </summary> public class AttributeOrNamespaceInIncludeLocationError : FatalException { /// <summary> /// Initializes a new instance of the <see cref="AttributeOrNamespaceInIncludeLocationError"/> /// class with a specified error message. /// </summary> /// <param name="message">Error message</param> public AttributeOrNamespaceInIncludeLocationError(string message) : base(message) {} } /// <summary> /// Not wellformed inclusion result (e.g. top-level xi:include /// includes multiple elements). /// </summary> public class MalformedXInclusionResultError : FatalException { /// <summary> /// Initializes a new instance of the <see cref="MalformedXInclusionResultError"/> /// class with a specified error message. /// </summary> /// <param name="message">Error message</param> public MalformedXInclusionResultError(string message) : base(message) {} } /// <summary> /// Value of the "accept" attribute contains an invalid for /// HTTP header character (outside #x20 through #x7E range). /// </summary> public class InvalidAcceptHTTPHeaderValueError : FatalException { /// <summary> /// Initializes a new instance of the <see cref="InvalidAcceptHTTPHeaderValueError"/> /// class with a specified invalid character. /// </summary> /// <param name="c">Invalid character</param> public InvalidAcceptHTTPHeaderValueError(char c) : base(SR.GetString("InvalidCharForAccept", ((int)c).ToString("X2"))) {} } } --- NEW FILE: XInclude.csproj --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XIncludingReader.cs --- #region using using System; using System.Xml; using System.Xml.Schema; using System.Xml.XPath; using System.IO; using System.Net; using System.Text; using System.Security; using System.Collections.Generic; using System.Reflection; using Mvp.Xml.Common; using Mvp.Xml.Common.XPath; using Mvp.Xml.XPointer; #endregion [...1487 lines suppressed...] /// <summary> /// Checks for inclusion loops. /// </summary> private void CheckLoops(Uri url, string xpointer) { //Check circular inclusion Uri baseUri = _reader.BaseURI==""? _topBaseUri : new Uri(_reader.BaseURI); if (baseUri.Equals(url)) ThrowCircularInclusionError(_reader, url); foreach (XmlReader r in _readers) { baseUri = r.BaseURI==""? _topBaseUri : new Uri(r.BaseURI); if (baseUri.Equals(url)) ThrowCircularInclusionError(_reader, url); } } #endregion } } --- NEW FILE: SR.resx --- <?xml version="1.0" encoding="utf-8"?> <root> <!-- Microsoft ResX Schema Version 2.0 The primary goals of this format is to allow a simple XML format that is mostly human readable. The generation and parsing of the various data types are done through the TypeConverter classes associated with the data types. Example: ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> <value>[base64 mime encoded serialized .NET Framework object]</value> </data> <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> There are any number of "resheader" rows that contain simple name/value pairs. Each data row contains a name, and value. The row also contains a type or mimetype. Type corresponds to a .NET class that support text/value conversion through the TypeConverter architecture. Classes that don't support this are serialized and stored with the mimetype set. The mimetype is used for serialized objects, and tells the ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: Note - application/x-microsoft.net.object.binary.base64 is the format that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> <xsd:attribute ref="xml:space" /> </xsd:complexType> </xsd:element> <xsd:element name="assembly"> <xsd:complexType> <xsd:attribute name="alias" type="xsd:string" /> <xsd:attribute name="name" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="resmimetype"> <value>text/microsoft-resx</value> </resheader> <resheader name="version"> <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="NotSupportedEncoding" type="System.String" mimetype="System.String"> <value>Not supported encoding '{0}'.</value> </data> <data name="OutOfMemoryWhileFetchingResource" type="System.String" mimetype="System.String"> <value>Out of memory error while reading resource '{0}'.</value> </data> <data name="IOErrorWhileFetchingResource" type="System.String" mimetype="System.String"> <value>I/O error while reading resource '{0}'.</value> </data> <data name="UnknownParseAttrValue" type="System.String" mimetype="System.String"> <value>Unknown 'parse' attribute value: '{0}'.</value> </data> <data name="UnknownParseAttrValueLong" type="System.String" mimetype="System.String"> <value>Unknown 'parse' attribute value: '{0}'. In {1}, Line {2}, Position {3}.</value> </data> <data name="NonXmlCharacter" type="System.String" mimetype="System.String"> <value>Included document contains a character not allowed in XML: 0x{0}.</value> </data> <data name="CircularInclusion" type="System.String" mimetype="System.String"> <value>Circular inclusion has been detected, inclusion location: {0}.</value> </data> <data name="CircularInclusionLong" type="System.String" mimetype="System.String"> <value>Circular inclusion has been detected, inclusion location: {0}. In {1}, Line {2}, Position {3}.</value> </data> <data name="FatalResourceException" type="System.String" mimetype="System.String"> <value>Resource error has occured and no fallback has been provided: {0}.</value> </data> <data name="AttributeOrNamespaceInIncludeLocationError" type="System.String" mimetype="System.String"> <value>Include location identifies an attribute or namespace node!</value> </data> <data name="FallbackNotChildOfInclude" type="System.String" mimetype="System.String"> <value>xi:fallback element must be direct child of xi:include element. Location: {0}.</value> </data> <data name="FallbackNotChildOfIncludeLong" type="System.String" mimetype="System.String"> <value>xi:fallback element must be direct child of xi:include element. Location: {0}, Line {1}, Position {2}.</value> </data> <data name="URISchemaNotSupported" type="System.String" mimetype="System.String"> <value>URI schema is not supported: '{0}'.</value> </data> <data name="SecurityException" type="System.String" mimetype="System.String"> <value>Security exception while fetching '{0}'.</value> </data> <data name="ResourceError" type="System.String" mimetype="System.String"> <value>Resource '{0}' cannot be fetched.</value> </data> <data name="MissingHrefAndXpointerException" type="System.String" mimetype="System.String"> <value>'href' or 'xpointer' attributes can't both be omitted on xi:include element. Location: {0}."</value> </data> <data name="MissingHrefAndXpointerExceptionLong" type="System.String" mimetype="System.String"> <value>'href' or 'xpointer' attributes can't both be omitted on xi:include element. Location: {0}, Line {1}, Position {2}.</value> </data> <data name="IntradocumentReferencesNotSupported" type="System.String" mimetype="System.String"> <value>XIncludingReader doesn't support intra-document references.</value> </data> <data name="CustomXmlResolverError" type="System.String" mimetype="System.String"> <value>An exception has occured during GetEntity call to custom XmlResolver.</value> </data> <data name="CustomXmlResolverReturnedNull" type="System.String" mimetype="System.String"> <value>Custom XmlResolver returned null.</value> </data> <data name="CustomXmlResolverReturnedUnsupportedType" type="System.String" mimetype="System.String"> <value>Custom XmlResolver returned object of an unsupported type '{0}'.</value> </data> <data name="InvalidURI" type="System.String" mimetype="System.String"> <value>Invalid URI '{0}'.</value> </data> <data name="UnresolvableURI" type="System.String" mimetype="System.String"> <value>Unable to resolve URI reference '{0}'.</value> </data> <data name="IncludeChildOfInclude" type="System.String" mimetype="System.String"> <value>xi:include element cannot be child of xi:include element. Location: {0}.</value> </data> <data name="IncludeChildOfIncludeLong" type="System.String" mimetype="System.String"> <value>xi:include element cannot be child of xi:include element. Location: {0}, Line {1}, Position {2}.</value> </data> <data name="TwoFallbacks" type="System.String" mimetype="System.String"> <value>xi:include element cannot contain more than one xi:fallback element. Location: {0}.</value> </data> <data name="TwoFallbacksLong" type="System.String" mimetype="System.String"> <value>xi:include element cannot contain more than one xi:fallback element. Location: {0}, Line {1}, Position {2}.</value> </data> <data name="MalformedXInclusionResult" type="System.String" mimetype="System.String"> <value>Malformed XInclusion result - xi:include element at the top level must include a single element and optional comments and PIs.</value> </data> <data name="InvalidCharForAccept" type="System.String" mimetype="System.String"> <value>'accept' attribute contains a character not allowed in HTTP header: 0x{0}.</value> </data> <data name="FragmentIDInHref" type="System.String" mimetype="System.String"> <value>Fragment identifiers must not be used in 'href' attribute.</value> </data> <data name="UnknownXIncludeElement" type="System.String" mimetype="System.String"> <value>Unknown element in the XInclude namespace has been detected: {0}.</value> </data> </root> --- NEW FILE: TextIncludingReader.cs --- #region using using System; using System.Xml; using System.IO; using System.Net; using System.Text; using System.Security; #endregion namespace Mvp.Xml.XInclude { /// <summary> /// Custom <c>XmlReader</c>, handler for parse="text" case. /// </summary> /// <author>Oleg Tkachenko, ol...@tk...</author> /// <remarks> /// Allows to read specified resource as a text node. /// </remarks> internal class TextIncludingReader : XmlReader { #region private fields private string _encoding; private ReadState _state; private string _value; private Uri _includeLocation; private string _accept, _acceptLanguage; private string _href; private bool _exposeCDATA; #endregion #region constructors public TextIncludingReader(Uri includeLocation, string encoding, string accept, string acceptLanguage, bool exposeCDATA) { _includeLocation = includeLocation; _href = includeLocation.AbsoluteUri; _encoding = encoding; _state = ReadState.Initial; _accept = accept; _acceptLanguage = acceptLanguage; _exposeCDATA = exposeCDATA; } public TextIncludingReader(string value, bool exposeCDATA) { _state = ReadState.Initial; _exposeCDATA = exposeCDATA; _value = value; } #endregion #region XmlReader overrides public override int AttributeCount { get { return 0; } } public override string BaseURI { get { return _href; } } public override int Depth { get { return _state==ReadState.Interactive? 1:0; } } public override bool EOF { get { return _state==ReadState.EndOfFile? true : false;} } public override bool HasValue{ get { return _state==ReadState.Interactive? true : false; } } public override bool IsDefault { get { return false; } } public override bool IsEmptyElement { get { return false; } } public override string this[int index] { get { return String.Empty; } } public override string this[string qname] { get { return String.Empty; } } public override string this[string localname , string nsuri] { get { return String.Empty; } } public override string LocalName { get { return String.Empty; } } public override string Name { get { return String.Empty; } } public override string NamespaceURI { get { return String.Empty; } } public override XmlNameTable NameTable { get { return null; } } public override XmlNodeType NodeType { get { return _state==ReadState.Interactive? _exposeCDATA? XmlNodeType.CDATA : XmlNodeType.Text : XmlNodeType.None; } } public override string Prefix { get { return String.Empty; } } public override char QuoteChar { get { return '"'; } } public override ReadState ReadState { get { return _state; } } public override string Value { get { return _state==ReadState.Interactive? _value : String.Empty; } } public override string XmlLang { get { return String.Empty; } } public override XmlSpace XmlSpace { get { return XmlSpace.None; } } public override void Close() { _state = ReadState.Closed; } public override string GetAttribute (int index) { throw new ArgumentOutOfRangeException("index", index, "No attributes exposed"); } public override string GetAttribute (string qname) { return null; } public override string GetAttribute (string localname, string nsuri){ return null; } public override string LookupNamespace (string prefix) { return null; } public override void MoveToAttribute (int index) {} public override bool MoveToAttribute (string qname) { return false; } public override bool MoveToAttribute (string localname, string nsuri) { return false; } public override bool MoveToElement() { return false; } public override bool MoveToFirstAttribute() { return false; } public override bool MoveToNextAttribute() { return false; } public override bool ReadAttributeValue() { return false; } public override string ReadInnerXml() { return _state==ReadState.Interactive? _value : String.Empty; } public override string ReadOuterXml() { return _state==ReadState.Interactive? _value : String.Empty; } public override string ReadString() { return _state==ReadState.Interactive? _value : String.Empty; } public override void ResolveEntity() {} public override bool Read() { switch (_state) { case ReadState.Initial: if (_value == null) { WebResponse wRes; Stream stream = XIncludingReader.GetResource(_includeLocation.AbsoluteUri, _accept, _acceptLanguage, out wRes); StreamReader reader; /* According to the spec, encoding should be determined as follows: * external encoding information, if available, otherwise * if the media type of the resource is text/xml, application/xml, or matches the conventions text/*+xml or application/*+xml as described in XML Media Types [IETF RFC 3023], the encoding is recognized as specified in XML 1.0, otherwise * the value of the encoding attribute if one exists, otherwise * UTF-8. */ try { //TODO: try to get "content-encoding" from wRes.Headers collection? //If mime type is xml-aware, get resource encoding as per XML 1.0 string contentType = wRes.ContentType.ToLower(); if (contentType == "text/xml" || contentType == "application/xml" || contentType.StartsWith("text/") && contentType.EndsWith("+xml") || contentType.StartsWith("application/") && contentType.EndsWith("+xml")) { //Yes, that's xml, let's read encoding from the xml declaration reader = new StreamReader(stream, GetEncodingFromXMLDecl(_href)); } else if (_encoding != null) { //Try to use user-specified encoding Encoding enc; try { enc = Encoding.GetEncoding(_encoding); } catch (Exception e) { throw new ResourceException(SR.GetString("NotSupportedEncoding", _encoding), e); } reader = new StreamReader(stream, enc); } else //Fallback to UTF-8 reader = new StreamReader(stream, Encoding.UTF8); _value = reader.ReadToEnd(); TextUtils.CheckForNonXmlChars(_value); } catch (ResourceException re) { throw re; } catch (OutOfMemoryException oome) { //Crazy include - memory is out //TODO: what about reading by chunks? throw new ResourceException(SR.GetString("OutOfMemoryWhileFetchingResource", _href), oome); } catch (IOException ioe) { throw new ResourceException(SR.GetString("IOErrorWhileFetchingResource", _href), ioe); } } _state = ReadState.Interactive; return true; case ReadState.Interactive: //No more input _state = ReadState.EndOfFile; return false; default: return false; } } // Read() #endregion #region private methods /// <summary> /// Reads encoding from the XML declarartion. /// </summary> /// <param name="href">URI reference indicating the location /// of the resource to inlclude.</param> /// <returns>The document encoding as per XML declaration.</returns> /// <exception cref="ResourceException">Resource error.</exception> private Encoding GetEncodingFromXMLDecl(string href) { XmlTextReader tmpReader = new XmlTextReader(href); tmpReader.WhitespaceHandling = WhitespaceHandling.None; try { while (tmpReader.Read() && tmpReader.Encoding == null) {} Encoding enc = tmpReader.Encoding; return enc==null? Encoding.UTF8 : enc; } finally { tmpReader.Close(); } } #endregion } } --- NEW FILE: TextUtils.cs --- #region using using System; #endregion namespace Mvp.Xml.XInclude { /// <summary> /// Text inclusion related utility methods. /// </summary> /// <author>Oleg Tkachenko, ol...@tk...</author> internal class TextUtils { #region public static util methods /// <summary> /// Checks string for a presense of characters, /// not permitted in XML 1.0 documents. /// </summary> /// <param name="str">Input string to check.</param> /// <exception cref="NonXmlCharacterException">Given string contains a character, /// forbidden in XML 1.0.</exception> public static void CheckForNonXmlChars(string str) { int i = 0; while (i < str.Length) { char c = str[i]; //Allowed unicode XML characters if (c >= 0x0020 && c <= 0xD7FF || c >= 0xE000 && c <= 0xFFFD || c == 0xA || c == 0xD || c == 0x9) { //Ok, approved. i++; continue; //Check then surrogate pair } else if (c >= 0xd800 && c <=0xdbff) { //Looks like first char in a surrogate pair, check second one if (++i < str.Length) { if (str[i] >=0xdc00 && str[i] <= 0xdfff) //Ok, valid surrogate pair i++; continue; } } throw new NonXmlCharacterException(str[i]); } } /// <summary> /// Checks value of the 'accept' attribute for validity. /// Characters must be in #x20 through #x7E range. /// </summary> public static void CheckAcceptValue(string accept) { foreach (char c in accept) { if (c < 0x0020 || c > 0x007E) throw new InvalidAcceptHTTPHeaderValueError(c); } } #endregion } } --- NEW FILE: AssemblyInfo.cs --- using System; using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Security.Permissions; [assembly: ComVisible(false)] [assembly: CLSCompliant(true)] [assembly: AssemblyTitle("Mvp.Xml.XInclude")] [assembly: AssemblyDescription("MVP XML Library - XInclude.NET Module")] [assembly: AssemblyVersion("2.0.*")] #region Security Permissions //[assembly: SecurityPermission(SecurityAction.RequestRefuse, UnmanagedCode=true)] #endregion Security Permissions --- NEW FILE: SR.cs --- #region using using System; using System.Resources; using System.Threading; #endregion namespace Mvp.Xml.XInclude { /// <summary>Contains resources for the application.</summary> internal sealed class SR { private static ResourceManager resourceManager = new ResourceManager(typeof(SR).FullName, typeof(SR).Module.Assembly ); private SR() {} /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The object resource.</returns> public static object GetObject(string key) { return resourceManager.GetObject(key); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The string resource.</returns> public static string GetString(string key) { return resourceManager.GetString(key); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/> and /// formats it with the arguments received. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <param name='args'>The arguments to format the resource with.</param> /// <returns>The string resource.</returns> internal static string GetString (string key, params object[] args) { return String.Format(GetString(key), args); } /// <summary></summary> public static string AttributeOrNamespaceInIncludeLocationError { get { return SR.GetString("AttributeOrNamespaceInIncludeLocationError"); } } /// <summary></summary> public static string IntradocumentReferencesNotSupported { get { return SR.GetString("IntradocumentReferencesNotSupported"); } } /// <summary></summary> public static string CustomXmlResolverError { get { return SR.GetString("CustomXmlResolverError"); } } /// <summary></summary> public static string CustomXmlResolverReturnedNull { get { return SR.GetString("CustomXmlResolverError"); } } /// <summary></summary> public static string MalformedXInclusionResult { get { return SR.GetString("MalformedXInclusionResult"); } } /// <summary></summary> public static string FragmentIDInHref { get { return SR.GetString("FragmentIDInHref"); } } } } --- NEW FILE: XIncludingReaderState.cs --- namespace Mvp.Xml.XInclude { internal struct FallbackState { //Fallback is being processed public bool Fallbacking; //xi:fallback element depth public int FallbackDepth; //Fallback processed flag public bool FallbackProcessed; } /// <summary> /// XIncludingReader state machine. /// </summary> /// <author>Oleg Tkachenko, ol...@tk...</author> internal enum XIncludingReaderState { //Default state Default, //xml:base attribute is being exposed ExposingXmlBaseAttr, //xml:base attribute value is being exposed ExposingXmlBaseAttrValue, //xml:lang attribute is being exposed ExposingXmlLangAttr, //xml:lang attribute value is being exposed ExposingXmlLangAttrValue } } --- NEW FILE: XIncludeKeywords.cs --- #region using using System; using System.Xml; #endregion namespace Mvp.Xml.XInclude { /// <summary> /// XInclude syntax keyword collection. /// </summary> /// <author>Oleg Tkachenko, ol...@tk...</author> internal class XIncludeKeywords { #region constructors public XIncludeKeywords(XmlNameTable nt) { nameTable = nt; //Preload some keywords _XIncludeNamespace = nameTable.Add(s_XIncludeNamespace); _OldXIncludeNamespace = nameTable.Add(s_OldXIncludeNamespace); _Include = nameTable.Add(s_Include); _Href = nameTable.Add(s_Href); _Parse = nameTable.Add(s_Parse); } #endregion #region private constants // // Keyword strings private const string s_XIncludeNamespace = "http://www.w3.org/2001/XInclude"; private const string s_OldXIncludeNamespace = "http://www.w3.org/2003/XInclude"; private const string s_Include = "include"; private const string s_Href = "href"; private const string s_Parse = "parse"; private const string s_Xml = "xml"; private const string s_Text = "text"; private const string s_Xpointer = "xpointer"; private const string s_Accept = "accept"; private const string s_AcceptLanguage = "accept-language"; private const string s_Encoding = "encoding"; private const string s_Fallback = "fallback"; private const string s_XmlNamespace = "http://www.w3.org/XML/1998/namespace"; private const string s_Base = "base"; private const string s_XmlBase = "xml:base"; private const string s_Lang = "lang"; private const string s_XmlLang = "xml:lang"; #endregion #region private fields private XmlNameTable nameTable; // // Properties private string _XIncludeNamespace; private string _OldXIncludeNamespace; private string _Include; private string _Href; private string _Parse; private string _Xml; private string _Text; private string _Xpointer; private string _Accept; private string _AcceptLanguage; private string _Encoding; private string _Fallback; private string _XmlNamespace; private string _Base; private string _XmlBase; private string _Lang; private string _XmlLang; #endregion #region public props // http://www.w3.org/2003/XInclude public string XIncludeNamespace { get { return _XIncludeNamespace; } } // http://www.w3.org/2001/XInclude public string OldXIncludeNamespace { get { return _OldXIncludeNamespace; } } // include public string Include { get { return _Include; } } // href public string Href { get { return _Href; } } // parse public string Parse { get { return _Parse; } } // xml public string Xml { get { if (_Xml == null) _Xml = nameTable.Add(s_Xml); return _Xml; } } // text public string Text { get { if (_Text == null) _Text = nameTable.Add(s_Text); return _Text; } } // xpointer public string Xpointer { get { if (_Xpointer == null) _Xpointer = nameTable.Add(s_Xpointer); return _Xpointer; } } // accept public string Accept { get { if (_Accept == null) _Accept = nameTable.Add(s_Accept); return _Accept; } } // accept-language public string AcceptLanguage { get { if (_AcceptLanguage == null) _AcceptLanguage = nameTable.Add(s_AcceptLanguage); return _AcceptLanguage; } } // encoding public string Encoding { get { if (_Encoding == null) _Encoding = nameTable.Add(s_Encoding); return _Encoding; } } // fallback public string Fallback { get { if (_Fallback == null) _Fallback = nameTable.Add(s_Fallback); return _Fallback; } } // Xml namespace public string XmlNamespace { get { if (_XmlNamespace == null) _XmlNamespace = nameTable.Add(s_XmlNamespace); return _XmlNamespace; } } // Base public string Base { get { if (_Base == null) _Base = nameTable.Add(s_Base); return _Base; } } // xml:base public string XmlBase { get { if (_XmlBase == null) _XmlBase = nameTable.Add(s_XmlBase); return _XmlBase; } } // Lang public string Lang { get { if (_Lang == null) _Lang = nameTable.Add(s_Lang); return _Lang; } } // xml:lang public string XmlLang { get { if (_XmlLang == null) _XmlLang = nameTable.Add(s_XmlLang); return _XmlLang; } } #endregion #region public methods // Comparison public static bool Equals(string keyword1, string keyword2) { return (object)keyword1 == (object)keyword2; } #endregion } } |
![http://www.nist.gov/itl/div897/images/nist_home.gif"](http://www.nist.gov/itl/div897/images/nist_home.gif"){kind=link}