Merge
authorabraaksm
Fri, 08 Mar 2019 16:52:44 +0100
changeset 2048 6c9cb0f4a859
parent 2047 fb9836ae6638 (current diff)
parent 2045 48cbfb000ccc (diff)
child 2049 12bc99373e8e
Merge
tests/fn/current-output-uri/_current-output-uri-test-set.xml
--- a/tests/decl/accumulator/_accumulator-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/_accumulator-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -592,6 +592,7 @@
       <created by="Michael Kay" on="2014-07-07"/>
       <modified by="Michael Kay" on="2014-08-01" change="Backlog (by AB), bug#26330 rename @new-value to @select" />
       <modified by="Abel Braaksma" on="2015-04-06" change="Bug 28410, change xsl:stylesheet to xsl:package (no version or name, not required)"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <dependencies>
          <feature value="streaming"/>
       </dependencies>
@@ -776,6 +777,7 @@
       <keywords>fn:accumulator-after</keywords>
       <created by="Michael Kay" on="2014-11-19"/>
       <modified by="Abel Braaksma" on="2015-04-06" change="Bug 28410, change xsl:stylesheet to xsl:package (no version or name, not required)"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <test>
          <stylesheet file="accumulator-039.xsl"/>
          <initial-template name="main"/>
@@ -1332,6 +1334,7 @@
       <description>Dynamic call to accumulator-after - non-streaming - succeeds with early binding of context item</description>
       <created by="Michael Kay" on="2016-11-22"/>
       <modified by="Michael Kay" on="2016-12-08" change="add expected result"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <dependencies>
          <feature value="higher_order_functions"/>
       </dependencies>
@@ -1351,6 +1354,7 @@
    <test-case name="accumulator-063">
       <description>Copying accumulator values using xsl:copy-of() before the first reference to the accumulator is evaluated</description>
       <created by="Michael Kay" on="2017-06-27"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <test>
          <stylesheet file="accumulator-063.xsl"/>
       </test>
@@ -1365,6 +1369,7 @@
    <test-case name="accumulator-064">
       <description>Copying accumulator values using fn:copy-of() before the first reference to the accumulator is evaluated</description>
       <created by="Michael Kay" on="2017-06-27"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <test>
          <stylesheet file="accumulator-064.xsl"/>
       </test>
@@ -1380,6 +1385,7 @@
       <description>Copying accumulator values using dynamic call on fn:copy-of() before the first reference to the accumulator is evaluated</description>
       <created by="Michael Kay" on="2017-06-27"/>
       <modified by="Michael Kay" on="2016-12-08" change="add HOF dependency"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <dependencies>
          <feature value="higher_order_functions"/>
       </dependencies>
@@ -1398,6 +1404,7 @@
       <description>Copying accumulator values using static call on fn:snapshot() before the first reference to the accumulator is evaluated</description>
       <created by="Michael Kay" on="2017-06-27"/>
       <modified by="Michael Kay" on="2018-11-07" change="add HOF dependency"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <dependencies>
          <feature value="higher_order_functions"/>
       </dependencies>
@@ -1416,6 +1423,7 @@
       <description>Copying accumulator values using dynamic call on fn:snapshot() before the first reference to the accumulator is evaluated</description>
       <created by="Michael Kay" on="2017-06-27"/>
       <modified by="Michael Kay" on="2017-08-28" change="add HOF dependency"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <dependencies>
          <feature value="higher_order_functions"/>
       </dependencies>
@@ -1493,6 +1501,7 @@
    <test-case name="accumulator-070">
       <description>xsl:copy-of combining copy-accumulators=yes with validation=strict</description>
       <created by="Michael Kay" on="2017-07-19"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <dependencies>
          <feature value="schema_aware"/>
       </dependencies>
@@ -1511,6 +1520,7 @@
    <test-case name="accumulator-071">
       <description>xsl:copy-of combining copy-accumulators=yes with copy-namespaces="no"</description>
       <created by="Michael Kay" on="2017-07-19"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <test>
          <stylesheet file="accumulator-071.xsl"/>
       </test>
@@ -1526,6 +1536,7 @@
    <test-case name="accumulator-072">
       <description>Same as -063 but with a call-template interposed (changes the Saxon execution path)</description>
       <created by="Michael Kay" on="2017-07-19"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Make main template public"/>
       <test>
          <stylesheet file="accumulator-072.xsl"/>
       </test>
