resolve merge conflict

transpect · Oct 5, 2023 · 79b61c7 · 79b61c7
2 parents a4b56fc + 7ddad3c
commit 79b61c7
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ You can check out the whole thing using
 git clone --recursive https://github.com/transpect/calabash-frontend calabash
 ```
 
-transpect projects usually have their Calabash runtime attached as a submodule or as an svn external. It typically resides in a subdirectory `calabash` of the project. If the project directory is `${pdu}` (in oXygen notation), the Calabash frontend will use an XML catalog `${pdu}/xmlcatalog/catalog.xml` by default. This contains `<nextCatalog>` instructions that read the catalogs of the transpect libraries that the project uses. Catalog resolution is important since the XProc, XSLT, font, … files within the modules will only be addressed by their canonical locations (typically starting with `http//transpect.io`). 
+transpect projects usually have their Calabash runtime attached as a submodule or as an svn external. It typically resides in a subdirectory `calabash` of the project. If the project directory is `${pdu}` (in oXygen notation), the Calabash frontend will use an XML catalog `${pdu}/xmlcatalog/catalog.xml` by default. This contains `<nextCatalog>` instructions that read the catalogs of the transpect libraries that the project uses. Catalog resolution is important since the XProc, XSLT, font, … files within the modules will only be addressed by their canonical locations (typically starting with http://transpect.io ). 
 
 Attaching this and its submodules as a submodule to a git repo works like this:
 

diff --git a/extensions/transpect/image-props-extension b/extensions/transpect/image-props-extension
diff --git a/extensions/transpect/image-transform-extension b/extensions/transpect/image-transform-extension
diff --git a/extensions/transpect/rng-extension b/extensions/transpect/rng-extension
diff --git a/extensions/transpect/svn-extension b/extensions/transpect/svn-extension
diff --git a/extensions/transpect/transpect-config.xml b/extensions/transpect/transpect-config.xml
@@ -1,34 +1,32 @@
-<xproc-config xmlns="http:https://xmlcalabash.com/ns/configuration" 
- xmlns:letex="http:https://www.le-tex.de/namespace" 
- xmlns:tr="http:https://transpect.io"
- xmlns:svn="http:https://transpect.io/svn"
- xmlns:cx="http:https://xmlcalabash.com/ns/extensions"
- xmlns:tr-internal="http:https://transpect.io/internal">
-
- <implementation type="letex:unzip tr-internal:unzip" class-name="io.transpect.calabash.extensions.UnZip"/>
- <implementation type="letex:validate-with-rng tr:validate-with-rng" class-name="io.transpect.calabash.extensions.ValidateWithRelaxNG"/>
- <implementation type="letex:image-identify tr:image-identify" class-name="io.transpect.calabash.extensions.ImageIdentify"/>
- <implementation type="letex:image-transform tr:image-transform" class-name="io.transpect.calabash.extensions.ImageTransform"/>
- <implementation type="tr:epubcheck" class-name="io.transpect.calabash.extensions.EpubCheckExtension"/>
- <implementation type="tr:font-obfuscate" class-name="io.transpect.calabash.extensions.FontObfuscate"/>
- <implementation type="tr:mtef2xml" class-name="io.transpect.calabash.extensions.Mtef2Xml"/>
- <implementation type="tr:javascript" class-name="io.transpect.calabash.extensions.JavaScriptExtension"/>
- <implementation type="svn:info" class-name="io.transpect.calabash.extensions.subversion.XSvnInfo"/>
- <implementation type="svn:mkdir" class-name="io.transpect.calabash.extensions.subversion.XSvnMkDir"/>
- <implementation type="svn:delete" class-name="io.transpect.calabash.extensions.subversion.XSvnDelete"/>
- <implementation type="svn:add" class-name="io.transpect.calabash.extensions.subversion.XSvnAdd"/>
- <implementation type="svn:commit" class-name="io.transpect.calabash.extensions.subversion.XSvnCommit"/>
- <implementation type="svn:copy" class-name="io.transpect.calabash.extensions.subversion.XSvnCopy"/>
- <implementation type="svn:update" class-name="io.transpect.calabash.extensions.subversion.XSvnUpdate"/>
- <implementation type="svn:checkout" class-name="io.transpect.calabash.extensions.subversion.XSvnCheckout"/>
- <implementation type="svn:list" class-name="io.transpect.calabash.extensions.subversion.XSvnList"/>
- <implementation type="svn:lock" class-name="io.transpect.calabash.extensions.subversion.XSvnLock"/>
- <implementation type="svn:propset" class-name="io.transpect.calabash.extensions.subversion.XSvnPropGetSet"/>
- <implementation type="svn:propset" class-name="io.transpect.calabash.extensions.subversion.XSvnPropGetSet"/>
- <implementation type="cx:send-mail" class-name="com.xmlcalabash.extensions.SendMail"/>
- <implementation type="svn:propget" class-name="io.transpect.calabash.extensions.subversion.XSvnPropGetSet"/>
- <implementation type="svn:propset" class-name="io.transpect.calabash.extensions.subversion.XSvnPropGetSet"/>
-
- <html-parser value="tagsoup"/>
-
-</xproc-config>
+<xproc-config xmlns="http:https://xmlcalabash.com/ns/configuration" 
+ xmlns:letex="http:https://www.le-tex.de/namespace" 
+ xmlns:tr="http:https://transpect.io"
+ xmlns:svn="http:https://transpect.io/svn"
+ xmlns:cx="http:https://xmlcalabash.com/ns/extensions"
+ xmlns:tr-internal="http:https://transpect.io/internal">
+
+ <implementation type="letex:unzip tr-internal:unzip" class-name="io.transpect.calabash.extensions.UnZip"/>
+ <implementation type="letex:validate-with-rng tr:validate-with-rng" class-name="io.transpect.calabash.extensions.ValidateWithRelaxNG"/>
+ <implementation type="letex:image-identify tr:image-identify" class-name="io.transpect.calabash.extensions.ImageIdentify"/>
+ <implementation type="letex:image-transform tr:image-transform" class-name="io.transpect.calabash.extensions.ImageTransform"/>
+ <implementation type="tr:epubcheck" class-name="io.transpect.calabash.extensions.EpubCheckExtension"/>
+ <implementation type="tr:font-obfuscate" class-name="io.transpect.calabash.extensions.FontObfuscate"/>
+ <implementation type="tr:mtef2xml" class-name="io.transpect.calabash.extensions.Mtef2Xml"/>
+ <implementation type="tr:javascript" class-name="io.transpect.calabash.extensions.JavaScriptExtension"/>
+ <implementation type="svn:info" class-name="io.transpect.calabash.extensions.subversion.XSvnInfo"/>
+ <implementation type="svn:mkdir" class-name="io.transpect.calabash.extensions.subversion.XSvnMkDir"/>
+ <implementation type="svn:delete" class-name="io.transpect.calabash.extensions.subversion.XSvnDelete"/>
+ <implementation type="svn:add" class-name="io.transpect.calabash.extensions.subversion.XSvnAdd"/>
+ <implementation type="svn:commit" class-name="io.transpect.calabash.extensions.subversion.XSvnCommit"/>
+ <implementation type="svn:copy" class-name="io.transpect.calabash.extensions.subversion.XSvnCopy"/>
+ <implementation type="svn:update" class-name="io.transpect.calabash.extensions.subversion.XSvnUpdate"/>
+ <implementation type="svn:checkout" class-name="io.transpect.calabash.extensions.subversion.XSvnCheckout"/>
+ <implementation type="svn:list" class-name="io.transpect.calabash.extensions.subversion.XSvnList"/>
+ <implementation type="svn:lock" class-name="io.transpect.calabash.extensions.subversion.XSvnLock"/>
+ <implementation type="cx:send-mail" class-name="com.xmlcalabash.extensions.SendMail"/>
+ <implementation type="svn:propget" class-name="io.transpect.calabash.extensions.subversion.XSvnPropGetSet"/>
+ <implementation type="svn:propset" class-name="io.transpect.calabash.extensions.subversion.XSvnPropGetSet"/>
+
+ <html-parser value="tagsoup"/>
+
+</xproc-config>
diff --git a/extensions/transpect/unzip-extension b/extensions/transpect/unzip-extension
diff --git a/schemas/XProc/1.0/steps.rng b/schemas/XProc/1.0/steps.rng
@@ -22,6 +22,7 @@
  <ref name="Step-filter"/>
  <ref name="Step-http-request"/>
  <ref name="Step-identity"/>
+ <ref name="Step-in-scope-names"/>
  <ref name="Step-insert"/>
  <ref name="Step-label-elements"/>
  <ref name="Step-load"/>
@@ -36,6 +37,7 @@
  <ref name="Step-split-sequence"/>
  <ref name="Step-store"/>
  <ref name="Step-string-replace"/>
+ <ref name="Step-template"/>
  <ref name="Step-unescape-markup"/>
  <ref name="Step-unwrap"/>
  <ref name="Step-wrap"/>
@@ -743,6 +745,30 @@
  </interleave>
  </element>
  </define>
+
+ <define name="Step-in-scope-names">
+ <element name="in-scope-names">
+ <a:documentation>The p:in-scope-names step exposes all of the in-scope variables and options as a set of parameters in a c:param-set document.</a:documentation>
+ <a:documentation>Output port: result (secondary).</a:documentation>
+ <a:documentation>---</a:documentation>
+ <optional>
+ <ref name="name.ncname.attr"/>
+ </optional>
+ <ref name="common.attributes"/>
+ <interleave>
+ <zeroOrMore>
+ <ref name="Log"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <choice>
+ <ref name="Documentation"/>
+ <ref name="PipeInfo"/>
+ </choice>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
  <define name="Step-insert">
  <element name="insert">
  <a:documentation>Inserts the insertion port's document into the source port's document
@@ -1590,6 +1616,43 @@
  </interleave>
  </element>
  </define>
+
+ <define name="Step-template">
+ <element name="template">
+ <a:documentation>The p:template replaces each XPath expression,
+ delimited with curly braces, in the template document with the 
+ result of evaluating that expression.</a:documentation>
+ <a:documentation>Input port: source (primary).</a:documentation>
+ <a:documentation>Input port: template (secondary).</a:documentation>
+ <a:documentation>Input port: parameters (parameter).</a:documentation>
+ <a:documentation>Output port: result (primary).</a:documentation>
+ <optional>
+ <ref name="name.ncname.attr"/>
+ </optional>
+ <ref name="common.attributes"/>
+ <interleave>
+ <zeroOrMore>
+ <ref name="InputBinding"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="WithOption"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="WithParam"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="Log"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <choice>
+ <ref name="Documentation"/>
+ <ref name="PipeInfo"/>
+ </choice>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+
  <define name="Step-unescape-markup">
  <element name="unescape-markup">
  <a:documentation>Takes the string value of the document element and parses the content as if