Merge pull request #1121 from ndw/iss-1116

Attempt to finesse 3.0 vs 3.1
xproc · Jan 11, 2025 · 068aec1 · 068aec1
2 parents f7e9e63 + e6c8420
commit 068aec1
Show file tree

Hide file tree

Showing 40 changed files with 113 additions and 66 deletions.
diff --git a/build.gradle b/build.gradle
@@ -132,7 +132,8 @@ spec_schemas.dependsOn download_core30_rng
 
 def schemaList = ["xproc.rnc", "xproc.rng",
                   "xproc10.rnc", "xproc10.rng",
-                  "xproc30.rnc", "xproc30.rng"]
+                  "xproc30.rnc", "xproc30.rng",
+                  "xproc31.rnc", "xproc31.rng"]
 
 schemaList.each { schema ->
   def taskname = "download_" + schema.replace(".", "_")
@@ -324,6 +325,7 @@ task xproc_assets(dependsOn: [ "xproc:images", "xproc_web_assets", "xproc_schema
         include "xproc.rn*"
         include "xproc10.rn*"
         include "xproc30.rn*"
+        include "xproc31.rn*"
       }
     }
   }

diff --git a/src/main/xml/bibliography.xml b/src/main/xml/bibliography.xml
@@ -31,6 +31,12 @@ Step Library</citetitle>.
 Norman Walsh, Achim Berndzen, Gerrit Imsieke and Erik Siegel, editors.
 </bibliomixed>
 
+<bibliomixed xml:id="steps31"><abbrev>Steps 3.1</abbrev>
+<citetitle xlink:href="https://spec.xproc.org/3.1/steps/">XProc 3.1: Standard
+Step Library</citetitle>.
+Norman Walsh, Achim Berndzen, Gerrit Imsieke and Erik Siegel, editors.
+</bibliomixed>
+
 <bibliomixed xml:id="xproc30-steps"><abbrev>XProc 3.0 Steps</abbrev>
 <citetitle xlink:href="https://spec.xproc.org/">XProc 3.0 Steps:
 An Introduction</citetitle>.

diff --git a/tools/xsl/rngsyntax.xsl b/tools/xsl/rngsyntax.xsl
@@ -251,10 +251,10 @@
   <xsl:param name="avt" select="()"/>
 
   <!-- A totally special case: allow the version attribute to be of type xs:decimal,
-       but display its fixed value as "3.0" without the quotation marks that make
+       but display its fixed value as "3.1" without the quotation marks that make
        it look like a string. -->
 
-  <ss:attribute name="{@name}" optional="{$repeat}" avt="false" type="3.0"/>
+  <ss:attribute name="{@name}" optional="{$repeat}" avt="false" type="3.1"/>
 </xsl:template>
 
 <xsl:template match="rng:attribute[@name]" priority="10">

diff --git a/xproc/src/main/examples/choose.xml b/xproc/src/main/examples/choose.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/doctemp-1.xml b/xproc/src/main/examples/doctemp-1.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:c="http://www.w3.org/ns/xproc-step"
-                name="main" version="3.0">
+                name="main" version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 <p:option name="username" required="true"/>

diff --git a/xproc/src/main/examples/doctemp-2.xml b/xproc/src/main/examples/doctemp-2.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:c="http://www.w3.org/ns/xproc-step"
-                name="main" version="3.0">
+                name="main" version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 <p:option name="username" required="true"/>

diff --git a/xproc/src/main/examples/doctemp-3.xml b/xproc/src/main/examples/doctemp-3.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                name="main" version="3.0">
+                name="main" version="3.1">
 <p:output port="result">
   <p:pipe step="vars" port="result"/>
 </p:output>

diff --git a/xproc/src/main/examples/exclude-pfx.xml b/xproc/src/main/examples/exclude-pfx.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:c="http://www.w3.org/ns/xproc-step"
-                version="3.0">
+                version="3.1">
   <p:output port="result" serialization="map { 'indent': true() }"/>
 
   <p:identity xmlns:a="http://example.com/a"

