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

426 string parameter #438

Closed
wants to merge 2 commits into from
Closed

426 string parameter #438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fbf31e
transform pipelines accept items castable as xs:string as value fur r…
fsteimke Jan 4, 2024
4d12816
xsl:template for generating the map of locations simlified and inline…
fsteimke Jan 6, 2024
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
102 changes: 49 additions & 53 deletions src/main/xslt/docbook.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:db="http://docbook.org/ns/docbook"
xmlns:dbe="http://docbook.org/ns/docbook/errors"
xmlns:err='http://www.w3.org/2005/xqt-errors'
xmlns:ext="http://docbook.org/extensions/xslt"
xmlns:f="http://docbook.org/ns/docbook/functions"
xmlns:fp="http://docbook.org/ns/docbook/functions/private"
Expand Down Expand Up @@ -102,43 +103,39 @@
</xsl:map>
</xsl:variable>

<xsl:variable name="vp:transforms" as="map(*)*">
<xsl:for-each select="$transform-original">
<xsl:choose>
<xsl:when test=". instance of map(*)">
<xsl:sequence select="."/>
</xsl:when>
<xsl:when test=". instance of xs:string">
<xsl:sequence select="map {
'stylesheet-location': resolve-uri(., base-uri(/))
}"/>
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="error($dbe:INVALID-TRANSFORM,
'Each $transform-original must be a string or a map')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>

<xsl:sequence select="$v:standard-transforms"/>

<xsl:for-each select="$transform-before">
<xsl:choose>
<xsl:when test=". instance of map(*)">
<xsl:sequence select="."/>
</xsl:when>
<xsl:when test=". instance of xs:string">
<xsl:sequence select="map {
'stylesheet-location': resolve-uri(., base-uri(/))
}"/>
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="error($dbe:INVALID-TRANSFORM,
'Each $transform-preprocessed must be a string or a map')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:variable>
<!-- converts the sequence of items in $locations to a sequence of maps with stylesheet-locations
used for the pipelines transform-original, transform-before and transform-after -->
<xsl:template name="tp:stylesheet-locations" as="map(xs:string, xs:string)*">
<xsl:param name="locations" as="item()*"/>
<xsl:param name="purpose" as="xs:string"/>
<xsl:for-each select="$locations">
<xsl:choose>
<xsl:when
test=". instance of map(xs:string, xs:string) and map:contains(., 'stylesheet-location')">
<xsl:sequence select="."/>
</xsl:when>
<xsl:when test=". castable as xs:string">
<xsl:try>
<xsl:sequence select="
map {
'stylesheet-location': resolve-uri(xs:string(.), base-uri(/))
}"/>
<xsl:catch>
<xsl:sequence select="
error($dbe:INVALID-TRANSFORM,
xs:string(.) || ' in $' || $purpose || ' cannot be resolved as uri: ' || $err:description)"
/>
</xsl:catch>
</xsl:try>
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="
error($dbe:INVALID-TRANSFORM,
'Each $' || $purpose || ' must be a relative uri castable as string or a map with key=stylesheet-location')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:template>

<!-- If a document or element is being processed in the default
mode (and not the m:docbook mode), assume we're starting
Expand Down Expand Up @@ -198,6 +195,17 @@
</xsl:variable>

<xsl:variable name="document" as="document-node()">
<xsl:variable name="vp:transforms" as="map(*)*">
<xsl:call-template name="tp:stylesheet-locations">
<xsl:with-param name="locations" select="$transform-original"/>
<xsl:with-param name="purpose" select="'transform-original'"/>
</xsl:call-template>
<xsl:sequence select="$v:standard-transforms"/>
<xsl:call-template name="tp:stylesheet-locations">
<xsl:with-param name="locations" select="$transform-before"/>
<xsl:with-param name="purpose" select="'transform-before'"/>
</xsl:call-template>
</xsl:variable>
<xsl:sequence
select="fp:run-transforms($document, $vp:transforms,
map { xs:QName('vp:starting-base-uri'): $starting-base-uri })"/>
Expand All @@ -223,22 +231,10 @@
</xsl:variable>

<xsl:variable name="post-processing" as="map(*)*">
<xsl:for-each select="$transform-after">
<xsl:choose>
<xsl:when test=". instance of map(*)">
<xsl:sequence select="."/>
</xsl:when>
<xsl:when test=". instance of xs:string">
<xsl:sequence select="map {
'stylesheet-location': resolve-uri(., base-uri(/))
}"/>
</xsl:when>
<xsl:otherwise>
<xsl:sequence select="error($dbe:INVALID-TRANSFORM,
'Each $transform-preprocessed must be a string or a map')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
<xsl:call-template name="tp:stylesheet-locations">
<xsl:with-param name="locations" select="$transform-after"/>
<xsl:with-param name="purpose" select="'transform-after'"/>
</xsl:call-template>
</xsl:variable>

<xsl:variable name="result" as="document-node()">
Expand Down
Loading