--- a/tests/decl/accumulator/accumulator-032.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-032.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -27,7 +27,7 @@
     </xsl:for-each>
   </xsl:variable>
   
-  <xsl:template name="main">
+  <xsl:template name="main" visibility="public">
     <o><xsl:value-of select="$count"/></o>
   </xsl:template>
 </xsl:package>
--- a/tests/decl/accumulator/accumulator-039.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-039.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -14,7 +14,7 @@
       </xsl:for-each>
     </xsl:variable>
     
-    <xsl:template match="/" name="main">
+    <xsl:template match="/" name="main" visibility="public">
         <out>
           <last><xsl:value-of select="$v/w[last()]/accumulator-after('big')"/></last>
           <first><xsl:value-of select="$v/w[1]/accumulator-after('big')"/></first>
--- a/tests/decl/accumulator/accumulator-062.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-062.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -24,7 +24,7 @@
     </xsl:copy>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-063.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-063.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -31,7 +31,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-064.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-064.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -31,7 +31,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-065.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-065.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -33,7 +33,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-066.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-066.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -33,7 +33,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-067.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-067.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -33,7 +33,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-070.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-070.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -38,7 +38,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-071.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-071.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -32,7 +32,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
 
--- a/tests/decl/accumulator/accumulator-072.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/accumulator/accumulator-072.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -31,7 +31,7 @@
     <c-acc>{accumulator-before('f:elementNr')}</c-acc>
   </xsl:template>
   
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:apply-templates select="$data"/>
   </xsl:template>
   
--- a/tests/decl/use-package/_use-package-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/decl/use-package/_use-package-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -296,8 +296,9 @@
       <created by="Michael Kay" on="2013-07-18"/>
       <modified by="Michael Kay" on="2014-08-22" change="no xsl:stylesheet child of xsl:package"/>
       <modified by="John Lumley" on="2014-09-02" change="Declared serialization requirement"/>
-      <modified by="Abel Braaksma" on="2018-02-02" change="Use of exclude-result-prefixes was not taken into account in expected test result, see also variant -108b"/>
+      <modified by="Abel Braaksma" on="2019-02-02" change="Use of exclude-result-prefixes was not taken into account in expected test result, see also variant -108b"/>
       <modified by="Abel Braaksma" on="2019-02-19" change="Make initial template 'main' public, private named templates are not eligible initial templates (bug #30398)"/>
+      <modified by="Michael Kay" on="2019-03-05" change="Revert the change (now) dated 2019-02-02; the target namespace of xsl:namespace-alias appears in the result even if it is an excluded namespace"/>
       <environment ref="use-package-env-002"/>
       <test>
          <package file="use-package-108.xsl" role="principal"/>
@@ -305,7 +306,7 @@
          <output serialize="yes"/>
       </test>
       <result>
