Skip to content

Commit

Permalink
Merge pull request #720 from xml-project/ixml
Browse files Browse the repository at this point in the history
Changed p:ixml to p:invisible-xml
  • Loading branch information
xml-project authored Sep 14, 2024
2 parents 3b98a60 + 75d5384 commit 80cf175
Show file tree
Hide file tree
Showing 11 changed files with 143 additions and 44 deletions.
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-001.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@
<t:test expected="pass" features="p:ixml"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 001</t:title>
<t:title>AB p:invisible-xml 001</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -16,14 +25,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml (Example 1 from spec)</p>
<p>Tests p:invisible (Example 1 from spec)</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml>
<p:invisible-xml>
<p:with-input port="grammar"><p:empty/></p:with-input>
<p:with-input port="source">
<p:inline content-type="text/plain">
Expand All @@ -37,7 +46,7 @@
year: (digit, digit)?, digit, digit .
</p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>

</p:declare-step>
</t:pipeline>
Expand Down
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-002.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@
<t:test expected="pass" features="p:ixml"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 002</t:title>
<t:title>AB p:invisible-xml 002</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -16,14 +25,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml (Example 2 from spec)</p>
<p>Tests p:invisible-xml (Example 2 from spec)</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml>
<p:invisible-xml>
<p:with-input port="grammar">
<p:inline content-type="text/plain">
date: s?, day, s, month, (s, year)? .
Expand All @@ -39,7 +48,7 @@
<p:with-input port="source">
<p:inline content-type="text/plain">31 December 2021</p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>

</p:declare-step>
</t:pipeline>
Expand Down
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-003.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@
<t:test expected="pass" features="p:ixml"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 003</t:title>
<t:title>AB p:invisible-xml 003</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -16,14 +25,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml (Example 3 from spec)</p>
<p>Tests p:invisible-xml (Example 3 from spec)</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml fail-on-error="false">
<p:invisible-xml fail-on-error="false">
<p:with-input port="grammar">
<p:inline content-type="text/plain">
date: s?, day, s, month, (s, year)? .
Expand All @@ -39,7 +48,7 @@
<p:with-input port="source">
<p:inline content-type="text/plain">31 Mumble 2021</p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>
</p:declare-step>
</t:pipeline>
<t:schematron>
Expand Down
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-004.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,17 @@
<t:test expected="pass" features="p:ixml"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 004</t:title>
<t:title>AB p:invisible-xml 004</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -16,13 +25,13 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml (Example 4 from spec)</p>
<p>Tests p:invisible-xml (Example 4 from spec)</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>
<p:ixml>
<p:invisible-xml>
<p:with-input port="grammar">
<p:inline content-type="text/plain">
letters: X, (A; B; C) .
Expand All @@ -36,7 +45,7 @@
<p:with-input port="source">
<p:inline content-type="text/plain">a123</p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>
</p:declare-step>
</t:pipeline>
<t:schematron>
Expand Down
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-005.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
xmlns:err="http://www.w3.org/ns/xproc-error"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 005</t:title>
<t:title>AB p:invisible-xml 005</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -17,14 +26,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml (Example 3 from spec) - fail-on-error default</p>
<p>Tests p:invisible-xml (Example 3 from spec) - fail-on-error default</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml>
<p:invisible-xml>
<p:with-input port="grammar">
<p:inline content-type="text/plain">
date: s?, day, s, month, (s, year)? .
Expand All @@ -40,7 +49,7 @@
<p:with-input port="source">
<p:inline content-type="text/plain">31 Mumble 2021</p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>
</p:declare-step>
</t:pipeline>
</t:test>
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-006.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
xmlns:err="http://www.w3.org/ns/xproc-error"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 006</t:title>
<t:title>AB p:invisible-xml 006</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -17,14 +26,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml (Example 3 from spec) - fail-on-error explicit true</p>
<p>Tests p:invisible-xml (Example 3 from spec) - fail-on-error explicit true</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml fail-on-error="true">
<p:invisible-xml fail-on-error="true">
<p:with-input port="grammar">
<p:inline content-type="text/plain">
date: s?, day, s, month, (s, year)? .
Expand All @@ -40,7 +49,7 @@
<p:with-input port="source">
<p:inline content-type="text/plain">31 Mumble 2021</p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>
</p:declare-step>
</t:pipeline>
</t:test>
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-007.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
xmlns:err="http://www.w3.org/ns/xproc-error"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 007</t:title>
<t:title>AB p:invisible-xml 007</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -17,14 +26,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml: Content type xml not allowed for port 'source'.</p>
<p>Tests p:invisible-xml: Content type xml not allowed for port 'source'.</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml fail-on-error="true">
<p:invisible-xml fail-on-error="true">
<p:with-input port="grammar">
<p:inline content-type="text/plain">
date: s?, day, s, month, (s, year)? .
Expand All @@ -40,7 +49,7 @@
<p:with-input port="source">
<p:inline content-type="application/xml"><test /></p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>
</p:declare-step>
</t:pipeline>
</t:test>
17 changes: 13 additions & 4 deletions test-suite/tests/ab-i-xml-008.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
xmlns:err="http://www.w3.org/ns/xproc-error"
xmlns:t="http://xproc.org/ns/testsuite/3.0">
<t:info>
<t:title>AB p:ixml 008</t:title>
<t:title>AB p:invisible-xml 008</t:title>
<t:revision-history>
<t:revision>
<t:date>2024-09-14</t:date>
<t:author>
<t:name>Achim Berndzen</t:name>
</t:author>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Changed step's name to p:invisible-xml</p>
</t:description>
</t:revision>
<t:revision>
<t:date>2023-11-25</t:date>
<t:author>
Expand All @@ -17,14 +26,14 @@
</t:revision-history>
</t:info>
<t:description xmlns="http://www.w3.org/1999/xhtml">
<p>Tests p:ixml: Content type html not allowed for port 'source'.</p>
<p>Tests p:invisible-xml: Content type html not allowed for port 'source'.</p>
</t:description>
<t:pipeline>
<p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
version="3.0">
<p:output port="result"/>

<p:ixml fail-on-error="true">
<p:invisible-xml fail-on-error="true">
<p:with-input port="grammar">
<p:inline content-type="text/plain">
date: s?, day, s, month, (s, year)? .
Expand All @@ -40,7 +49,7 @@
<p:with-input port="source">
<p:inline content-type="text/html"><test /></p:inline>
</p:with-input>
</p:ixml>
</p:invisible-xml>
</p:declare-step>
</t:pipeline>
</t:test>
Loading

0 comments on commit 80cf175

Please sign in to comment.