employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

lv:classify/@desc whitespace normalization

master
Mike Gerwitz 2016-10-31 13:22:46 -04:00
parent ea3ae797b3 0c2ef00e51
commit 7508ac0063
1 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/current/include/preproc/expand.xsl
View File

@ -488,52 +488,6 @@
<xsl:variable name="self" select="." />
<xsl:copy>
<!-- we just want to add an attribute that allows easy referencing of this
@yields set type, which will be a matrix if any matches match on a
matrix of values, otherwise it will be a vector -->
<xsl:attribute name="set">
<xsl:variable name="params"
select="root(.)//lv:param[ @name=$self//lv:match/@on ]" />
<xsl:choose>
<!-- XXX: This does not work properly with classes depending on other
classes -->
<xsl:when test="$params/@set = 'matrix'">
<xsl:text>matrix</xsl:text>
</xsl:when>
<!-- XXX: remove this when the above is fixed...note also that we have
to check for lv:join since it hasn't necessarily been preprocessed
yet...what a mess. Also note that, since templates and other things
may not have been expanded, we also fail this test if the
classification does not match on either a param or another
classification (since then things will get more complicated)-->
<xsl:when test="
not(
$self//lv:match
or $self//lv:join
)
or (
not( $params/@set )
and not(
.//lv:match[ @on=root(.)/lv:classify/@yields ]
)
and not( .//lv:join )
and (
$params
or .//lv:match[ @on=root(.)/lv:classify ]
)
)
">
<!-- output nothing; it's just a scalar -->
</xsl:when>
<xsl:otherwise>
<xsl:text>vector</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<!-- if there is no @yields attribute, then generate one -->
<xsl:if test="not( @yields )">
<xsl:attribute name="yields">
@ -543,7 +497,8 @@
</xsl:attribute>
</xsl:if>
<xsl:sequence select="@*" />
<xsl:apply-templates mode="preproc:expand"
select="@*" />
<!-- force @keep on @terminate -->
<xsl:if test="@terminate='true'">
@ -556,6 +511,24 @@
</xsl:template>
<!--
Normalize whitespace for class descriptions
-->
<xsl:template mode="preproc:expand" priority="5"
match="lv:classify/@desc">
<xsl:attribute name="desc"
select="normalize-space( . )" />
</xsl:template>
<!--
All other class attributes are copied verbatim
-->
<xsl:template mode="preproc:expand" priority="1"
match="lv:classify/@*">
<xsl:sequence select="." />
</xsl:template>
<!-- default lv:match/@on short-hand to assert on a value of TRUE -->
<xsl:template match="lv:match[ not( @value
or @anyOf