From 741fedb0da7852b042fa3a84594294ece3946f02 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Tue, 20 Aug 2024 16:47:17 +0100 Subject: [PATCH] Editorial updates for last call --- src/main/xml/bibliography.xml | 14 ++++++++++ step-file/src/main/xml/specification.xml | 21 ++++++++------- step-ixml/src/main/examples/ambig-1.xml | 2 +- step-ixml/src/main/examples/ambig-2.xml | 2 +- step-ixml/src/main/examples/ambig-3.xml | 2 +- step-ixml/src/main/examples/dates-1.xml | 2 +- step-ixml/src/main/examples/dates-2.xml | 2 +- step-ixml/src/main/examples/dates-3.xml | 2 +- step-ixml/src/main/xml/specification.xml | 27 ++++++++++++------- step-mail/src/main/xml/specification.xml | 25 ++++++++++------- step-os/src/main/examples/exec-as1.xml | 2 +- step-os/src/main/examples/exec-as2.xml | 2 +- step-os/src/main/xml/specification.xml | 23 +++++++++------- .../src/main/xml/specification.xml | 21 ++++++++------- step-rdf/src/main/xml/specification.xml | 7 +++-- .../main/examples/transform-n-validate.xml | 2 +- step-run/src/main/xml/specification.xml | 26 +++++++++++------- step-text/src/main/xml/specification.xml | 25 +++++++++++------ .../src/main/xml/specification.xml | 25 +++++++++-------- steps/src/main/examples/doctemp-1.xml | 2 +- steps/src/main/examples/doctemp-2.xml | 2 +- steps/src/main/examples/xquery.xml | 2 +- steps/src/main/xml/common-features.xml | 2 +- steps/src/main/xml/references.xml | 2 +- steps/src/main/xml/specification.xml | 9 +++---- steps/src/main/xml/steps/compress.xml | 2 +- steps/src/main/xml/steps/set-properties.xml | 2 +- steps/src/main/xml/steps/store.xml | 2 +- 28 files changed, 155 insertions(+), 102 deletions(-) diff --git a/src/main/xml/bibliography.xml b/src/main/xml/bibliography.xml index a1aa5d94..183195ee 100644 --- a/src/main/xml/bibliography.xml +++ b/src/main/xml/bibliography.xml @@ -17,6 +17,20 @@ Alex Milowski, James Fuller, and Norman Walsh editors. W3C Working Draft 5 November 2013. + +XProc 3.1 +XProc 3.1: +An XML Pipeline Language. +Norman Walsh, Achim Berndzen, Gerrit Imsieke and Erik Siegel, editors. + + + +Steps 3.1 +XProc 3.1: Standard +Step Library. +Norman Walsh, Achim Berndzen, Gerrit Imsieke and Erik Siegel, editors. + + XProc 2.0 XProc 2.0: An XML Pipeline Language. diff --git a/step-file/src/main/xml/specification.xml b/step-file/src/main/xml/specification.xml index 25154118..5e7f7a7d 100644 --- a/step-file/src/main/xml/specification.xml +++ b/step-file/src/main/xml/specification.xml @@ -6,13 +6,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='step-file' - class="ed" role="step" + class="wd" role="step" version="5.0-extension w3c-xproc"> -XProc 3.0: file steps +XProc 3.1: file steps 201820192020 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -39,7 +39,7 @@ specifications This specification describes the file related steps for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -60,6 +60,11 @@ for (subscribe, archives). + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -73,9 +78,8 @@ these steps may be found in Familarity with the -general nature of -steps is assumed; for background details, see -. +general nature of +steps is assumed. Some filesystems and some operating systems support “special” files. These may be interfaces to underlying block or character devices, or represent file @@ -922,8 +926,7 @@ failure causes the entire pipeline to fail. References - - + diff --git a/step-ixml/src/main/examples/ambig-1.xml b/step-ixml/src/main/examples/ambig-1.xml index 76a72d01..4a28aba9 100644 --- a/step-ixml/src/main/examples/ambig-1.xml +++ b/step-ixml/src/main/examples/ambig-1.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/step-ixml/src/main/examples/ambig-2.xml b/step-ixml/src/main/examples/ambig-2.xml index 8f7f99be..2fed2fe8 100644 --- a/step-ixml/src/main/examples/ambig-2.xml +++ b/step-ixml/src/main/examples/ambig-2.xml @@ -1,6 +1,6 @@ + version="3.1"> diff --git a/step-ixml/src/main/examples/ambig-3.xml b/step-ixml/src/main/examples/ambig-3.xml index 4fa19d0e..5ee759d3 100644 --- a/step-ixml/src/main/examples/ambig-3.xml +++ b/step-ixml/src/main/examples/ambig-3.xml @@ -1,6 +1,6 @@ + version="3.1"> diff --git a/step-ixml/src/main/examples/dates-1.xml b/step-ixml/src/main/examples/dates-1.xml index 822e6f90..b1c8afbf 100644 --- a/step-ixml/src/main/examples/dates-1.xml +++ b/step-ixml/src/main/examples/dates-1.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/step-ixml/src/main/examples/dates-2.xml b/step-ixml/src/main/examples/dates-2.xml index 744bc510..534ee12c 100644 --- a/step-ixml/src/main/examples/dates-2.xml +++ b/step-ixml/src/main/examples/dates-2.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/step-ixml/src/main/examples/dates-3.xml b/step-ixml/src/main/examples/dates-3.xml index 989accd7..fc3297aa 100644 --- a/step-ixml/src/main/examples/dates-3.xml +++ b/step-ixml/src/main/examples/dates-3.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/step-ixml/src/main/xml/specification.xml b/step-ixml/src/main/xml/specification.xml index 2d3c0db9..60cec390 100644 --- a/step-ixml/src/main/xml/specification.xml +++ b/step-ixml/src/main/xml/specification.xml @@ -6,13 +6,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='step-ixml' - class="ed" role="step" + class="wd" role="step" version="5.0-extension w3c-xproc"> -XProc 3.0: Invisible XML +XProc 3.1: Invisible XML 2021 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -30,7 +30,7 @@ specifications This specification describes the p:ixml step for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -51,6 +51,11 @@ step for (subscribe, archives). + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -62,11 +67,13 @@ A machine-readable description of this step may be found in steps.xpl. -Familarity with the general nature of -steps is assumed; for background details, see -. +Familarity with the general nature of +steps is assumed. +
+Step library +
p:ixml @@ -266,9 +273,10 @@ select a particular parse:
-
+ Document properties No document properties are preserved. +
@@ -304,8 +312,7 @@ failure causes the entire pipeline to fail. References - - + diff --git a/step-mail/src/main/xml/specification.xml b/step-mail/src/main/xml/specification.xml index 0bf7cc27..c709cc72 100644 --- a/step-mail/src/main/xml/specification.xml +++ b/step-mail/src/main/xml/specification.xml @@ -5,13 +5,13 @@ xmlns:p="http://www.w3.org/ns/xproc" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" - xml:id="step-mail" class="ed" + xml:id="step-mail" class="wd" role="step" version="5.0-extension w3c-xproc"> - XProc 3.0: mail steps + XProc 3.1: mail steps 201820192020 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -37,7 +37,7 @@ specifications This specification describes optional mail related steps for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -58,6 +58,11 @@ specifications (subscribe, archives). + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -68,11 +73,13 @@ specifications A machine-readable description of these steps may be found in steps.xpl. -Familarity with the general nature of steps is assumed; for background details, see -. +Familarity with the general nature of + steps is assumed. +
+Step library +
p:send-mail @@ -184,6 +191,7 @@ document and supply the body as a second document. Document properties No document properties are preserved. +
@@ -212,8 +220,7 @@ document and supply the body as a second document. References - - + diff --git a/step-os/src/main/examples/exec-as1.xml b/step-os/src/main/examples/exec-as1.xml index 1f9e5fca..24e21a9a 100644 --- a/step-os/src/main/examples/exec-as1.xml +++ b/step-os/src/main/examples/exec-as1.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/step-os/src/main/examples/exec-as2.xml b/step-os/src/main/examples/exec-as2.xml index b4ac0027..f027cf00 100644 --- a/step-os/src/main/examples/exec-as2.xml +++ b/step-os/src/main/examples/exec-as2.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/step-os/src/main/xml/specification.xml b/step-os/src/main/xml/specification.xml index d21a5d65..de971f37 100644 --- a/step-os/src/main/xml/specification.xml +++ b/step-os/src/main/xml/specification.xml @@ -6,13 +6,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='step-os' - class="ed" role="step" + class="wd" role="step" version="5.0-extension w3c-xproc"> -XProc 3.0: operating system steps +XProc 3.1: operating system steps 201820192020 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -40,7 +40,7 @@ specifications This specification describes the p:os-exec and p:os-info steps for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -61,6 +61,11 @@ for (subscribe, archives). + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -76,9 +81,8 @@ these steps may be found in Familarity with the -general nature of -steps is assumed; for background details, see -. +general nature of +steps is assumed.
@@ -232,7 +236,7 @@ The option is used to control the serialization “serialization” document property, the effective value of the serialization options is the union of the two maps, where the entries in the “serialization” document property take precedence. - Serialization is described in . + Serialization is described in . If there is content on standard output, it is read and processed as described in p:load with taken as @@ -300,8 +304,7 @@ failure causes the entire pipeline to fail. References - - + diff --git a/step-paged-media/src/main/xml/specification.xml b/step-paged-media/src/main/xml/specification.xml index 1d611f19..e86c7e84 100644 --- a/step-paged-media/src/main/xml/specification.xml +++ b/step-paged-media/src/main/xml/specification.xml @@ -6,13 +6,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='step-paged-media' - class="ed" role="step" + class="wd" role="step" version="5.0-extension w3c-xproc"> -XProc 3.0: paged media steps +XProc 3.1: paged media steps 201820192020 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -40,7 +40,7 @@ specifications This specification describes the p:css-formatter and p:xsl-formatter steps for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -65,6 +65,11 @@ steps for This document is derived from XProc: An XML Pipeline Language published by the W3C. + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -80,9 +85,8 @@ these steps may be found in Familarity with the -general nature of -steps is assumed; for background details, see -. +general nature of +steps is assumed.
@@ -242,8 +246,7 @@ failure causes the entire pipeline to fail. References - - + diff --git a/step-rdf/src/main/xml/specification.xml b/step-rdf/src/main/xml/specification.xml index 2562be13..099e1103 100644 --- a/step-rdf/src/main/xml/specification.xml +++ b/step-rdf/src/main/xml/specification.xml @@ -66,8 +66,8 @@ This specification describes the optional text related XProc steps. A machine-readable description of these steps may be found in steps.xpl. - Familarity with the general nature of steps is assumed; for background details, - see . + Familarity with the general nature of steps is assumed.
@@ -116,8 +116,7 @@ The build for steps fails unless at least one step is defined. References - - + diff --git a/step-run/src/main/examples/transform-n-validate.xml b/step-run/src/main/examples/transform-n-validate.xml index 4150deac..2f426716 100755 --- a/step-run/src/main/examples/transform-n-validate.xml +++ b/step-run/src/main/examples/transform-n-validate.xml @@ -1,7 +1,7 @@ diff --git a/step-run/src/main/xml/specification.xml b/step-run/src/main/xml/specification.xml index aa7e7297..3ded22d7 100644 --- a/step-run/src/main/xml/specification.xml +++ b/step-run/src/main/xml/specification.xml @@ -6,10 +6,10 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='step-run' - class="ed" role="step" + class="wd" role="step" version="5.0-extension w3c-xproc"> -XProc 3.0: dynamic pipeline execution +XProc 3.1: dynamic pipeline execution 2018201920202024 the Contributors to the XProc 3.x Standard Step Library @@ -39,7 +39,7 @@ specifications This specification describes the p:run step for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -60,6 +60,11 @@ step for (subscribe, archives). + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -71,11 +76,12 @@ A machine-readable description of this step may be found in steps.xpl. -Familarity with the general nature of -steps is assumed; for background details, see -. +Familarity with the general nature of +steps is assumed.
+
+Step library
p:run @@ -164,7 +170,7 @@ a different name than implicitly or explicitly specified in the p:run @@ -191,7 +197,7 @@ step has the effect of running the pipeline with the dynamically constructed opt @@ -226,6 +232,7 @@ pipelines. in the dynamically executed pipeline.
+
Step Errors @@ -259,8 +266,7 @@ failure causes the entire pipeline to fail. References - - + diff --git a/step-text/src/main/xml/specification.xml b/step-text/src/main/xml/specification.xml index e0c19ea6..b5086e43 100644 --- a/step-text/src/main/xml/specification.xml +++ b/step-text/src/main/xml/specification.xml @@ -1,13 +1,14 @@ - XProc 3.0: text steps + XProc 3.1: text steps 201820192020 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -32,7 +33,7 @@ specifications - This specification describes the optional text related steps for XProc 3.0: An XML Pipeline Language. + This specification describes the optional text related steps for XProc 3.1: An XML Pipeline Language. @@ -53,6 +54,11 @@ specifications (subscribe, archives). + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -62,12 +68,16 @@ specifications This specification describes the optional text related XProc steps. A machine-readable description of these steps may be found in steps.xpl. - Familarity with the general nature of steps is assumed; for background details, - see . + Familarity with the general nature of steps is assumed.
+
+ Step library + +
@@ -75,8 +85,7 @@ specifications References - - + diff --git a/step-validation/src/main/xml/specification.xml b/step-validation/src/main/xml/specification.xml index e5207109..482654fd 100644 --- a/step-validation/src/main/xml/specification.xml +++ b/step-validation/src/main/xml/specification.xml @@ -7,13 +7,13 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='step-validation' - class="ed" role="step" + class="wd" role="step" version="5.0-extension w3c-xproc"> -XProc 3.0: validation steps +XProc 3.1: validation steps 201820192020 -the Contributors to the XProc 3.0 Standard Step Library +the Contributors to the XProc 3.1 Standard Step Library specifications @@ -46,7 +46,7 @@ specifications p:validate-with-json-schema, and p:validate-with-dtd step for -XProc 3.0: An XML Pipeline Language. +XProc 3.1: An XML Pipeline Language. @@ -71,6 +71,11 @@ step for This document is derived from XProc: An XML Pipeline Language published by the W3C. + + +This draft is a “last call” draft. This version is stable and will not be updated. + + @@ -87,9 +92,8 @@ these steps may be found in Familiarity with the -general nature of -steps is assumed; for background details, see -. +general nature of +steps is assumed. As described in , steps may not produce PSVI output unless that behavior is explicitly @@ -378,7 +382,7 @@ namespaces covered by the documents available on the schemas port. If xs:include elements occur within the supplied schema documents, they are treated like any other -external documents (see ). +external documents (see ). It is implementation-defined if the documents supplied on the schemas port are considered when resolving @@ -525,7 +529,7 @@ The option can be used to control the serialization. If the document to be stored has a “serialization” property, the serialization is controlled by the merger of the two maps where the entries in the “serialization” property take precedence. Serialization is described in -. +. Any warning or error messages produced by the parser will appear on the report port. @@ -599,8 +603,7 @@ failure causes the entire pipeline to fail. References - - + diff --git a/steps/src/main/examples/doctemp-1.xml b/steps/src/main/examples/doctemp-1.xml index 4d94162b..84f5a4af 100644 --- a/steps/src/main/examples/doctemp-1.xml +++ b/steps/src/main/examples/doctemp-1.xml @@ -1,6 +1,6 @@ + name="main" version="3.1"> diff --git a/steps/src/main/examples/doctemp-2.xml b/steps/src/main/examples/doctemp-2.xml index 114a0f41..28335e33 100644 --- a/steps/src/main/examples/doctemp-2.xml +++ b/steps/src/main/examples/doctemp-2.xml @@ -1,6 +1,6 @@ + name="main" version="3.1"> diff --git a/steps/src/main/examples/xquery.xml b/steps/src/main/examples/xquery.xml index e776a8c8..eb70993d 100644 --- a/steps/src/main/examples/xquery.xml +++ b/steps/src/main/examples/xquery.xml @@ -1,5 +1,5 @@ + version="3.1"> diff --git a/steps/src/main/xml/common-features.xml b/steps/src/main/xml/common-features.xml index ae3320e7..6aa9a553 100644 --- a/steps/src/main/xml/common-features.xml +++ b/steps/src/main/xml/common-features.xml @@ -79,7 +79,7 @@ properties with greater care in this case. When a step uses an XPath to compute an option value, the XPath -context is as defined in . +context is as defined in . When a step specifies a particular version of a technology, implementations must implement that diff --git a/steps/src/main/xml/references.xml b/steps/src/main/xml/references.xml index dc3708b0..bf3efb3e 100644 --- a/steps/src/main/xml/references.xml +++ b/steps/src/main/xml/references.xml @@ -8,7 +8,7 @@
Normative References - + diff --git a/steps/src/main/xml/specification.xml b/steps/src/main/xml/specification.xml index db956fe8..5ef7e183 100644 --- a/steps/src/main/xml/specification.xml +++ b/steps/src/main/xml/specification.xml @@ -6,7 +6,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id='steps' - class="ed" + class="wd" version="5.0-extension w3c-xproc"> XProc 3.1: Standard Step Library @@ -69,8 +69,7 @@ specifications -This draft is the “editor’s working draft” and may continue to evolve. -A “last call” working draft is anticipated shortly. +This draft is a “last call” draft. This version is stable and will not be updated. @@ -93,7 +92,7 @@ A machine-readable description of these steps may be found in Many atomic steps are available for . They are described in several specifications. +linkend="xproc31"/>. They are described in several specifications. This specification describes the general background common to all steps. A conformant processor must implement all of the steps in this specification. Additional steps may also be @@ -184,7 +183,7 @@ element for result information: When a step uses an XPath to compute an option value, the XPath -context is as defined in . +context is as defined in . When a step specifies a particular version of a technology, implementations must implement that diff --git a/steps/src/main/xml/steps/compress.xml b/steps/src/main/xml/steps/compress.xml index e30758cf..443309e8 100644 --- a/steps/src/main/xml/steps/compress.xml +++ b/steps/src/main/xml/steps/compress.xml @@ -51,7 +51,7 @@ content before compression takes place. If the document to be stored has a serialization property, the serialization is controlled by the merger of the two maps where the entries in the serialization property take precedence. - Serialization is described in . + Serialization is described in . diff --git a/steps/src/main/xml/steps/set-properties.xml b/steps/src/main/xml/steps/set-properties.xml index db1bbd3f..7d5c353b 100644 --- a/steps/src/main/xml/steps/set-properties.xml +++ b/steps/src/main/xml/steps/set-properties.xml @@ -30,7 +30,7 @@ the new set. It is a dynamic error if a value is assigned to the serialization document property that cannot be converted into map(xs:QName, item()*) according -to the rules in section “QName handling” of . +to the rules in section “QName handling” of . It is a dynamic error if the map contains diff --git a/steps/src/main/xml/steps/store.xml b/steps/src/main/xml/steps/store.xml index f84e53f5..c9aefa8c 100644 --- a/steps/src/main/xml/steps/store.xml +++ b/steps/src/main/xml/steps/store.xml @@ -38,7 +38,7 @@ serialization of content when it is stored. If the document to be stored has a “serialization” property, the serialization is controlled by the merger of the two maps where the entries in the “serialization” property take precedence. Serialization is described in -. +. Document properties