Move xsl:strip-space to declarations, rename auxiliary files and rename/move/remove tests in cat file
authorabraaksm
Fri, 03 Apr 2015 03:20:42 +0200
changeset 913 c02c6346e1b8
parent 912 147d206adb46
child 914 a537f0f5cca2
Move xsl:strip-space to declarations, rename auxiliary files and rename/move/remove tests in cat file
tests/decl/strip-space/_strip-space-test-set.xml
tests/decl/strip-space/strip-space-04.xml
tests/decl/strip-space/strip-space-0401.out
tests/decl/strip-space/strip-space-0402.out
tests/decl/strip-space/strip-space-05.xml
tests/decl/strip-space/strip-space-0501.out
tests/decl/strip-space/strip-space-0502.out
tests/decl/strip-space/strip-space-06.xml
tests/decl/strip-space/strip-space-06.xsd
tests/decl/strip-space/strip-space-06a.xml
tests/decl/strip-space/strip-space-06a.xsd
tests/decl/strip-space/strip-space-09.xml
tests/decl/strip-space/strip-space-1601.xsl
tests/misc/whitespace/_whitespace-test-set.xml
tests/misc/whitespace/whitespace-04.xml
tests/misc/whitespace/whitespace-05.xml
tests/misc/whitespace/whitespace-06.xml
tests/misc/whitespace/whitespace-06.xsd
tests/misc/whitespace/whitespace-06a.xml
tests/misc/whitespace/whitespace-06a.xsd
tests/misc/whitespace/whitespace-09.xml
tests/misc/whitespace/whitespace013.out
tests/misc/whitespace/whitespace014.out
tests/misc/whitespace/whitespace015.out
tests/misc/whitespace/whitespace016.out
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/_strip-space-test-set.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,512 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test-set xmlns:xs="http://www.w3.org/2001/XMLSchema"
+   xmlns="http://www.w3.org/2012/10/xslt-test-catalog" name="whitespace">
+   <description>Tests whitespace</description>
+   <environment name="strip-space-01">
+      <source role=".">
+         <content><![CDATA[<doc></doc>]]></content>
+      </source>
+   </environment>
+   <environment name="strip-space-02">
+      <source role=".">
+         <content><![CDATA[<doc size="1.5">
+  <top-node><rubbish>Content of Rubbish</rubbish></top-node>
+</doc>]]></content>
+      </source>
+   </environment>
+   <environment name="strip-space-03">
+      <source role=".">
+         <content><![CDATA[<doc>
+   <foo/>
+   <foo/>
+</doc>]]></content>
+      </source>
+   </environment>
+   <environment name="strip-space-04">
+      <source role="." file="strip-space-04.xml"/>
+   </environment>
+
+   <environment name="strip-space-05">
+      <source role="." file="strip-space-05.xml"/>
+   </environment>
+
+   <environment name="strip-space-06">
+      <source role="." file="strip-space-06.xml" validation="strict"/>
+      <schema role="source-reference" file="strip-space-06.xsd" xsd-version="1.0"/>
+   </environment>
+
+   <environment name="strip-space-07">
+      <source role=".">
+         <content><![CDATA[ 
+
+<doc>
+  <test1>
+       <a>a</a>
+       <b>b</b>
+  </test1>
+  <test2>
+       <c>c</c>
+       <d>d</d>
+  </test2>
+</doc>]]></content>
+      </source>
+   </environment>
+
+   <environment name="strip-space-09">
+      <source role="." file="strip-space-09.xml"/>
+   </environment>
+
+   <environment name="strip-space-17">
+      <source role=".">
+         <content><![CDATA[<document>
+  <section/>  <section/>  <section/>
+</document>]]></content>
+      </source>
+   </environment>
+
+   <test-case name="strip-space-0114">
+      <description> Test with an element constructed with whitespace text node children. The element
+         is stored in a variable and its name is listed in xsl:strip-space. Confirm that the element
+         has a text node child. </description>
+      <created by="Michael Kay" on="2012-10-30"/>
+      <environment ref="strip-space-01"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0114.xsl"/>
+      </test>
+      <result>
+         <all-of>
+            <assert>/out/a[1] = "  "</assert>
+            <assert>/out/a[2] = "1"</assert>
+         </all-of>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0115">
+      <description> In xsl:strip-space, prefix of nametest must be declared </description>
+      <created by="Michael Kay" on="2013-09-22"/>
+      <environment ref="strip-space-01"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0115.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0280"/>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0401">
+      <description> Test xsl:preserve-space with @elements="*:NCName". Template rules have
+         match="*", match="*:NCName" and match="QName" </description>
+      <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
+      <environment ref="strip-space-04"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0401.xsl"/>
+         <output serialize="yes"/>
+      </test>
+      <result>
+         <assert-serialization method="xml" file="strip-space-0401.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0402">
+      <description> Test xsl:strip-space with @elements="*:NCName". Template rules have match="*",
+         match="*:NCName" and match="QName". </description>
+      <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
+      <environment ref="strip-space-04"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0402.xsl"/>
+         <output serialize="yes"/>
+      </test>
+      <result>
+         <assert-serialization method="xml" file="strip-space-0402.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0501">
+      <description> Test xsl:preserve-space with @elements="NCName:*". Template rules have
+         match="*", match="NCName:* and match="QName". </description>
+      <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
+      <environment ref="strip-space-05"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0501.xsl"/>
+         <output serialize="yes"/>
+      </test>
+      <result>
+         <assert-serialization method="xml" file="strip-space-0501.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0502">
+      <description>Test xsl:strip-space with @elements="NCName:*". Template rules have match="*" ,
+         match="NCName:* and match="QName".</description>
+      <created by="Michael Kay" on="2012-10-30"/>
+      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
+      <environment ref="strip-space-05"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0502.xsl"/>
+         <output serialize="yes"/>
+      </test>
+      <result>
+         <assert-serialization method="xml" file="strip-space-0502.out"/>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0601">
+      <description> Test that whitespace text nodes are stripped from elements with element only
+         content regardless of xsl:preserve-space or xsl:strip-space.</description>
+      <created by="Michael Kay" on="2012-10-30"/>
+      <environment ref="strip-space-06"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+         <feature value="schema_aware"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0601.xsl"/>
+      </test>
+      <result>
+         <assert>/ok</assert>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0602">
+      <description> Test that whitespace text nodes are not stripped from elements with simple
+         content regardless of xsl:preserve-space or xsl:strip-space.</description>
+      <created by="Michael Kay" on="2012-12-07"/>
+      <environment ref="strip-space-06"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+         <feature value="schema_aware"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0602.xsl"/>
+      </test>
+      <result>
+         <assert>/ok</assert>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0603">
+      <description> Test that whitespace text nodes are not stripped from elements having an
+         ancestor whose governing type contains an XSD 1.1 assertion. </description>
+      <created by="Michael Kay" on="2012-12-07"/>
+      <environment>
+         <source role="." file="strip-space-06a.xml" uri="strip-space-06a.xml" validation="strict"/>
+         <schema file="strip-space-06a.xsd" uri="strip-space-06a.xsd" role="source-reference"
+            xsd-version="1.1"/>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10+"/>
+         <feature value="schema_aware"/>
+         <feature value="XSD_1.1"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0603.xsl"/>
+      </test>
+      <result>
+         <assert>/ok</assert>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0701">
+      <description>Another Test for white-space</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-07"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0701.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>ab
+       c
+       d
+  </out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0702">
+      <description>Another Test for white-space (xsl:strip-space)</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-07"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0702.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>abcd</out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0703">
+      <description>Another Test for white-space</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-07"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0703.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>abcd</out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0704">
+      <description>Another Test for white-space (xsl:strip-space and
+         xsl:preserve-space)</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-07"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0704.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>ab
+       c
+       d
+  </out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0801">
+      <description>Another Test for white-space handling</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<doc>
+    <a>a</a>
+    <b> <!-- test -->b</b>
+</doc>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0801.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>ab</out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0901">
+      <description>Another Test for white-space</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-09"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0901.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out xmlns:ns1="http://ns1/">ab
+       c
+       d
+  </out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-0902">
+      <description>Another Test for white-space</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-09"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-0902.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out xmlns:ns1="http://ns1/">ab
+       c
+       d
+  </out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1101">
+      <description/>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<document>
+  <section/>  <section/>  <section/>
+</document>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1101.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<out>Position:1,Last:3
+Position:2,Last:3
+Position:3,Last:3
+</out>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1401">
+      <description>test that the default namespace is NOT used for names in
+         xsl:strip-space</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<doc xmlns="http://foo.uri/"><a> </a><b> </b><c> </c></doc>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1401.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<doc xmlns="http://foo.uri/"><a> </a><b> </b><c> </c></doc>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1501">
+      <description>test two conflicting xsl:strip-space/preserve-space declarations (recoverable
+         error)</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="Abel Braaksma" on="2014-02-11" change="XTSE0270 - is not a recoverable error in XSLT30, remove dependency on 3.0."/>
+      <modified by="Abel Braaksma" on="2015-04-02" change="Allow XTRE0270 to be thrown, add 3.0 variant of test"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<doc><a> </a><b> </b><c> </c></doc>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10 XSLT20"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1501.xsl"/>
+      </test>
+      <result>
+         <any-of>
+            <error code="XTRE0270" />
+            <assert-xml><![CDATA[<doc><a/><b> </b><c/></doc>]]></assert-xml>
+         </any-of>         
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1501a">
+      <description>Two conflicting xsl:strip-space/preserve-space declarations (static error in XSLT 3.0)</description>
+      <created by="Abel Braaksma" on="2015-04-02"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<doc><a> </a><b> </b><c> </c></doc>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT30+" />
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1501.xsl"/>
+      </test>
+      <result>
+         <error code="XTSE0270" />
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1601">
+      <description>Test import precedence for xsl:strip-space</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<abc:doc xmlns:abc="http://abc.uri/">
+<abc:w>   </abc:w>
+<abc:x>   </abc:x>
+<abc:y>   </abc:y>
+<abc:z>   </abc:z>
+<q>    </q>
+</abc:doc>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1601.xsl"/>
+         <stylesheet file="strip-space-1601a.xsl" role="secondary"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<abc:doc xmlns:abc="http://abc.uri/"><abc:w>   </abc:w><abc:x/><abc:y/><abc:z/><q>    </q></abc:doc>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1704">
+      <description>no confict reported in 2.0 if there are two identical strip-space or
+         preserve-space declarations</description>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <environment ref="strip-space-17"/>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1704.xsl"/>
+      </test>
+      <result>
+         <assert-xml><![CDATA[<document><section/><section/><section/></document>]]></assert-xml>
+      </result>
+   </test-case>
+
+   <test-case name="strip-space-1801">
+      <description/>
+      <created by="Michael Kay" on="2012-11-07"/>
+      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
+      <environment>
+         <source role=".">
+            <content><![CDATA[<a xml:space="preserve">
+  <b xml:space="default">  </b>
+  <c>  </c>
+  <d xml:space="preserve">  </d>
+  <e xml:space="default">
+    <f xml:space="preserve">  </f>
+  </e>
+</a>]]></content>
+         </source>
+      </environment>
+      <dependencies>
+         <spec value="XSLT10+"/>
+      </dependencies>
+      <test>
+         <stylesheet file="strip-space-1801.xsl"/>
+         <output serialize="yes"/>
+      </test>
+      <result>
+         <assert-serialization method="xml" file="strip-space-1801.out"/>
+      </result>
+   </test-case>
+</test-set>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-04.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<doc xmlns:one="http://www.test1.example.org" 
+	 xmlns:two="http://www.test2.example.org"
+	 xmlns:three="http://www.test3.example.org">
+<one:elem>
+   		<a>elem1</a>
+   		
+</one:elem>
+<one:elem>   <a>elem2</a>   </one:elem>
+<two:elem>
+   <a>elem3</a></two:elem>
+<three:elem><a>elem4</a>			</three:elem>
+<one:elem>
+   	<a>elem5</a>
+</one:elem>
+<two:elem> <a>elem6</a> </two:elem>
+</doc>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-0401.out	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><out><b>
+   		elem1
+   		
+</b><b>   elem2   </b><b>
+   elem3</b><b>elem4			</b><b>
+   	elem5
+</b><b> elem6 </b></out>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-0402.out	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+<b>elem1</b>
+<b>elem2</b>
+<b>elem3</b>
+<b>elem4</b>
+<b>elem5</b>
+<b>elem6</b>
+</out>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-05.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<doc xmlns:one="http://www.test1.example.org" 
+	 xmlns:two="http://www.test2.example.org"
+	 xmlns:three="http://www.test3.example.org">
+<one:el>
+   		<a>el1</a>
+   		
+</one:el>
+<one:elem>   <a>elem2</a>   </one:elem>
+<two:elem>
+   <a>elem3</a></two:elem>
+<three:elem><a>elem4</a>			</three:elem>
+<one:item>
+   	<a>item5</a>
+</one:item>
+<two:elem> <a>elem6</a> </two:elem>
+</doc>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-0501.out	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><out><b>
+   		el1
+   		
+</b><b>   elem2   </b><c>elem3</c><c>elem4</c><b>
+   	item5
+</b><c>elem6</c></out>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-0502.out	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?><out>
+<b>el1</b>
+<b>elem2</b>
+<c>
+   elem3</c>
+<c>elem4			</c>
+<b>item5</b>
+<c> elem6 </c>
+</out>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-06.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<my:userNode 
+  xmlns:my="http://www.whitespace.example.com/ns/various"
+	 	  my:specialPart="123-AB">
+		<my:complexUserElem age="75">
+		
+		
+			<firstName>Hello</firstName>
+      		
+      					<familyName>There</familyName>
+      					
+		</my:complexUserElem>
+	
+	<my:complexUserElem age="31">
+		<firstName>    </firstName>
+		<familyName>    </familyName>
+	</my:complexUserElem>
+</my:userNode>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-06.xsd	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			targetNamespace="http://www.whitespace.example.com/ns/various"
+			xmlns:my="http://www.whitespace.example.com/ns/various">
+
+	<xsd:annotation>
+		<xsd:documentation>
+      		Schema for various types for node tests 
+		</xsd:documentation>
+	</xsd:annotation>
+
+<!-- Begin definitions -->
+	<xsd:element name="userNode" type="my:userType" nillable="true" />
+	
+	<xsd:element name="simpleBuiltin" type="xsd:Name" />
+	<xsd:element name="simpleUserElem" type="my:partNumberType" />
+	<xsd:element name="simpleUserList" type="my:myListType" />
+	<xsd:element name="simpleUserUnion" type="my:partIntegerUnion" />
+	<xsd:element name="complexMixedUserElem" type="my:mixedPersonType" />
+	<xsd:element name="complexUserElem" type="my:personType" />
+	<xsd:element name="complexSimpleContentElem" type="my:complexSimpleContent" />
+	<xsd:element name="onlyAttributes" type="my:onlyAttributesType" />
+	
+	<xsd:attribute name="specialPart" type="my:partNumberType"/>
+	<xsd:attribute name="colors" type="xsd:NMTOKENS"/>
+	<xsd:attribute name="union" type="my:partIntegerUnion"/>
+	<xsd:attribute name="count" type="xsd:string"/>
+
+	
+	<xsd:simpleType name="partNumberType">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="\d{3}-[A-Z]{2}"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="derivedURI">
+    <xsd:restriction base="xsd:anyURI">
+      <xsd:enumeration value="http://test1.org"/>
+      <xsd:enumeration value="http://test2.org"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:complexType name="personType">
+    <xsd:sequence>
+      <xsd:element name="firstName"  type="xsd:string"/>
+      <xsd:element name="familyName">
+        <xsd:complexType>
+          <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+              <xsd:anyAttribute/>
+            </xsd:extension>
+          </xsd:simpleContent>
+        </xsd:complexType>
+      </xsd:element>  
+    </xsd:sequence>
+    <xsd:attribute name="age" type="xsd:integer"/>
+  </xsd:complexType>
+  
+  <xsd:complexType name="mixedPersonType">
+    <xsd:sequence>
+      <xsd:element name="description" type="my:DescriptionType" />
+      <xsd:element name="company" type="my:CompanyType" />
+    </xsd:sequence>
+    <xsd:attribute name="age" type="xsd:integer"/>
+  </xsd:complexType>
+  
+  <xsd:complexType name="DescriptionType" mixed="true">
+     <xsd:sequence>
+       <xsd:element name="name" type="xsd:string"/>
+     </xsd:sequence>
+  </xsd:complexType>
+        
+  <xsd:complexType name="CompanyType" mixed="true">
+     <xsd:sequence>
+        <xsd:element name="name" type="xsd:string"/>
+     </xsd:sequence>
+  </xsd:complexType>
+  
+  <xsd:simpleType name="myListType">
+  	<xsd:list itemType="xsd:Name"/>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="restrictionListType">
+  	<xsd:list itemType="xsd:double"/>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="sixDoubles">
+  <xsd:restriction base="my:restrictionListType">
+     <xsd:minLength value="3"/>
+     <xsd:maxLength value="6"/>
+    
+  </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="partIntegerUnion">
+  	<xsd:union memberTypes="my:partNumberType xsd:integer"/>
+  </xsd:simpleType>
+  
+  <xsd:simpleType name="listUnionType">
+  	<xsd:union memberTypes="my:sixDoubles my:myListType"/>
+  </xsd:simpleType>
+  
+  <xsd:complexType name="complexSimpleContent">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:decimal">
+        <xsd:attribute ref="my:count"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  
+  <xsd:complexType name="onlyAttributesType">
+    <xsd:attribute ref="my:colors" />
+    <xsd:attribute name="specialPart" type="my:partNumberType"/>
+    <xsd:attribute ref="my:union" use="optional"/>
+  </xsd:complexType>
+  
+  <xsd:complexType name="userType">
+		<xsd:sequence>
+			<xsd:element ref="my:simpleBuiltin" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:simpleUserElem" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:simpleUserList" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:simpleUserUnion" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:complexMixedUserElem" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:complexUserElem" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:complexSimpleContentElem" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="my:onlyAttributes" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="listOfDoubles" type="my:restrictionListType" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="listOfSixDoubles" type="my:sixDoubles" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element name="listUnion" type="my:listUnionType" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+			<xsd:attribute ref="my:specialPart" />
+  </xsd:complexType>
+</xsd:schema>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-06a.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<doc xsi:type="t" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <a>
+    <b>
+      <c>
+        <p>    </p>
+      </c>
+    </b>
+  </a>
+</doc>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-06a.xsd	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,8 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:complexType name="t" mixed="true">
+    <xs:sequence>
+      <xs:any processContents="skip"/>
+    </xs:sequence>
+    <xs:assert test="exists(.//p[string-length(.) = 4])"/>
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/decl/strip-space/strip-space-09.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -0,0 +1,11 @@
+<?xml version="1.0"?> 
+<doc xmlns:foo="http://ns1/" xmlns:roo="http://ns2/">
+  <foo:test>
+       <a>a</a>
+       <b>b</b>
+  </foo:test>
+  <roo:test>
+       <c>c</c>
+       <d>d</d>
+  </roo:test>
+</doc>
--- a/tests/decl/strip-space/strip-space-1601.xsl	Fri Apr 03 02:39:41 2015 +0200
+++ b/tests/decl/strip-space/strip-space-1601.xsl	Fri Apr 03 03:20:42 2015 +0200
@@ -4,7 +4,7 @@
 
 <!-- Test import precedence for xsl:strip-space -->
 
