You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2001/01/31 23:38:06 UTC
cvs commit: xml-xalan/test/tests/conf/lre lre18.xsl lre17.xml lre17.xsl lre18.xml inclre05.xsl lre04.xsl lre05.xml lre05.xsl lre08.xsl lre15.xsl implre05.xsl
dmarston 01/01/31 14:38:05
Modified: test/tests/conf/lre inclre05.xsl lre04.xsl lre05.xml
lre05.xsl lre08.xsl lre15.xsl implre05.xsl
Added: test/tests/conf/lre lre18.xsl lre17.xml lre17.xsl lre18.xml
Log:
Revise output for easier comparison to Gold
Revision Changes Path
1.2 +4 -4 xml-xalan/test/tests/conf/lre/inclre05.xsl
Index: inclre05.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/inclre05.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- inclre05.xsl 2000/12/17 18:43:40 1.1
+++ inclre05.xsl 2001/01/31 22:37:52 1.2
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:ped="http://tester.com">
+ xmlns:ped="http://tester.com">
<xsl:template match="doc3">
- <include />
+ <sub-element-in-include />
</xsl:template>
-
+
</xsl:stylesheet>
1.2 +4 -5 xml-xalan/test/tests/conf/lre/lre04.xsl
Index: lre04.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre04.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lre04.xsl 2000/12/17 18:43:40 1.1
+++ lre04.xsl 2001/01/31 22:37:53 1.2
@@ -1,8 +1,7 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:ped="http://tester.com"
- xmlns:bdd="http://buster.com"
- xmlns:jad="http://administrator.com">
+ xmlns:bdd="http://buster.com"
+ xmlns:jad="http://administrator.com">
<!-- FileName: lre04 -->
<!-- Document: http://www.w3.org/TR/xslt -->
@@ -14,9 +13,9 @@
bearing the exclude-result-prefixes or xsl:exclude-result-prefixes attribute. -->
<xsl:template match="doc">
- <out x="by the corner" xsl:if= "my if" /><xsl:text>
</xsl:text>
+ <out x="by the corner"><xsl:text>
</xsl:text>
<sits x="little jack horner" xsl:exclude-result-prefixes="jad"/><xsl:text>
</xsl:text>
- <minding x="his peas and queues" xsl:exclude-result-prefixes="jad bdd"/>
+ <minding x="his peas and queues" xsl:exclude-result-prefixes="jad bdd"/></out>
</xsl:template>
</xsl:stylesheet>
1.2 +3 -3 xml-xalan/test/tests/conf/lre/lre05.xml
Index: lre05.xml
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre05.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lre05.xml 2000/12/17 18:43:40 1.1
+++ lre05.xml 2001/01/31 22:37:53 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<docs>
-<doc1/>
-<doc2/>
-<doc3/>
+ <doc1/>
+ <doc2/>
+ <doc3/>
</docs>
1.2 +21 -8 xml-xalan/test/tests/conf/lre/lre05.xsl
Index: lre05.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre05.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lre05.xsl 2000/12/17 18:43:40 1.1
+++ lre05.xsl 2001/01/31 22:37:54 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:ped="http://tester.com">
+ xmlns:ped="http://tester.com">
<xsl:import href="implre05.xsl"/>
<xsl:include href="inclre05.xsl"/>
@@ -10,14 +10,27 @@
<!-- DocVersion: 19991116 -->
<!-- Section: 7.1.1 Literal Result Elements-->
<!-- Creator: Paul Dick -->
- <!-- Purpose: a subtree rooted at an xsl:stylesheet element does not include any
- stylesheets imported or included by children of that xsl:stylesheet element. -->
+ <!-- Purpose: Show that exclude-result-prefixes is scoped to just it's LRE. -->
-<xsl:template match="doc1">
- <out xsl:exclude-result-prefixes="ped">
- <xsl:apply-imports/>
- <xsl:apply-templates select="doc3"/>
- </out>
+ <!-- The designation of a namespace as an excluded namespace is
+ effective within the subtree of the stylesheet rooted at the element
+ bearing the exclude-result-prefixes or xsl:exclude-result-prefixes attribute.
+ A subtree rooted at an xsl:stylesheet element does not include any
+ stylesheets imported or included by children of that xsl:stylesheet element. -->
+
+ <!-- The ped namespace is excluded from main and foo, but not from the sub-elements that
+ got placed in main by other templates. In fact, it has to be re-declared for each of
+ those sub-elements. -->
+
+<xsl:template match="docs">
+ <main xsl:exclude-result-prefixes="ped">
+ <foo/>
+ <xsl:apply-templates/>
+ </main>
</xsl:template>
+<xsl:template match="doc1">
+ <sub-element-in-main />
+</xsl:template>
+
</xsl:stylesheet>
1.2 +4 -2 xml-xalan/test/tests/conf/lre/lre08.xsl
Index: lre08.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre08.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lre08.xsl 2000/12/17 18:43:40 1.1
+++ lre08.xsl 2001/01/31 22:37:55 1.2
@@ -10,8 +10,10 @@
attribute value template. -->
<xsl:template match="/">
- <xsl:element name="{.//doc2/doc3/a/@level}"/>
- <xsl:element name="{.//*[starts-with(name(.),'ba')]}"/>
+ <out>
+ <xsl:element name="{.//doc2/doc3/a/@level}"/>
+ <xsl:element name="{.//*[starts-with(name(.),'ba')]}"/>
+ </out>
</xsl:template>
</xsl:stylesheet>
1.2 +1 -12 xml-xalan/test/tests/conf/lre/lre15.xsl
Index: lre15.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/lre15.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lre15.xsl 2000/12/17 18:43:40 1.1
+++ lre15.xsl 2001/01/31 22:37:55 1.2
@@ -15,7 +15,7 @@
only work to omit namespace declarations that are not actually used. -->
<xsl:template match="doc">
- <out x="by the corner" xsl:if= "my if">
+ <out x="by the corner" xsl:exclude-result-prefixes="ped">
<jad:output1/>
<jad:output2>
<jad:output2a/>
@@ -25,17 +25,6 @@
<ljh:output2a/>
</ljh:output2>
</out>
- <sits x="little jack horner" xsl:exclude-result-prefixes="ped jad"/>
- <minding x="his peas and queues" xsl:exclude-result-prefixes="jad ljh">
- <jad:output1/>
- <jad:output2>
- <jad:output2a/>
- </jad:output2>
- <ljh:output1/>
- <ljh:output2>
- <ljh:output2a/>
- </ljh:output2>
- </minding>
</xsl:template>
</xsl:stylesheet>
1.2 +4 -4 xml-xalan/test/tests/conf/lre/implre05.xsl
Index: implre05.xsl
===================================================================
RCS file: /home/cvs/xml-xalan/test/tests/conf/lre/implre05.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- implre05.xsl 2000/12/17 18:43:40 1.1
+++ implre05.xsl 2001/01/31 22:37:56 1.2
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
- xmlns:ped="http://tester.com">
+ xmlns:ped="http://tester.com">
<xsl:template match="doc2">
- <import />
+ <sub-element-in-import />
</xsl:template>
-
+
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/lre/lre18.xsl
Index: lre18.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:ped="http://tester.com"
xmlns:ljh="http://buster.com"
xmlns:jad="http://administrator.com">
<xsl:output method="xml" indent="yes"/>
<!-- FileName: lre18 -->
<!-- Document: http://www.w3.org/TR/xslt -->
<!-- DocVersion: 19991116 -->
<!-- Section: 7.1.1 Literal Result Elements-->
<!-- Creator: Paul Dick -->
<!-- Purpose: xsl:exclude-result-prefixes should
only work to omit namespace declarations that are not actually used. -->
<xsl:template match="doc">
<minding x="his peas and queues" xsl:exclude-result-prefixes="jad ljh">
<jad:output1/>
<jad:output2>
<jad:output2a/>
</jad:output2>
<ljh:output1/>
<ljh:output2>
<ljh:output2a/>
</ljh:output2>
</minding>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/lre/lre17.xml
Index: lre17.xml
===================================================================
<?xml version="1.0"?>
<doc>
</doc>
1.1 xml-xalan/test/tests/conf/lre/lre17.xsl
Index: lre17.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:ped="http://tester.com"
xmlns:ljh="http://buster.com"
xmlns:jad="http://administrator.com">
<xsl:output method="xml" indent="yes"/>
<!-- FileName: lre17 -->
<!-- Document: http://www.w3.org/TR/xslt -->
<!-- DocVersion: 19991116 -->
<!-- Section: 7.1.1 Literal Result Elements-->
<!-- Creator: Paul Dick -->
<!-- Purpose: xsl:exclude-result-prefixes should
only work to omit namespace declarations that are not actually used. -->
<xsl:template match="doc">
<sits x="little jack horner" xsl:exclude-result-prefixes="ped jad"/>
</xsl:template>
</xsl:stylesheet>
1.1 xml-xalan/test/tests/conf/lre/lre18.xml
Index: lre18.xml
===================================================================
<?xml version="1.0"?>
<doc>
</doc>