Skip to content

Commit

Permalink
Merge pull request #602 from ndw/iss-583
Browse files Browse the repository at this point in the history
Fix #583 by allowing the result to be text
  • Loading branch information
ndw authored Aug 1, 2024
2 parents e01a494 + 549592a commit 673c261
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 7 additions & 1 deletion steps/src/main/xml/specification.xml
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ PSVI annotations.</para>
</section>

<section xml:id="req-steps">
<title>The required steps</title>
<title>Step library</title>

<para>A conformant processor must support all of these steps.</para>

Expand Down Expand Up @@ -284,6 +284,12 @@ draft:</para>

<orderedlist>
<listitem>
<para>Allow the output of the <tag>p:insert</tag> step to be <literal>text</literal>.
(issue
<link xlink:href="https://github.com/xproc/3.0-steps/issues/583">583</link>.)
</para>
</listitem>
<listitem>
<para>Clarified that the manifest has precedence in the <tag>p:archive</tag> step.
(issue
<link xlink:href="https://github.com/xproc/3.0-steps/issues/462">462</link>.)
Expand Down
8 changes: 1 addition & 7 deletions steps/src/main/xml/steps/insert.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ port's document relative to the matching elements in the
<p:declare-step type="p:insert">
<p:input port="source" primary="true" content-types="xml html"/>
<p:input port="insertion" sequence="true" content-types="xml html text"/>
<p:output port="result" content-types="xml html"/>
<p:output port="result" content-types="xml html text"/>
<p:option name="match" as="xs:string" select="'/*'" e:type="XSLTSelectionPattern"/>
<p:option name="position" values="('first-child','last-child','before','after')" select="'after'"/>
</p:declare-step>
Expand Down Expand Up @@ -66,10 +66,4 @@ as the source.</para>
<port>source</port> port are preserved. The document properties on the
<port>insertion</port> port are not preserved or present in the result document.</para>
</simplesect>

<simplesect>
<title>Erratum, April 2024</title>
<para>The content type of the <port>insertion</port> port has been expanded to allow
text documents to be inserted.</para>
</simplesect>
</section>

0 comments on commit 673c261

Please sign in to comment.