-<xsl:import href="whitespace-1601a.xsl"/>
+<xsl:import href="strip-space-1601a.xsl"/>
 <xsl:strip-space elements="abc:*"/>
 <xsl:preserve-space elements="abc:w"/>
 
--- a/tests/misc/whitespace/_whitespace-test-set.xml	Fri Apr 03 02:39:41 2015 +0200
+++ b/tests/misc/whitespace/_whitespace-test-set.xml	Fri Apr 03 03:20:42 2015 +0200
@@ -22,39 +22,7 @@
 </doc>]]></content>
       </source>
    </environment>
-   <environment name="whitespace-04">
-      <source role="." file="whitespace-04.xml"/>
-   </environment>
-
-   <environment name="whitespace-05">
-      <source role="." file="whitespace-05.xml"/>
-   </environment>
-
-   <environment name="whitespace-06">
-      <source role="." file="whitespace-06.xml" validation="strict"/>
-      <schema role="source-reference" file="whitespace-06.xsd" xsd-version="1.0"/>
-   </environment>
 
-   <environment name="whitespace-07">
-      <source role=".">
-         <content><![CDATA[ 
-
-<doc>
-  <test1>
-       <a>a</a>
-       <b>b</b>
-  </test1>
-  <test2>
-       <c>c</c>
-       <d>d</d>
-  </test2>
-</doc>]]></content>
-      </source>
-   </environment>
-
-   <environment name="whitespace-09">
-      <source role="." file="whitespace-09.xml"/>
-   </environment>
    <environment name="whitespace-10">
       <source role=".">
          <content><![CDATA[ 
@@ -303,41 +271,6 @@
       </result>
    </test-case>
 
-   <test-case name="whitespace-0114">
-      <description> Test with an element constructed with whitespace text node children. The element
-         is stored in a variable and its name is listed in xsl:strip-space. Confirm that the element
-         has a text node child. </description>
-      <created by="Michael Kay" on="2012-10-30"/>
-      <environment ref="whitespace-01"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0114.xsl"/>
-      </test>
-      <result>
-         <all-of>
-            <assert>/out/a[1] = "  "</assert>
-            <assert>/out/a[2] = "1"</assert>
-         </all-of>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0115">
-      <description> In xsl:strip-space, prefix of nametest must be declared </description>
-      <created by="Michael Kay" on="2013-09-22"/>
-      <environment ref="whitespace-01"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0115.xsl"/>
-      </test>
-      <result>
-         <error code="XTSE0280"/>
-      </result>
-   </test-case>
-
    <test-case name="whitespace-0201">
       <description> Test with whitespace text nodes as preceding-siblings of xsl:param. Parent has
          @xml:space=preserve. Whitespace must be stripped. </description>
@@ -373,259 +306,6 @@
       </result>
    </test-case>
 
-   <test-case name="whitespace-0401">
-      <description> Test xsl:preserve-space with @elements="*:NCName". Template rules have
-         match="*", match="*:NCName" and match="QName" </description>
-      <created by="Michael Kay" on="2012-10-30"/>
-      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
-      <environment ref="whitespace-04"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0401.xsl"/>
-         <output serialize="yes"/>
-      </test>
-      <result>
-         <assert-serialization method="xml" file="whitespace013.out"/>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0402">
-      <description> Test xsl:strip-space with @elements="*:NCName". Template rules have match="*",
-         match="*:NCName" and match="QName". </description>
-      <created by="Michael Kay" on="2012-10-30"/>
-      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
-      <environment ref="whitespace-04"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0402.xsl"/>
-         <output serialize="yes"/>
-      </test>
-      <result>
-         <assert-serialization method="xml" file="whitespace015.out"/>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0501">
-      <description> Test xsl:preserve-space with @elements="NCName:*". Template rules have
-         match="*", match="NCName:* and match="QName". </description>
-      <created by="Michael Kay" on="2012-10-30"/>
-      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
-      <environment ref="whitespace-05"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0501.xsl"/>
-         <output serialize="yes"/>
-      </test>
-      <result>
-         <assert-serialization method="xml" file="whitespace014.out"/>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0502">
-      <description>Test xsl:strip-space with @elements="NCName:*". Template rules have match="*" ,
-         match="NCName:* and match="QName".</description>
-      <created by="Michael Kay" on="2012-10-30"/>
-      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
-      <environment ref="whitespace-05"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0502.xsl"/>
-         <output serialize="yes"/>
-      </test>
-      <result>
-         <assert-serialization method="xml" file="whitespace016.out"/>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0601">
-      <description> Test that whitespace text nodes are stripped from elements with element only
-         content regardless of xsl:preserve-space or xsl:strip-space.</description>
-      <created by="Michael Kay" on="2012-10-30"/>
-      <environment ref="whitespace-06"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-         <feature value="schema_aware"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0601.xsl"/>
-      </test>
-      <result>
-         <assert>/ok</assert>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0602">
-      <description> Test that whitespace text nodes are not stripped from elements with simple
-         content regardless of xsl:preserve-space or xsl:strip-space.</description>
-      <created by="Michael Kay" on="2012-12-07"/>
-      <environment ref="whitespace-06"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-         <feature value="schema_aware"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0602.xsl"/>
-      </test>
-      <result>
-         <assert>/ok</assert>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0603">
-      <description> Test that whitespace text nodes are not stripped from elements having an
-         ancestor whose governing type contains an XSD 1.1 assertion. </description>
-      <created by="Michael Kay" on="2012-12-07"/>
-      <environment>
-         <source role="." file="whitespace-06a.xml" uri="whitespace-06a.xml" validation="strict"/>
-         <schema file="whitespace-06a.xsd" uri="whitespace-06a.xsd" role="source-reference"
-            xsd-version="1.1"/>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10+"/>
-         <feature value="schema_aware"/>
-         <feature value="XSD_1.1"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0603.xsl"/>
-      </test>
-      <result>
-         <assert>/ok</assert>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0701">
-      <description>Another Test for white-space</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-07"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0701.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out>ab
-       c
-       d
-  </out>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0702">
-      <description>Another Test for white-space (xsl:strip-space)</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-07"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0702.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out>abcd</out>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0703">
-      <description>Another Test for white-space</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-07"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0703.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out>abcd</out>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0704">
-      <description>Another Test for white-space (xsl:strip-space and
-         xsl:preserve-space)</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-07"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0704.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out>ab
-       c
-       d
-  </out>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0801">
-      <description>Another Test for white-space handling</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<doc>
-    <a>a</a>
-    <b> <!-- test -->b</b>
-</doc>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0801.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out>ab</out>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0901">
-      <description>Another Test for white-space</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-09"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0901.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out xmlns:ns1="http://ns1/">ab
-       c
-       d
-  </out>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-0902">
-      <description>Another Test for white-space</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-09"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-0902.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out xmlns:ns1="http://ns1/">ab
-       c
-       d
-  </out>]]></assert-xml>
-      </result>
-   </test-case>
-
    <test-case name="whitespace-1001">
       <description/>
       <created by="Michael Kay" on="2012-11-07"/>