-         <serialization-matches><![CDATA[<out>ZZZZZZ</out>]]></serialization-matches>
+         <serialization-matches><![CDATA[<out xmlns:p="[^"]*">ZZZZZZ</out>]]></serialization-matches>
       </result>
    </test-case>
 
@@ -782,9 +783,10 @@
          <assert>/package-version = ('2.0.0-alpha')</assert>
       </result>
    </test-case>
-   <test-case name="use-package-210b">
+   <test-case name="use-package-210c">
       <description>Testing package versioning - version 2.0.0-a to 2.0.0-gamma, version resolution: support any version</description>
       <created by="Abel Braaksma" on="2019-02-26"/>
+      <modified by="Michael Kay" on="2019-03-05" change="made test name unique"/>
       <environment ref="use-package-env-004"/>
       <dependencies>
          <package_version_resolution value="unspecified" satisfied="true"/>
--- a/tests/fn/current-output-uri/_current-output-uri-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/current-output-uri/_current-output-uri-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -212,7 +212,8 @@
    
    <test-case name="current-output-uri-015">
       <description>Test absence of base output URI with fn:current-output-uri is not influenced by presence of xsl:output</description>
-      <created by="Abel Braaksma" on="2019-02-02"/>      
+      <created by="Abel Braaksma" on="2019-02-02"/> 
+      <modified by="Michael Kay" on="2019-03-05" change="use indent='no' to satisfy test catalog-004"/>
       <test>
          <stylesheet file="current-output-uri-015.xsl"/>
       </test>
--- a/tests/fn/current-output-uri/current-output-uri-015.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/current-output-uri/current-output-uri-015.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -3,7 +3,7 @@
 
   <!-- current-output-uri() initial value when not originally set in the test should be empty, regardless of xsl:output -->
   
-  <xsl:output indent="yes" method="xml" omit-xml-declaration="yes" />
+  <xsl:output indent="no" method="xml" omit-xml-declaration="yes" />
   
   <xsl:template name="xsl:initial-template">
     <out><xsl:value-of select="'empty: ' || empty(current-output-uri())"/></out>
--- a/tests/fn/document/_document-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/document/_document-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -1425,6 +1425,7 @@
       <description>
          Test document() function in an overriding package, with strip-space declarations differing between the two packages</description>
       <created by="Michael Kay" on="2016-06-11"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point public"/>
       <environment>
          <package uri="http://www.w3.org/xslts/document-2401a" package-version="3.0" file="document-2401a.xsl" role="secondary"/>        
       </environment>
--- a/tests/fn/document/document-2401b.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/document/document-2401b.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -12,7 +12,7 @@
    <t:use-package name="http://www.w3.org/xslts/document-2401a" package-version="3.0">
 
       <t:override>
-         <t:template name="a">
+         <t:template name="a" visibility="public">
             <out>
                <stripped>
                   <t:value-of select="count(document('doc14.xml')/*/text())"/>
--- a/tests/fn/load-xquery-module/_load-xquery-module-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/load-xquery-module/_load-xquery-module-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -17,6 +17,7 @@
    <test-case name="load-xquery-module-001">
       <description>Returns error, module is not available (non-existent file)</description>
       <created by="Michael Kay" on="2017-08-17"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point public"/>
       <environment ref="load-xquery-module-A"/>           
       <test>
          <stylesheet file="load-xquery-module-001.xsl"/>
@@ -29,6 +30,7 @@
    <test-case name="load-xquery-module-002">
       <description>Read value of a global variable from query module</description>
       <created by="Michael Kay" on="2017-08-17"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point public"/>
       <environment ref="load-xquery-module-A"/>           
       <test>
          <stylesheet file="load-xquery-module-002.xsl"/>
@@ -41,6 +43,7 @@
    <test-case name="load-xquery-module-003">
       <description>Invoke a function from query module</description>
       <created by="Michael Kay" on="2017-08-17"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point public"/>
       <environment ref="load-xquery-module-A"/>           
       <test>
          <stylesheet file="load-xquery-module-003.xsl"/>
@@ -53,6 +56,7 @@
    <test-case name="load-xquery-module-004">
       <description>Bind statically to a function from query module</description>
       <created by="Michael Kay" on="2017-08-17"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point public"/>
       <environment ref="load-xquery-module-A"/>           
       <test>
          <stylesheet file="load-xquery-module-004.xsl"/>
--- a/tests/fn/load-xquery-module/load-xquery-module-001.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/load-xquery-module/load-xquery-module-001.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -3,7 +3,7 @@
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:f="http://accum001/"
   exclude-result-prefixes="xs f" version="3.0"  declared-modes="no" expand-text="yes">
  
-  <xsl:template name="xsl:initial-template">
+  <xsl:template name="xsl:initial-template" visibility="public">
     <xsl:variable name="module" select="load-xquery-module('unknown-query')"/>
     <xsl:sequence select="$module?variables(xs:QName('magic'))"/>
   </xsl:template>
--- a/tests/fn/load-xquery-module/load-xquery-module-002.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/load-xquery-module/load-xquery-module-002.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -4,7 +4,7 @@
    
    <xsl:variable name="module-uri" select="'http://www.w3.org/fots/fn/load-xquery-module/valid/module'"/>
    
-   <xsl:template name="xsl:initial-template">
+   <xsl:template name="xsl:initial-template" visibility="public">
       <out>
          <xsl:variable name="module" select="load-xquery-module($module-uri)"/>
          <xsl:sequence select="$module?variables(QName($module-uri, 'var1'))"/>
--- a/tests/fn/load-xquery-module/load-xquery-module-003.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/load-xquery-module/load-xquery-module-003.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -4,7 +4,7 @@
    
    <xsl:variable name="module-uri" select="'http://www.w3.org/fots/fn/load-xquery-module/valid/module'"/>
    
-   <xsl:template name="xsl:initial-template">
+   <xsl:template name="xsl:initial-template" visibility="public">
       <out>
          <xsl:variable name="module" select="load-xquery-module($module-uri)"/>
          <xsl:sequence select="$module?functions(QName($module-uri, 'func1'))?0()"/>
--- a/tests/fn/load-xquery-module/load-xquery-module-004.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/load-xquery-module/load-xquery-module-004.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -8,7 +8,7 @@
    <xsl:variable name="module" select="load-xquery-module($module-uri)" static="yes"/>
    <xsl:variable name="fun" select="$module?functions(QName($module-uri, 'func1'))?0" static="yes"/>
    
-   <xsl:template name="xsl:initial-template">
+   <xsl:template name="xsl:initial-template" visibility="public">
       <out xsl:use-when="$fun instance of function(*)">        
          <xsl:sequence select="$fun()"/>
       </out>
--- a/tests/fn/transform/_transform-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/transform/_transform-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -60,6 +60,7 @@
    <test-case name="transform-005">
       <description>fn:transform() invoking a named package</description>
       <created by="Michael Kay" on="2018-04-25"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point (of dynamic stylesheet) public"/>
       <environment>
          <package file="transform-005a.xsl" role="secondary" uri="http://transform-005a/" package-version="1.0.2"/>
       </environment>
@@ -75,6 +76,7 @@
    <test-case name="transform-006">
       <description>fn:transform() selecting a named package by version range</description>
       <created by="Michael Kay" on="2018-04-25"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point (of dynamic stylesheet) public"/>
       <environment>
          <package file="transform-006a.xsl" role="secondary" uri="http://transform-006a/" package-version="1.0.5"/>
          <package file="transform-006b.xsl" role="secondary" uri="http://transform-006a/" package-version="2.0"/>
@@ -87,6 +89,22 @@
          <assert>/out/in = '1.0.5'</assert>
       </result>
    </test-case>
+   
+   <test-case name="transform-007">
+      <description>fn:transform() calling a named template that is private</description>
+      <created by="Michael Kay" on="2019-03-06"/>
+      <environment>
+         <package file="transform-006a.xsl" role="secondary" uri="http://transform-006a/" package-version="1.0.5"/>
+         <package file="transform-006b.xsl" role="secondary" uri="http://transform-006a/" package-version="2.0"/>
+      </environment>
+      <test>
+         <stylesheet file="transform-007.xsl"/>
+         <initial-template name="main"/>
+      </test>
+      <result>
+         <error code="XTDE0040"/>
+      </result>
+   </test-case>
 
 
 </test-set>
\ No newline at end of file
--- a/tests/fn/transform/transform-005a.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/transform/transform-005a.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -9,7 +9,7 @@
     expand-text="yes">
   
     
-    <xsl:template name="main">
+    <xsl:template name="main" visibility="public">
         <in/>
     </xsl:template>
 
--- a/tests/fn/transform/transform-006a.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/transform/transform-006a.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -9,8 +9,10 @@
     expand-text="yes">
   
     
-    <xsl:template name="main">
+    <xsl:template name="main" visibility="public">
         <in>1.0.5</in>
     </xsl:template>
+    
+    <xsl:template name="subsid"/>
 
 </xsl:package>
\ No newline at end of file
--- a/tests/fn/transform/transform-006b.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/fn/transform/transform-006b.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -9,7 +9,7 @@
     expand-text="yes">
   
     
-    <xsl:template name="main">
+    <xsl:template name="main" visibility="public">
         <in>2.0</in>
     </xsl:template>
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/fn/transform/transform-007.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    exclude-result-prefixes="xs"
+    version="3.0"
+    expand-text="yes">
+  
+    
+    <xsl:template name="main">
+        <out>
+            <xsl:copy-of select="transform( map { 'package-name': 'http://transform-006a/', 'package-version' : '1.*',
+            'initial-template' : QName('', 'subsid'), 'delivery-format' : 'raw'})?output"/>
+        </out>
+    </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
--- a/tests/insn/next-match/_next-match-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/insn/next-match/_next-match-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -637,6 +637,7 @@
       <description>Test of xsl:next-match across package boundaries.</description>
       <created by="Michael Kay" on="2017-11-02"/>
       <modified by="Abel Braaksma" on="2019-02-28" change="Make package discoverable by its URI-file mapping (name is itself not necessarily the URI of the package)"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make initial mode public"/>
       <environment ref="next-match022"/>
       <dependencies>
          <spec value="XSLT30+"/>
