lib/isodoc/itu/itu.technical-report.xsl in metanorma-itu-1.4.0.1 vs lib/isodoc/itu/itu.technical-report.xsl in metanorma-itu-1.4.1
- old
+ new
@@ -1766,11 +1766,11 @@
<xsl:when test="$level = 4">2mm</xsl:when>
<xsl:when test="$level = 3">4mm</xsl:when>
<xsl:otherwise>5mm</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <xsl:apply-templates select="ancestor::itu:term/itu:name" mode="presentation"/>
+ <xsl:apply-templates select="ancestor::itu:term[1]/itu:name" mode="presentation"/>
</fo:inline>
<fo:inline font-weight="bold">
<xsl:apply-templates/>
</fo:inline>
<xsl:if test="../itu:termsource/itu:origin">
@@ -4416,10 +4416,11 @@
<xsl:if test="ancestor::*[1][local-name() = 'dl']/preceding-sibling::*[1][local-name() = 'formula']">
<xsl:attribute name="padding-right">3mm</xsl:attribute>
</xsl:if>
<fo:block margin-top="6pt">
+ <xsl:copy-of select="@id"/>
<xsl:if test="normalize-space($key_iso) = 'true'">
<xsl:attribute name="margin-top">0</xsl:attribute>
@@ -5265,18 +5266,22 @@
<xsl:value-of select="$suffix"/>
</xsl:if>
</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
<fo:inline><xsl:apply-templates/></fo:inline>
</xsl:template><xsl:template match="*[local-name() = 'terms']">
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
<fo:block id="{@id}">
<xsl:apply-templates/>
</fo:block>
</xsl:template><xsl:template match="*[local-name() = 'term']">
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
-
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
+
+ </xsl:if>
<xsl:apply-templates/>
</fo:block>
</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
<xsl:if test="normalize-space() != ''">
<xsl:variable name="level">
@@ -6246,11 +6251,12 @@
<fo:block>
<xsl:apply-templates/>
</fo:block>
</fo:table-cell>
</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
+ <fo:block font-size="11pt">
+
<xsl:apply-templates/>
</fo:block>
</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
<fo:block> <!-- margin-bottom="10pt" -->
<xsl:apply-templates/>
@@ -6362,17 +6368,19 @@
<xsl:choose>
<xsl:when test="starts-with(normalize-space($termsource_text), '[')">
<!-- <xsl:apply-templates /> -->
<xsl:copy-of select="$termsource_text"/>
</xsl:when>
- <xsl:otherwise>
+ <xsl:otherwise>
+
<xsl:text>[</xsl:text>
<!-- <xsl:apply-templates /> -->
<xsl:copy-of select="$termsource_text"/>
+
<xsl:text>]</xsl:text>
</xsl:otherwise>
</xsl:choose>
</fo:block>
@@ -6435,16 +6443,24 @@
<xsl:apply-templates/>
</fo:basic-link>
</xsl:template><xsl:template match="*[local-name() = 'author']">
<xsl:text>— </xsl:text>
<xsl:apply-templates/>
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
+ </xsl:template><xsl:variable name="bibitem_hidden_">
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+ <xsl:copy-of select="."/>
+ </xsl:for-each>
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
+ <xsl:copy-of select="."/>
+ </xsl:for-each>
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
<xsl:variable name="bibitemid">
<xsl:choose>
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:choose>
@@ -6532,13 +6548,13 @@
<xsl:value-of select="normalize-space($padding)"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
<xsl:choose>
- <xsl:when test="$language = 'zh'">
+ <xsl:when test="$lang = 'zh'">
<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
</xsl:when>
<xsl:when test="../../@inline-header = 'true'">
<fo:inline font-size="90%">
<xsl:call-template name="insertNonBreakSpaces">
\ No newline at end of file