DeforaNetworks/pentext
DeforaNetworks/pentext
3
0
Fork 0
Code Releases Activity

Merge pull request #51 from radicallyopensecurity/no-whitespace-after-recomm-table-list

Browse Source 
No whitespace after recomm table list
This commit is contained in:
Patricia Piolon 2017-10-24 14:13:48 +02:00 committed by GitHub
commit ed989f339b
1 changed files with 81 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
xml/xslt/lists.xslt
View File

@ -8,38 +8,53 @@
<fo:list-block provisional-distance-between-starts="0.75cm"
provisional-label-separation="2.5mm">
<xsl:call-template name="checkIfLast"/>
<xsl:attribute name="space-after">
<xsl:choose>
<xsl:when test="ancestor::ul or ancestor::ol">
<xsl:text>0pt</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>12pt</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="start-indent">
<xsl:variable name="ancestors">
<xsl:choose>
<xsl:when test="count(ancestor::ol) or count(ancestor::ul)">
<xsl:value-of
select="1 +
(count(ancestor::ol) +
count(ancestor::ul)) *
1.25"
/>
</xsl:when>
<xsl:otherwise>
<xsl:text>1</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="concat($ancestors, 'cm')"/>
</xsl:attribute>
<xsl:apply-templates select="*"/>
<xsl:call-template name="do_ul"/>
</fo:list-block>
</xsl:template>
<xsl:template match="ul" mode="summarytable">
<!-- skip 'check if last' template -->
<fo:list-block provisional-distance-between-starts="0.75cm"
provisional-label-separation="2.5mm">
<xsl:call-template name="do_ul"/>
</fo:list-block>
</xsl:template>
<xsl:template name="do_ul">
<xsl:attribute name="space-after">
<xsl:choose>
<xsl:when test="ancestor::ul or ancestor::ol">
<xsl:text>0pt</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>12pt</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="start-indent">
<xsl:variable name="ancestors">
<xsl:choose>
<xsl:when test="count(ancestor::ol) or count(ancestor::ul)">
<xsl:value-of
select="
1 +
(count(ancestor::ol) +
count(ancestor::ul)) *
1.25"
/>
</xsl:when>
<xsl:otherwise>
<xsl:text>1</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="concat($ancestors, 'cm')"/>
</xsl:attribute>
<xsl:apply-templates select="*"/>
</xsl:template>
<xsl:template match="ul/li">
<fo:list-item xsl:use-attribute-sets="li">
<fo:list-item-label end-indent="label-end()">
@ -57,36 +72,48 @@
<fo:list-block provisional-distance-between-starts="0.85cm"
provisional-label-separation="2.5mm">
<xsl:call-template name="checkIfLast"/>
<xsl:attribute name="space-after">
<xsl:call-template name="do_ol"/>
</fo:list-block>
</xsl:template>
<xsl:template match="ol" mode="summarytable">
<fo:list-block provisional-distance-between-starts="0.85cm"
provisional-label-separation="2.5mm">
<xsl:call-template name="do_ol"/>
</fo:list-block>
</xsl:template>
<xsl:template name="do_ol">
<xsl:attribute name="space-after">
<xsl:choose>
<xsl:when test="ancestor::ul or ancestor::ol">
<xsl:text>0pt</xsl:text>
</xsl:when>
<xsl:otherwise>
<xsl:text>12pt</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="start-indent">
<xsl:variable name="ancestors">
<xsl:choose>
<xsl:when test="ancestor::ul or ancestor::ol">
<xsl:text>0pt</xsl:text>
<xsl:when test="count(ancestor::ol) or count(ancestor::ul)">
<xsl:value-of
select="
1 +
(count(ancestor::ol) +
count(ancestor::ul)) *
1.25"
/>
</xsl:when>
<xsl:otherwise>
<xsl:text>12pt</xsl:text>
<xsl:text>1</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
<xsl:attribute name="start-indent">
<xsl:variable name="ancestors">
<xsl:choose>
<xsl:when test="count(ancestor::ol) or count(ancestor::ul)">
<xsl:value-of
select="1 +
(count(ancestor::ol) +
count(ancestor::ul)) *
1.25"
/>
</xsl:when>
<xsl:otherwise>
<xsl:text>1</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:value-of select="concat($ancestors, 'cm')"/>
</xsl:attribute>
<xsl:apply-templates select="*"/>
</fo:list-block>
</xsl:variable>
<xsl:value-of select="concat($ancestors, 'cm')"/>
</xsl:attribute>
<xsl:apply-templates select="*"/>
</xsl:template>
<xsl:template match="ol/li">