lib/isodoc/un/un.plenary-attachment.xsl in metanorma-un-0.6.12 vs lib/isodoc/un/un.plenary-attachment.xsl in metanorma-un-0.6.13
- old
+ new
@@ -1477,10 +1477,15 @@
<xsl:attribute name="padding-right">4mm</xsl:attribute>
+ </xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+
+
+
+
</xsl:attribute-set><xsl:attribute-set name="note-p-style">
@@ -2577,16 +2582,14 @@
<!-- Table's note name (NOTE, for example) -->
- <fo:inline padding-right="2mm">
+ <fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
-
-
<xsl:if test="@type = 'source' or @type = 'abbreviation'">
<xsl:attribute name="font-size">9pt</xsl:attribute>
<!-- <fo:inline>
<xsl:call-template name="capitalize">
<xsl:with-param name="str" select="@type"/>
@@ -2594,10 +2597,11 @@
<xsl:text>: </xsl:text>
</fo:inline> -->
</xsl:if>
+
<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
</fo:inline>
@@ -3199,10 +3203,12 @@
</xsl:variable>
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
<xsl:if test="$font-size != ''">
<xsl:attribute name="font-size">
<xsl:choose>
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xsl:if>
@@ -4668,14 +4674,18 @@
</xsl:variable>
<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
<xsl:if test="$font-size != ''">
<xsl:attribute name="font-size">
<xsl:choose>
+ <xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+ <xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
</xsl:if>
+
+
<xsl:apply-templates/>
</fo:block>
\ No newline at end of file