Skip to content
Permalink
Browse files

Merge pull request xproc#63 from ndw/fix-string-star

Fix string star
  • Loading branch information...
ndw committed Apr 23, 2019
2 parents 39bcda9 + 549fa19 commit cbfcc003d36b4fa708da8e947b0966a8f5425747
Showing with 11 additions and 5 deletions.
  1. +5 −5 steps/src/main/xml/steps/archive.xml
  2. +6 −0 tools/xsl/library-to-rnc.xsl
@@ -37,7 +37,7 @@
<glossterm>implementation-defined</glossterm>.</impl>
</para>

<section xml:id="cv.request">
<section xml:id="cv.manifest">
<title>Specifying an archive manifest</title>

<para>An archive manifest is represented by a <tag>c:archive</tag> root element.</para>
@@ -48,8 +48,8 @@
</note>
<!--<e:rng-pattern name="..."/>-->

<para>The <code>c:archive</code> root element may contain additional <glossterm>implementation-defined</glossterm>
attributes.</para>
<para><impl>The <code>c:archive</code> root element may contain additional <glossterm>implementation-defined</glossterm>
attributes.</impl></para>

<para>All entries in the archive must be present as <tag>c:file</tag> child elements:</para>

@@ -102,8 +102,8 @@
constructing the archive. For instance, an e-book in EPub format has a non-compressed entry that must be first in
the archive. It should be possible to construct such an archive using <code>p:archive</code>.</para>

<para>The <code>c:file</code> elements may contain additional <glossterm>implementation-defined</glossterm>
attributes.</para>
<para><impl>The <code>c:file</code> elements may contain additional <glossterm>implementation-defined</glossterm>
attributes.</impl></para>
<note role="editorial">
<para>Do we need to say anything about serialization options for XML contents?</para>
<para>Not sure whether JSON needs more specifications</para>
@@ -88,6 +88,12 @@
</xsl:message>
<xsl:value-of select="'xsd:string'"/>
</xsl:when>
<xsl:when test="@as = 'xs:string*' or @as = 'xs:anyURI*'">
<!-- We have options that take list values, but you can't specify lists of strings in RELAX NG. -->
<!-- This is OK though because if you put the value in the option shortcut form, it's flattened -->
<!-- into a single string anyway. -->
<xsl:value-of select="replace(replace(substring-before(@as, '*'), 'xs:', 'xsd:'), '#', '')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="replace(replace(@as, 'xs:', 'xsd:'), '#', '')"/>
</xsl:otherwise>

0 comments on commit cbfcc00

Please sign in to comment.
You can’t perform that action at this time.