@@ -655,6 +656,7 @@
       <description>Test of xsl:next-match across package boundaries via call-template.</description>
       <created by="Michael Kay" on="2017-11-02"/>
       <modified by="Abel Braaksma" on="2019-02-28" change="Make package discoverable by its URI-file mapping (name is itself not necessarily the URI of the package)"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make initial mode public"/>
       <environment ref="next-match022"/>
       <dependencies>
          <spec value="XSLT30+"/>
--- a/tests/insn/next-match/next-match-036.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/insn/next-match/next-match-036.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -4,6 +4,7 @@
    <!-- Purpose: next-match across package boundaries -->
    
    <t:use-package name="http://xslt-tests/next-match-036-lib">
+      <t:accept component="mode" names="m" visibility="public"/>
       <t:override>
          <t:template match="tag" mode="m">
             <tag2><t:next-match/></tag2>
--- a/tests/insn/next-match/next-match-037.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/insn/next-match/next-match-037.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -4,6 +4,7 @@
    <!-- Purpose: next-match across package boundaries -->
    
    <t:use-package name="http://xslt-tests/next-match-036-lib">
+      <t:accept component="mode" names="m" visibility="public"/>
       <t:override>
          <t:template match="tag" mode="m">
             <tag2><t:call-template name="ttt"/></tag2>
