Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix string star #63

Merged
merged 2 commits into from
Apr 23, 2019
Merged

Fix string star #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa31d1f
Fix markup errors
ndw Apr 23, 2019
549fa19
Fix schema generation for options with string* types
ndw Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions steps/src/main/xml/steps/archive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions tools/xsl/library-to-rnc.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down