@@ -708,30 +388,6 @@
       </result>
    </test-case>
 
-   <test-case name="whitespace-1101">
-      <description/>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<document>
-  <section/>  <section/>  <section/>
-</document>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1101.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<out>Position:1,Last:3
-Position:2,Last:3
-Position:3,Last:3
-</out>]]></assert-xml>
-      </result>
-   </test-case>
-
    <test-case name="whitespace-1201">
       <description/>
       <created by="Michael Kay" on="2012-11-07"/>
@@ -804,96 +460,6 @@
       </result>
    </test-case>
 
-   <test-case name="whitespace-1401">
-      <description>test that the default namespace is NOT used for names in
-         xsl:strip-space</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<doc xmlns="http://foo.uri/"><a> </a><b> </b><c> </c></doc>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1401.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<doc xmlns="http://foo.uri/"><a> </a><b> </b><c> </c></doc>]]></assert-xml>
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-1501">
-      <description>test two conflicting xsl:strip-space/preserve-space declarations (recoverable
-         error)</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <modified by="Abel Braaksma" on="2014-02-11" change="XTSE0270 - is not a recoverable error in XSLT30, remove dependency on 3.0."/>
-      <modified by="Abel Braaksma" on="2015-04-02" change="Allow XTRE0270 to be thrown, add 3.0 variant of test"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<doc><a> </a><b> </b><c> </c></doc>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10 XSLT20"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1501.xsl"/>
-      </test>
-      <result>
-         <any-of>
-            <error code="XTRE0270" />
-            <assert-xml><![CDATA[<doc><a/><b> </b><c/></doc>]]></assert-xml>
-         </any-of>         
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-1501a">
-      <description>Two conflicting xsl:strip-space/preserve-space declarations (static error in XSLT 3.0)</description>
-      <created by="Abel Braaksma" on="2015-04-02"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<doc><a> </a><b> </b><c> </c></doc>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT30+" />
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1501.xsl"/>
-      </test>
-      <result>
-         <error code="XTSE0270" />
-      </result>
-   </test-case>
-
-   <test-case name="whitespace-1601">
-      <description>Test import precedence for xsl:strip-space</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<abc:doc xmlns:abc="http://abc.uri/">
-<abc:w>   </abc:w>
-<abc:x>   </abc:x>
-<abc:y>   </abc:y>
-<abc:z>   </abc:z>
-<q>    </q>
-</abc:doc>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1601.xsl"/>
-         <stylesheet file="whitespace-1601a.xsl" role="secondary"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<abc:doc xmlns:abc="http://abc.uri/"><abc:w>   </abc:w><abc:x/><abc:y/><abc:z/><q>    </q></abc:doc>]]></assert-xml>
-      </result>
-   </test-case>
-
    <test-case name="whitespace-1701">
       <description/>
       <created by="Michael Kay" on="2012-11-07"/>
