added better exec summary control

This commit is contained in:
skyanth 2019-06-10 14:47:29 +02:00
parent 461a13861d
commit d27d6d1371
2 changed files with 6 additions and 6 deletions

View File

@ -12,7 +12,7 @@
<xsl:if test="not(@visibility = 'hidden')"> <xsl:if test="not(@visibility = 'hidden')">
<xsl:choose> <xsl:choose>
<xsl:when test="$execsummary = true()"> <xsl:when test="$execsummary = true()">
<xsl:if test="ancestor-or-self::*/@inexecsummary = 'yes'"> <xsl:if test="ancestor-or-self::*[@inexecsummary][1]/@inexecsummary = 'yes'">
<fo:block xsl:use-attribute-sets="section"> <fo:block xsl:use-attribute-sets="section">
<xsl:if test="self::appendix or self::annex"> <xsl:if test="self::appendix or self::annex">
<xsl:attribute name="break-before">page</xsl:attribute> <xsl:attribute name="break-before">page</xsl:attribute>
@ -165,7 +165,7 @@
<xsl:otherwise> <xsl:otherwise>
<fo:inline> <fo:inline>
<xsl:number <xsl:number
count="section[not(@visibility = 'hidden')][ancestor-or-self::*/@inexecsummary = 'yes'] | finding | non-finding" count="section[not(@visibility = 'hidden')][ancestor-or-self::*[@inexecsummary][1]/@inexecsummary = 'yes'] | finding | non-finding"
level="multiple" format="{$AUTO_NUMBERING_FORMAT}" level="multiple" format="{$AUTO_NUMBERING_FORMAT}"
/> />
</fo:inline> </fo:inline>

View File

@ -29,7 +29,7 @@
<xsl:param name="execsummary" tunnel="yes"/> <xsl:param name="execsummary" tunnel="yes"/>
<xsl:choose> <xsl:choose>
<xsl:when test="$execsummary = true()"> <xsl:when test="$execsummary = true()">
<xsl:if test="ancestor-or-self::*/@inexecsummary = 'yes'"> <xsl:if test="ancestor-or-self::*[@inexecsummary][1]/@inexecsummary = 'yes'">
<xsl:call-template name="ToC"/> <xsl:call-template name="ToC"/>
</xsl:if> </xsl:if>
</xsl:when> </xsl:when>
@ -90,7 +90,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$execsummary = true()"> <xsl:when test="$execsummary = true()">
<xsl:apply-templates <xsl:apply-templates
select="section[not(@visibility = 'hidden')][not(../@visibility = 'hidden')][ancestor-or-self::*/@inexecsummary = 'yes']" select="section[not(@visibility = 'hidden')][not(../@visibility = 'hidden')][ancestor-or-self::*[@inexecsummary][1]/@inexecsummary = 'yes']"
mode="toc"/> mode="toc"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
@ -139,7 +139,7 @@
<fo:inline> App&#160;<xsl:number <fo:inline> App&#160;<xsl:number
count="appendix[not(@visibility = 'hidden')][@inexecsummary = 'yes']" count="appendix[not(@visibility = 'hidden')][@inexecsummary = 'yes']"
level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/>.<xsl:number level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/>.<xsl:number
count="section[not(@visibility = 'hidden')][ancestor-or-self::*/@inexecsummary = 'yes'][ancestor::appendix[not(@visibility = 'hidden')]]" count="section[not(@visibility = 'hidden')][ancestor-or-self::*[@inexecsummary][1]/@inexecsummary = 'yes'][ancestor::appendix[not(@visibility = 'hidden')]]"
level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/> level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/>
</fo:inline> </fo:inline>
</xsl:if> </xsl:if>
@ -158,7 +158,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$execsummary = true()"> <xsl:when test="$execsummary = true()">
<xsl:number <xsl:number
count="section[not(@visibility = 'hidden')][ancestor-or-self::*/@inexecsummary = 'yes']" count="section[not(@visibility = 'hidden')][ancestor-or-self::*[@inexecsummary][1]/@inexecsummary = 'yes']"
level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/> level="multiple" format="{$AUTO_NUMBERING_FORMAT}"/>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>