--- a/tests/insn/sort/_sort-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/insn/sort/_sort-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -303,7 +303,7 @@
       </result>
    </test-case>
 
-   <test-case name="sort-012err">
+   <!--<test-case name="sort-012err">
       <description>Originally this was sort-012, see bug #30386. Combination of data-type="number" and collation is an error.</description>
       <created by="Abel Braaksma" on="2018-12-27"/>
       <environment ref="sort008"/>
@@ -316,7 +316,7 @@
       <result>
          <error code="XTDE1030" />
       </result>
-   </test-case>
+   </test-case>-->
 
    <test-case name="sort-013">
       <description>Test xsl:perform-sort</description>
--- a/tests/misc/forwards/_forwards-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/misc/forwards/_forwards-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -53,6 +53,7 @@
    <test-case name="forwards-004">
       <description>Same as forwards-002 but using xsl:package. (Extrapolates what the spec actually says)</description>
       <created by="Michael Kay" on="2017-06-19"/>
+      <modified by="Michael Kay" on="2019-03-06" change="make entry point public"/>
       <test>
          <stylesheet file="forwards-004.xsl"/>
          <initial-template name="main"/>
--- a/tests/misc/forwards/forwards-004.xsl	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/misc/forwards/forwards-004.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <xsl:package name="urn:package:forwards-004" package-version="4.0.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="3.0">
 
-  <xsl:template name="main">
+  <xsl:template name="main" visibility="public">
     <out>ok</out>
   </xsl:template>
   
--- a/tests/strm/sx-GeneralComp-eq/_sx-GeneralComp-eq-test-set.xml	Fri Mar 08 16:52:10 2019 +0100
+++ b/tests/strm/sx-GeneralComp-eq/_sx-GeneralComp-eq-test-set.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -663,7 +663,21 @@
       <result early-exit-possible="true">
          <assert>/out = 'true'</assert>
       </result>
-   </test-case>  
+   </test-case> 
+   
+   <test-case name="sx-gc-eq-801">
+      <description>"=" comparing untypedAtomic to string. Success result. Saxon bug 4150.</description>
+      <created by="Michael Kay" on="2019-03-03"/>
+      <environment>
+         <source file="sx-gc-eq-801.xml" role="." streaming="true"/>
+      </environment>
+      <test>
+         <stylesheet file="sx-gc-eq-801.xsl"/>
+      </test>
+      <result>
+         <assert>/ProteinEntry = "hello"</assert>
+      </result>
+   </test-case> 
 
    <test-case name="sx-gc-eq-901">
       <description>Test of xsl:stream instruction with "=", filtered with predicate that atomizes.</description>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/strm/sx-GeneralComp-eq/sx-gc-eq-801.xml	Fri Mar 08 16:52:44 2019 +0100