@@ -942,22 +508,6 @@
       </result>
    </test-case>
 
-   <test-case name="whitespace-1704">
-      <description>no confict reported in 2.0 if there are two identical strip-space or
-         preserve-space declarations</description>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <environment ref="whitespace-17"/>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1704.xsl"/>
-      </test>
-      <result>
-         <assert-xml><![CDATA[<document><section/><section/><section/></document>]]></assert-xml>
-      </result>
-   </test-case>
-
    <test-case name="whitespace-1705">
       <description>liberal use of whitespace in attribute values in the stylesheet: see erratum
          E2</description>
@@ -974,31 +524,4 @@
       </result>
    </test-case>
 
-   <test-case name="whitespace-1801">
-      <description/>
-      <created by="Michael Kay" on="2012-11-07"/>
-      <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
-      <environment>
-         <source role=".">
-            <content><![CDATA[<a xml:space="preserve">
-  <b xml:space="default">  </b>
-  <c>  </c>
-  <d xml:space="preserve">  </d>
-  <e xml:space="default">
-    <f xml:space="preserve">  </f>
-  </e>
-</a>]]></content>
-         </source>
-      </environment>
-      <dependencies>
-         <spec value="XSLT10+"/>
-      </dependencies>
-      <test>
-         <stylesheet file="whitespace-1801.xsl"/>
-         <output serialize="yes"/>
-      </test>
-      <result>
-         <assert-serialization method="xml" file="whitespace-1801.out"/>
-      </result>
-   </test-case>
 </test-set>