diff --git a/xproc/src/main/examples/fig1-abbr.xml b/xproc/src/main/examples/fig1-abbr.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 name="xinclude-and-validate"
-                version="3.0">
+                version="3.1">
   <p:input port="source" primary="true"/>
   <p:input port="schemas" sequence="true"/>
   <p:output port="result"/>

diff --git a/xproc/src/main/examples/fig1.xml b/xproc/src/main/examples/fig1.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 name="xinclude-and-validate"
-                version="3.0">
+                version="3.1">
   <p:input port="source" primary="true"/>
   <p:input port="schemas" sequence="true"/>
   <p:output port="result">

diff --git a/xproc/src/main/examples/fig2.xml b/xproc/src/main/examples/fig2.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 name="xinclude-and-validate"
-                version="3.0">
+                version="3.1">
   <p:input port="source"/>
   <p:input port="schemas" sequence="true"/>
   <p:output port="result"/>

diff --git a/xproc/src/main/examples/for-each.xml b/xproc/src/main/examples/for-each.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/group.xml b/xproc/src/main/examples/group.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/identity.xml b/xproc/src/main/examples/identity.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0">
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1">
 
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/input-doc.xml b/xproc/src/main/examples/input-doc.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0">
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1">
 <p:output port="result"/>
 <p:identity name="irrelevant">
 

diff --git a/xproc/src/main/examples/input-select.xml b/xproc/src/main/examples/input-select.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"  version="3.0">
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"  version="3.1">
 <p:output port="result"/>
 <p:identity>
 

diff --git a/xproc/src/main/examples/opns-2.xml b/xproc/src/main/examples/opns-2.xml
@@ -1,7 +1,7 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
 	        xmlns:ex="http://example.org/ns/ex"
 	        xmlns:h="http://www.w3.org/1999/xhtml"
-                type="ex:delete-in-div" version="3.0">
+                type="ex:delete-in-div" version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 <p:option name="divchild" required="true"/>

diff --git a/xproc/src/main/examples/par1.xml b/xproc/src/main/examples/par1.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/par1b.xml b/xproc/src/main/examples/par1b.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                name="main" version="3.0">
+                name="main" version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/parameter.xml b/xproc/src/main/examples/parameter.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-	        name="main" version="3.0">
+	        name="main" version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/pipeline-library.xml b/xproc/src/main/examples/pipeline-library.xml
@@ -1,6 +1,6 @@
 <p:library xmlns:p="http://www.w3.org/ns/xproc"
 	   xmlns:px="http://example.org/ns/pipelines"
-	   version="3.0">
+	   version="3.1">
 
 <p:import href="ancillary-library.xml"/>
 <p:import href="other-pipeline.xml"/>

diff --git a/xproc/src/main/examples/pipeline.xml b/xproc/src/main/examples/pipeline.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/shadow.xml b/xproc/src/main/examples/shadow.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" version="3.0">
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" version="3.1">
 
   <p:option name="bname" as="xs:integer" select="1"/>
   <p:identity message="NAME1={$bname}">

diff --git a/xproc/src/main/examples/simple-default.xml b/xproc/src/main/examples/simple-default.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/simple-explicit.xml b/xproc/src/main/examples/simple-explicit.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0">
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1">
 <p:input port="source"/>
 <p:output port="result">
   <p:pipe step="transform" port="result"/>

diff --git a/xproc/src/main/examples/step-types-1.xml b/xproc/src/main/examples/step-types-1.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0"
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1"
   xmlns:mysteps="http://.../ns/mysteps">
 
   <p:input port="source"/>

diff --git a/xproc/src/main/examples/step-types-2.xml b/xproc/src/main/examples/step-types-2.xml
@@ -1,4 +1,4 @@
-<p:declare-step type="mysteps:add-timestamp-attribute" version="3.0"
+<p:declare-step type="mysteps:add-timestamp-attribute" version="3.1"
                 xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:mysteps="http://.../ns/mysteps">
   <p:input port="source"/>