@@ -0,0 +1,190 @@
+<?xml version="1.0"?>
+<ProteinDatabase id="PIR-PSD" release="70.03" date="09-Nov-2001">
+    <Database>
+        
+        P R O T E I N  S E Q U E N C E  D A T A B A S E
+        of PIR-International
+        
+        Release 70.03, November 09, 2001
+        262525 sequences, 89717977 residues
+        
+        Protein Information Resource (PIR)*
+        National Biomedical Research Foundation
+        3900 Reservoir Road, N.W.,
+        Washington, DC  20007, USA
+        
+        Japan International Protein           Munich Information Center for
+        Information Database (JIPID)             Protein Sequences (MIPS)
+        Amakubo 1-16-1          GSF-Forschungszentrum f. Umwelt und Gesundheit
+        Tsukuba 305-0005, Japan            am Max-Planck-Instut f. Biochemie
+        Am Klopferspitz 18, D-82152 Martinsried, FRG
+        
+        This database may be redistributed without prior consent, provided that
+        this notice be given to each user and that the words "Derived from" shall
+        precede this notice if the database has been altered by the redistributor.
+        
+        Copyright 2000, PIR-International.
+        
+        *PIR is a registered mark of NBRF.
+    </Database>
+    <ProteinEntry id="CCHU">
+        <header>
+            <uid>CCHU</uid>
+            <accession>A31764</accession>
+            <accession>A05676</accession>
+            <accession>I55192</accession>
+            <accession>A00001</accession>
+            <created_date>24-Apr-1984</created_date>
+            <seq-rev_date>30-Sep-1991</seq-rev_date>
+            <txt-rev_date>28-Jul-2000</txt-rev_date>
+        </header>
+        <protein>
+            <name>cytochrome c [validated]</name>
+        </protein>
+        <organism>
+            <source>human</source>
+            <common>man</common>
+            <formal>Homo sapiens</formal>
+        </organism>
+        <reference>
+            <refinfo refid="A31764">
+                <authors>
+                    <author>Evans, M.J.</author>
+                    <author>Scarpulla, R.C.</author>
+                </authors>
+                <citation>Proc. Natl. Acad. Sci. U.S.A.</citation>
+                <volume>85</volume><year>1988</year><pages>9625-9629</pages>
+                <title>The human somatic cytochrome c gene: two classes of processed pseudogenes demarcate a period of rapid molecular evolution.</title>
+                <xrefs>
+                    <xref><db>MUID</db><uid>89071748</uid></xref>
+                </xrefs>
+            </refinfo>
+            <accinfo label="EVA">
+                <accession>A31764</accession>
+                <mol-type>DNA</mol-type>
+                <seq-spec>1-105</seq-spec>
+                <xrefs>
+                    <xref><db>GB</db><uid>M22877</uid></xref>
+                    <xref><db>NID</db><uid>g181241</uid></xref>
+                    <xref><db>PIDN</db><uid>AAA35732.1</uid></xref>
+                    <xref><db>PID</db><uid>g181242</uid></xref>
+                </xrefs>
+            </accinfo>
+        </reference>
+        <reference>
+            <refinfo refid="A05676">
+                <authors>
+                    <author>Matsubara, H.</author>
+                    <author>Smith, E.L.</author>
+                </authors>
+                <citation>J. Biol. Chem.</citation>
+                <volume>238</volume><year>1963</year><pages>2732-2753</pages>
+                <title>Human heart cytochrome c. Chymotryptic peptides, tryptic peptides, and the complete amino acid sequence.</title>
+            </refinfo>
+            <accinfo label="MATS">
+                <accession>A05676</accession>
+                <mol-type>protein</mol-type>
+                <seq-spec>2-28;29-46;47-100;101-105</seq-spec>
+            </accinfo>
+        </reference>
+        <reference>
+            <refinfo refid="A00001">
+                <authors>
+                    <author>Matsubara, H.</author>
+                    <author>Smith, E.L.</author>
+                </authors>
+                <citation>J. Biol. Chem.</citation>
+                <volume>237</volume><year>1962</year><pages>3575-3576</pages>
+                <title>The amino acid sequence of human heart cytochrome c.</title>
+            </refinfo>
+            <contents>annotation</contents>
+            <note>66-Leu is found in 10% of the molecules in pooled protein</note>
+        </reference>
+        <reference>
+            <refinfo refid="I55192">
+                <authors>
+                    <author>Tanaka, Y.</author>
+                    <author>Ashikari, T.</author>
+                    <author>Shibano, Y.</author>
+                    <author>Amachi, T.</author>
+                    <author>Yoshizumi, H.</author>
+                    <author>Matsubara, H.</author>
+                </authors>
+                <citation>J. Biochem.</citation>
+                <volume>103</volume><year>1988</year><pages>954-961</pages>
+                <title>Construction of a human cytochrome c gene and its functional expression in Saccharomyces cerevisiae.</title>
+                <xrefs>
+                    <xref><db>MUID</db><uid>89008207</uid></xref>
+                </xrefs>
+            </refinfo>
+            <accinfo label="RES">
+                <accession>I55192</accession>
+                <status>translated from GB/EMBL/DDBJ</status>
+                <mol-type>mRNA</mol-type>
+                <seq-spec>78-105</seq-spec>
+                <xrefs>
+                    <xref><db>GB</db><uid>D00265</uid></xref>
+                    <xref><db>NID</db><uid>g2897691</uid></xref>
+                    <xref><db>PIDN</db><uid>BAA00187.1</uid></xref>
+                    <xref><db>PID</db><uid>g219557</uid></xref>
+                </xrefs>
+            </accinfo>
+        </reference>
+        <genetics>
+            <introns>57/1</introns>
+        </genetics>
+        <classification>
+            <superfamily>cytochrome c</superfamily>
+            <superfamily>cytochrome c homology</superfamily>
+        </classification>
+        <keywords>
+            <keyword>acetylated amino end</keyword>
+            <keyword>chromoprotein</keyword>
+            <keyword>electron transfer</keyword>
+            <keyword>heme</keyword>
+            <keyword>iron</keyword>
+            <keyword>metalloprotein</keyword>
+            <keyword>mitochondrion</keyword>
+            <keyword>oxidative phosphorylation</keyword>
+            <keyword>polymorphism</keyword>
+            <keyword>respiratory chain</keyword>
+        </keywords>
+        <feature label="MAT">
+            <feature-type>product</feature-type>
+            <description>cytochrome c</description>
+            <seq-spec>2-105</seq-spec>
+            <status>experimental</status>
+        </feature>
+        <feature label="CYC">
+            <feature-type>domain</feature-type>
+            <description>cytochrome c homology</description>
+            <seq-spec>5-99</seq-spec>
+        </feature>
+        <feature>
+            <feature-type>modified-site</feature-type>
+            <description>acetylated amino end (Gly) (in mature form)</description>
+            <seq-spec>2</seq-spec>
+            <status>experimental</status>
+        </feature>
+        <feature>
+            <feature-type>binding-site</feature-type>
+            <description>heme (Cys) (covalent)</description>
+            <seq-spec>15,18</seq-spec>
+            <status>experimental</status>
+        </feature>
+        <feature>
+            <feature-type>binding-site</feature-type>
+            <description>heme iron (His, Met) (axial ligands)</description>
+            <seq-spec>19,81</seq-spec>
+            <status>predicted</status>
+        </feature>
+        <summary>
+            <length>105</length>
+            <type>complete</type>
+        </summary>
+        <sequence>
+            MGDVEKGKKIFIMKCSQCHTVEKGGKHKTGPNLHGLFGRKTGQAPGYSYTAANKNKGIIW
+            GEDTLMEYLENPKKYIPGTKMIFVGIKKKEERADLIAYLKKATNE
+        </sequence>
+    </ProteinEntry>
+</ProteinDatabase>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/strm/sx-GeneralComp-eq/sx-gc-eq-801.xsl	Fri Mar 08 16:52:44 2019 +0100
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                 
+    version="3.0">
+    
+    <xsl:output method="xml" indent="yes"/>
+    
+    <xsl:mode streamable="true"/>
+    
+    <xsl:template match="ProteinDatabase">
+        <ProteinEntry>
+            <xsl:iterate select="ProteinEntry">
+                <xsl:choose>
+                    <xsl:when test="header/uid = 'CCHU'">                  
+                        <xsl:value-of select="'hello'"/>                  
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:break/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:iterate>
+        </ProteinEntry>
+    </xsl:template>
+    
+</xsl:stylesheet>
\ No newline at end of file