diff options
| author | Mike Gerwitz <mike.gerwitz@rtspecialty.com> | 2018-01-25 14:53:31 -0500 |
|---|---|---|
| committer | Mike Gerwitz <mike.gerwitz@rtspecialty.com> | 2018-01-25 14:53:31 -0500 |
| commit | 78ea30e7b537a9315b802716621b534dc10783b9 (patch) | |
| tree | f9d3ab02da1011fab43fae4fb595da52426023a0 | |
| parent | 87a059f0c88855e8eb840c394e9ec0e184d2bd29 (diff) | |
| download | tame-78ea30e7b537a9315b802716621b534dc10783b9.tar.gz tame-78ea30e7b537a9315b802716621b534dc10783b9.tar.bz2 tame-78ea30e7b537a9315b802716621b534dc10783b9.zip | |
Retain unknown template param references during expansion
For example, with template-generating templates, if a reference is unknown
and therefore determined to be blank, an attribute might be completely
removed while the template is being generated. (See the /when package in
core for an example.) That is not good.
* src/current/include/preproc/template
(preproc:expand-template): Add `tpl' tunneling param to
preproc:apply-template application.
(preproc:apply-template)[@*]: Retain param reference if applying template
does not define it.
| -rw-r--r-- | src/current/include/preproc/template.xsl | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/current/include/preproc/template.xsl b/src/current/include/preproc/template.xsl index d64330f..de65e5e 100644 --- a/src/current/include/preproc/template.xsl +++ b/src/current/include/preproc/template.xsl @@ -312,6 +312,8 @@ <xsl:with-param name="apply" select="$context" tunnel="yes" /> + <xsl:with-param name="tpl" select="$tpl[ 1 ]" + tunnel="yes" /> <xsl:with-param name="apply-tpl-name" select="$name" tunnel="yes" /> <xsl:with-param name="params" select="$params" @@ -885,8 +887,10 @@ TODO: substring replacement for added flexibility --> <xsl:template match="@*" mode="preproc:apply-template" priority="5"> + <xsl:param name="tpl" tunnel="yes" /> + <xsl:variable name="name" select="local-name()" /> - <xsl:variable name="varname" select="." /> + <xsl:variable name="varname" select="string(.)" /> <!-- compile param value --> <xsl:variable name="value"> @@ -895,11 +899,22 @@ </xsl:call-template> </xsl:variable> - <!-- if the result is an empty string, then do not output the attribute (this - allows for conditional attributes --> - <xsl:if test="not( $value = '' )"> - <xsl:attribute name="{$name}" select="$value" /> - </xsl:if> + <xsl:choose> + <!-- if the template being applied does not itself define this + parameter, and we're performing a full var replacement, keep the + name verbatim for later expansion --> + <xsl:when test="starts-with( $varname, '@' ) + and not( $tpl/lv:param[ @name = $varname ] )"> + <xsl:message select="ancestor::*[1]" /> + <xsl:attribute name="{$name}" select="$varname" /> + </xsl:when> + + <!-- if the result is an empty string, then do not output the attribute (this + allows for conditional attributes --> + <xsl:when test="not( $value = '' )"> + <xsl:attribute name="{$name}" select="$value" /> + </xsl:when> + </xsl:choose> </xsl:template> |