diff --git a/xproc/src/main/examples/step-types-3.xml b/xproc/src/main/examples/step-types-3.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0"
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1"
   xmlns:mysteps="http://.../ns/mysteps">
 
   <p:import href="add-timestamp-attribute.xpl"/>

diff --git a/xproc/src/main/examples/step-types-4.xml b/xproc/src/main/examples/step-types-4.xml
@@ -1,4 +1,4 @@
-<p:library version="3.0" xmlns:p="http://www.w3.org/ns/xproc" 
+<p:library version="3.1" xmlns:p="http://www.w3.org/ns/xproc" 
   xmlns:mysteps="http://.../ns/mysteps">
 
   <p:declare-step type="mysteps:add-timestamp-attribute">

diff --git a/xproc/src/main/examples/trycatch.xml b/xproc/src/main/examples/trycatch.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
 		xmlns:c="http://www.w3.org/ns/xproc/results"
-		version="3.0">
+		version="3.1">
 <p:output port="result"/>
 
 <p:try>

diff --git a/xproc/src/main/examples/using-names-1.xml b/xproc/src/main/examples/using-names-1.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0" 
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1" 
     name="main-step">
 
   <p:input port="source" primary="true"/>

diff --git a/xproc/src/main/examples/using-names-2.xml b/xproc/src/main/examples/using-names-2.xml
@@ -1,4 +1,4 @@
-<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.0" 
+<p:declare-step xmlns:p="http://www.w3.org/ns/xproc" version="3.1" 
     name="main-step">
 
   <p:input port="source" primary="true"/>

diff --git a/xproc/src/main/examples/viewport.xml b/xproc/src/main/examples/viewport.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/xinclude.xml b/xproc/src/main/examples/xinclude.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/xpathcontext.xml b/xproc/src/main/examples/xpathcontext.xml
@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                xmlns:xp="x" type="xp:x" version="3.0">
+                xmlns:xp="x" type="xp:x" version="3.1">
 <p:output port="result" sequence="true"/>
 
 <p:variable name="home" select="'http://example.com/docs'"/>

diff --git a/xproc/src/main/examples/xslt-empty.xml b/xproc/src/main/examples/xslt-empty.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/examples/xslt.xml b/xproc/src/main/examples/xslt.xml
@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

diff --git a/xproc/src/main/xml/ancillary.xml b/xproc/src/main/xml/ancillary.xml
@@ -9,6 +9,14 @@
 ancillary files.</para>
 
 <variablelist>
+<varlistentry>
+<term><link xlink:href="xproc31.rnc"/>, <link xlink:href="xproc31.rng"/></term>
+<listitem>
+<para>A RELAX NG Schema for XProc 3.1 pipelines, in compact or XML form.
+</para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term><link xlink:href="xproc30.rnc"/>, <link xlink:href="xproc30.rng"/></term>
 <listitem>
@@ -29,11 +37,11 @@ ancillary files.</para>
 <term><link xlink:href="xproc.rnc"/>, <link xlink:href="xproc.rng"/></term>
 <listitem>
 <para>A RELAX NG Schema for XProc pipelines, in compact or XML form.
-It will validate either XProc 1.0 pipelines or XProc 3.0 pipelines,
+It will validate XProc 1.0, 3.0, or 3.1 pipelines,
 depending on the value of the version attribute.
 </para>
-<para>In order to use this schema, you must also download the 1.0 and 3.0
-schemas; they are included into this one.</para>
+<para>In order to use this schema, you must also download the 1.0, 3.0, and 3.1
+schemas; they are included by reference into this one.</para>
 </listitem>
 </varlistentry>
 

diff --git a/xproc/src/main/xml/references.xml b/xproc/src/main/xml/references.xml
@@ -7,7 +7,7 @@
 <section xml:id="normative-references">
   <title>Normative References</title>
   <bibliolist>
-    <bibliomixed xml:id="steps30"/>
+    <bibliomixed xml:id="steps31"/>
     <bibliomixed xml:id="xml-infoset-rec"/>
     <bibliomixed xml:id="xml10"/>
     <bibliomixed xml:id="xmlns10"/>