--- a/tests/misc/whitespace/whitespace-04.xml	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<doc xmlns:one="http://www.test1.example.org" 
-	 xmlns:two="http://www.test2.example.org"
-	 xmlns:three="http://www.test3.example.org">
-<one:elem>
-   		<a>elem1</a>
-   		
-</one:elem>
-<one:elem>   <a>elem2</a>   </one:elem>
-<two:elem>
-   <a>elem3</a></two:elem>
-<three:elem><a>elem4</a>			</three:elem>
-<one:elem>
-   	<a>elem5</a>
-</one:elem>
-<two:elem> <a>elem6</a> </two:elem>
-</doc>
--- a/tests/misc/whitespace/whitespace-05.xml	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<doc xmlns:one="http://www.test1.example.org" 
-	 xmlns:two="http://www.test2.example.org"
-	 xmlns:three="http://www.test3.example.org">
-<one:el>
-   		<a>el1</a>
-   		
-</one:el>
-<one:elem>   <a>elem2</a>   </one:elem>
-<two:elem>
-   <a>elem3</a></two:elem>
-<three:elem><a>elem4</a>			</three:elem>
-<one:item>
-   	<a>item5</a>
-</one:item>
-<two:elem> <a>elem6</a> </two:elem>
-</doc>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace-06.xml	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<my:userNode 
-  xmlns:my="http://www.whitespace.example.com/ns/various"
-	 	  my:specialPart="123-AB">
-		<my:complexUserElem age="75">
-		
-		
-			<firstName>Hello</firstName>
-      		
-      					<familyName>There</familyName>
-      					
-		</my:complexUserElem>
-	
-	<my:complexUserElem age="31">
-		<firstName>    </firstName>
-		<familyName>    </familyName>
-	</my:complexUserElem>
-</my:userNode>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace-06.xsd	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-			targetNamespace="http://www.whitespace.example.com/ns/various"
-			xmlns:my="http://www.whitespace.example.com/ns/various">
-
-	<xsd:annotation>
-		<xsd:documentation>
-      		Schema for various types for node tests 
-		</xsd:documentation>
-	</xsd:annotation>
-
-<!-- Begin definitions -->
-	<xsd:element name="userNode" type="my:userType" nillable="true" />
-	
-	<xsd:element name="simpleBuiltin" type="xsd:Name" />
-	<xsd:element name="simpleUserElem" type="my:partNumberType" />
-	<xsd:element name="simpleUserList" type="my:myListType" />
-	<xsd:element name="simpleUserUnion" type="my:partIntegerUnion" />
-	<xsd:element name="complexMixedUserElem" type="my:mixedPersonType" />
-	<xsd:element name="complexUserElem" type="my:personType" />
-	<xsd:element name="complexSimpleContentElem" type="my:complexSimpleContent" />
-	<xsd:element name="onlyAttributes" type="my:onlyAttributesType" />
-	
-	<xsd:attribute name="specialPart" type="my:partNumberType"/>
-	<xsd:attribute name="colors" type="xsd:NMTOKENS"/>
-	<xsd:attribute name="union" type="my:partIntegerUnion"/>
-	<xsd:attribute name="count" type="xsd:string"/>
-
-	
-	<xsd:simpleType name="partNumberType">
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="\d{3}-[A-Z]{2}"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  
-  <xsd:simpleType name="derivedURI">
-    <xsd:restriction base="xsd:anyURI">
-      <xsd:enumeration value="http://test1.org"/>
-      <xsd:enumeration value="http://test2.org"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  
-  <xsd:complexType name="personType">
-    <xsd:sequence>
-      <xsd:element name="firstName"  type="xsd:string"/>
-      <xsd:element name="familyName">
-        <xsd:complexType>
-          <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-              <xsd:anyAttribute/>
-            </xsd:extension>
-          </xsd:simpleContent>
-        </xsd:complexType>
-      </xsd:element>  
-    </xsd:sequence>
-    <xsd:attribute name="age" type="xsd:integer"/>
-  </xsd:complexType>
-  
-  <xsd:complexType name="mixedPersonType">
-    <xsd:sequence>
-      <xsd:element name="description" type="my:DescriptionType" />
-      <xsd:element name="company" type="my:CompanyType" />
-    </xsd:sequence>
-    <xsd:attribute name="age" type="xsd:integer"/>
-  </xsd:complexType>
-  
-  <xsd:complexType name="DescriptionType" mixed="true">
-     <xsd:sequence>
-       <xsd:element name="name" type="xsd:string"/>
-     </xsd:sequence>
-  </xsd:complexType>
-        
-  <xsd:complexType name="CompanyType" mixed="true">
-     <xsd:sequence>
-        <xsd:element name="name" type="xsd:string"/>
-     </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:simpleType name="myListType">
-  	<xsd:list itemType="xsd:Name"/>
-  </xsd:simpleType>
-  
-  <xsd:simpleType name="restrictionListType">
-  	<xsd:list itemType="xsd:double"/>
-  </xsd:simpleType>
-  
-  <xsd:simpleType name="sixDoubles">
-  <xsd:restriction base="my:restrictionListType">
-     <xsd:minLength value="3"/>
-     <xsd:maxLength value="6"/>
-    
-  </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="partIntegerUnion">
-  	<xsd:union memberTypes="my:partNumberType xsd:integer"/>
-  </xsd:simpleType>
-  
-  <xsd:simpleType name="listUnionType">
-  	<xsd:union memberTypes="my:sixDoubles my:myListType"/>
-  </xsd:simpleType>
-  
-  <xsd:complexType name="complexSimpleContent">
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:decimal">
-        <xsd:attribute ref="my:count"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-  
-  <xsd:complexType name="onlyAttributesType">
-    <xsd:attribute ref="my:colors" />
-    <xsd:attribute name="specialPart" type="my:partNumberType"/>
-    <xsd:attribute ref="my:union" use="optional"/>
-  </xsd:complexType>
-  
-  <xsd:complexType name="userType">
-		<xsd:sequence>
-			<xsd:element ref="my:simpleBuiltin" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:simpleUserElem" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:simpleUserList" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:simpleUserUnion" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:complexMixedUserElem" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:complexUserElem" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:complexSimpleContentElem" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element ref="my:onlyAttributes" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element name="listOfDoubles" type="my:restrictionListType" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element name="listOfSixDoubles" type="my:sixDoubles" minOccurs="0" maxOccurs="unbounded"/>
-			<xsd:element name="listUnion" type="my:listUnionType" minOccurs="0" maxOccurs="unbounded"/>
-		</xsd:sequence>
-			<xsd:attribute ref="my:specialPart" />
-  </xsd:complexType>
-</xsd:schema>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace-06a.xml	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<doc xsi:type="t" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <a>
-    <b>
-      <c>
-        <p>    </p>
-      </c>
-    </b>
-  </a>
-</doc>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace-06a.xsd	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:complexType name="t" mixed="true">
-    <xs:sequence>
-      <xs:any processContents="skip"/>
-    </xs:sequence>
-    <xs:assert test="exists(.//p[string-length(.) = 4])"/>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace-09.xml	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-<?xml version="1.0"?> 
-<doc xmlns:foo="http://ns1/" xmlns:roo="http://ns2/">
-  <foo:test>
-       <a>a</a>
-       <b>b</b>
-  </foo:test>
-  <roo:test>
-       <c>c</c>
-       <d>d</d>
-  </roo:test>
-</doc>
--- a/tests/misc/whitespace/whitespace013.out	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><out><b>
-   		elem1
-   		
-</b><b>   elem2   </b><b>
-   elem3</b><b>elem4			</b><b>
-   	elem5
-</b><b> elem6 </b></out>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace014.out	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><out><b>
-   		el1
-   		
-</b><b>   elem2   </b><c>elem3</c><c>elem4</c><b>
-   	item5
-</b><c>elem6</c></out>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace015.out	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><out>
-<b>elem1</b>
-<b>elem2</b>
-<b>elem3</b>
-<b>elem4</b>
-<b>elem5</b>
-<b>elem6</b>
-</out>
\ No newline at end of file
--- a/tests/misc/whitespace/whitespace016.out	Fri Apr 03 02:39:41 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><out>
-<b>el1</b>
-<b>elem2</b>
-<c>
-   elem3</c>
-<c>elem4			</c>
-<b>item5</b>
-<c> elem6 </c>
-</out>
\ No newline at end of file