metanorma-iso 3.1.3 → 3.1.4

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -7658,11 +7658,17 @@
 	<xsl:attribute-set name="license-statement-style">
 	</xsl:attribute-set> <!-- license-statement-style -->
 
+	<xsl:template name="refine_license-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="license-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
 	</xsl:attribute-set> <!-- license-statement-title-style -->
 
+	<xsl:template name="refine_license-statement-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="license-statement-p-style">
 		<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
 		<xsl:attribute name="margin-right">1.5mm</xsl:attribute>
@@ -7675,23 +7681,47 @@
 	<xsl:attribute-set name="legal-statement-style">
 	</xsl:attribute-set> <!-- legal-statement-style -->
 
+	<xsl:template name="refine_legal-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="legal-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-title-style -->
 
+	<xsl:template name="refine_legal-statement-title-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="legal-statement-p-style">
 	</xsl:attribute-set> <!-- legal-statement-p-style -->
 
+	<xsl:template name="refine_legal-statement-p-style">
+		<xsl:if test="@align">
+			<xsl:attribute name="text-align">
+				<xsl:value-of select="@align"/>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="feedback-statement-style">
 	</xsl:attribute-set> <!-- feedback-statement-style -->
 
+	<xsl:template name="refine_feedback-statement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="feedback-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
+	<xsl:template name="refine_feedback-statement-title-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="feedback-statement-p-style">
 	</xsl:attribute-set> <!-- feedback-statement-p-style -->
 
+	<xsl:template name="refine_feedback-statement-p-style">
+	</xsl:template>
+
 	<!-- End boilerplate sections styles -->
 
 	<!-- ================================= -->
@@ -7717,6 +7747,7 @@
 
 	<xsl:template match="mn:license-statement">
 		<fo:block xsl:use-attribute-sets="license-statement-style">
+			<xsl:call-template name="refine_license-statement-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- license-statement -->
@@ -7726,6 +7757,7 @@
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
 		<fo:block role="H{$level}" xsl:use-attribute-sets="license-statement-title-style">
+			<xsl:call-template name="refine_license-statement-title-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 
@@ -7746,6 +7778,7 @@
 	<xsl:template match="mn:legal-statement">
 		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
+			<xsl:call-template name="refine_legal-statement-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
@@ -7919,6 +7952,27 @@
 	<xsl:attribute-set name="sourcecode-container-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_sourcecode-container-style">
+		<xsl:if test="not(ancestor::mn:li) or ancestor::mn:example">
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		</xsl:if>
+
+		<xsl:if test="ancestor::mn:example">
+			<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		</xsl:if>
+
+		<xsl:copy-of select="@id"/>
+
+		<xsl:if test="parent::mn:note">
+			<xsl:attribute name="margin-left">
+				<xsl:choose>
+					<xsl:when test="not(ancestor::mn:table)"><xsl:value-of select="$note-body-indent"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -7938,6 +7992,9 @@
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
 	</xsl:attribute-set> <!-- sourcecode-name-style -->
 
+	<xsl:template name="refine_sourcecode-name-style">
+	</xsl:template>
+
 	<xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
@@ -8025,24 +8082,8 @@
 			<xsl:otherwise>
 				<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
 
-					<xsl:if test="not(ancestor::mn:li) or ancestor::mn:example">
-						<xsl:attribute name="margin-left">0mm</xsl:attribute>
-					</xsl:if>
-
-					<xsl:if test="ancestor::mn:example">
-						<xsl:attribute name="margin-right">0mm</xsl:attribute>
-					</xsl:if>
-
-					<xsl:copy-of select="@id"/>
+					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<xsl:if test="parent::mn:note">
-						<xsl:attribute name="margin-left">
-							<xsl:choose>
-								<xsl:when test="not(ancestor::mn:table)"><xsl:value-of select="$note-body-indent"/></xsl:when>
-								<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
-							</xsl:choose>
-						</xsl:attribute>
-					</xsl:if>
 					<fo:block-container margin-left="0mm" role="SKIP">
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
@@ -8369,6 +8410,7 @@
 	<xsl:template match="mn:sourcecode/mn:fmt-name">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="sourcecode-name-style">
+				<xsl:call-template name="refine_sourcecode-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -8416,12 +8458,31 @@
 		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- pre-style -->
+
+	<xsl:template name="refine_pre-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="tt-style">
 		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_tt-style">
+		<xsl:variable name="_font-size">9 <!-- inherit -->
+		</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::mn:note or ancestor::mn:example"><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:template>
+
 	<xsl:variable name="color-added-text">
 		<xsl:text>rgb(0, 255, 0)</xsl:text>
 	</xsl:variable>
@@ -8434,9 +8495,14 @@
 				<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_add-style">
+	</xsl:template>
+
 	<xsl:variable name="add-style">
-			<add-style xsl:use-attribute-sets="add-style"/>
-		</xsl:variable>
+		<add-style xsl:use-attribute-sets="add-style">
+			<xsl:call-template name="refine_add-style"/>
+		</add-style>
+	</xsl:variable>
 	<xsl:template name="append_add-style">
 		<xsl:copy-of select="xalan:nodeset($add-style)/add-style/@*"/>
 	</xsl:template>
@@ -8449,27 +8515,83 @@
 		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set>
 
-	<xsl:template match="mn:br">
-		<xsl:value-of select="$linebreak"/>
+	<xsl:template name="refine_del-style">
 	</xsl:template>
 
-		<xsl:template match="mn:em">
-		<fo:inline font-style="italic">
-			<xsl:call-template name="refine_italic_style"/>
-			<xsl:apply-templates/>
-		</fo:inline>
-	</xsl:template>
+	<xsl:attribute-set name="strong-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_strong_style">
+		<xsl:if test="ancestor::*[local-name() = 'item']">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::*['preferred']">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_strong_style -->
 
-	<xsl:template name="refine_italic_style">
+	<xsl:attribute-set name="em-style">
+		<xsl:attribute name="font-style">italic</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_em_style">
 		<xsl:if test="ancestor::*[local-name() = 'item']">
 			<xsl:attribute name="role">SKIP</xsl:attribute>
 		</xsl:if>
+	</xsl:template> <!-- refine_em_style -->
+
+	<xsl:attribute-set name="sup-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sup-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="sub-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">sub</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sub-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="underline-style">
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_underline-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="hi-style">
+		<xsl:attribute name="background-color">yellow</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_hi-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="strike-style">
+		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_strike-style">
+	</xsl:template>
+
+	<xsl:template match="mn:br">
+		<xsl:value-of select="$linebreak"/>
+	</xsl:template>
+
+	<xsl:template match="mn:em">
+		<fo:inline xsl:use-attribute-sets="em-style">
+			<xsl:call-template name="refine_em_style"/>
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:strong | *[local-name()='b']">
 		<xsl:param name="split_keep-within-line"/>
-		<fo:inline font-weight="bold">
-
+		<fo:inline xsl:use-attribute-sets="strong-style">
 			<xsl:call-template name="refine_strong_style"/>
 
 			<xsl:apply-templates>
@@ -8478,47 +8600,27 @@
 		</fo:inline>
 	</xsl:template>
 
-	<xsl:template name="refine_strong_style">
-		<xsl:if test="ancestor::*[local-name() = 'item']">
-			<xsl:attribute name="role">SKIP</xsl:attribute>
-		</xsl:if>
-		<xsl:if test="ancestor::*['preferred']">
-			<xsl:attribute name="role">SKIP</xsl:attribute>
-		</xsl:if>
-	</xsl:template>
-
 	<xsl:template match="*[local-name()='padding']">
 		<fo:inline padding-right="{@value}"> </fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:sup">
-		<fo:inline font-size="80%" vertical-align="super">
+		<fo:inline xsl:use-attribute-sets="sup-style">
+			<xsl:call-template name="refine_sup-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:sub">
-		<fo:inline font-size="80%" vertical-align="sub">
+		<fo:inline xsl:use-attribute-sets="sub-style">
+			<xsl:call-template name="refine_sub-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:tt">
 		<fo:inline xsl:use-attribute-sets="tt-style">
-
-			<xsl:variable name="_font-size">9 <!-- inherit -->
-			</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::mn:note or ancestor::mn:example"><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:call-template name="refine_tt-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template> <!-- tt -->
@@ -8537,7 +8639,8 @@
 	</xsl:template>
 
 	<xsl:template match="mn:underline">
-		<fo:inline text-decoration="underline">
+		<fo:inline xsl:use-attribute-sets="underline-style">
+			<xsl:call-template name="refine_underline-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -8695,6 +8798,7 @@
 
 	<xsl:template match="mn:del">
 		<fo:inline xsl:use-attribute-sets="del-style">
+			<xsl:call-template name="refine_del-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -8704,7 +8808,8 @@
 
 	<!-- highlight text -->
 	<xsl:template match="mn:hi | mn:span[@class = 'fmt-hi']" priority="3">
-		<fo:inline background-color="yellow">
+		<fo:inline xsl:use-attribute-sets="hi-style">
+			<xsl:call-template name="refine_hi-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -8796,7 +8901,8 @@
   </xsl:template>
 
 	<xsl:template match="mn:strike">
-		<fo:inline text-decoration="line-through">
+		<fo:inline xsl:use-attribute-sets="strike-style">
+			<xsl:call-template name="refine_strike-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -8876,6 +8982,7 @@
 
 	<xsl:template match="mn:pre" name="pre">
 		<fo:block xsl:use-attribute-sets="pre-style">
+			<xsl:call-template name="refine_pre-style"/>
 			<xsl:copy-of select="@id"/>
 			<xsl:choose>
 
@@ -8906,17 +9013,29 @@
 	<xsl:attribute-set name="permission-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_permission-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="permission-name-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_permission-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="permission-label-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_permission-label-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="requirement-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_requirement-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="requirement-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -8924,9 +9043,15 @@
 		<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_requirement-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="requirement-label-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_requirement-label-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="subject-style">
 	</xsl:attribute-set>
 
@@ -8954,18 +9079,28 @@
 	<xsl:attribute-set name="recommendation-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_recommendation-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="recommendation-name-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_recommendation-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="recommendation-label-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_recommendation-label-style">
+	</xsl:template>
+
 	<!-- ========== -->
 	<!-- permission -->
 	<!-- ========== -->
 	<xsl:template match="mn:permission">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
+			<xsl:call-template name="refine_permission-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
@@ -8974,6 +9109,7 @@
 	<xsl:template match="mn:permission/mn:fmt-name">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="permission-name-style">
+				<xsl:call-template name="refine_permission-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -8981,6 +9117,7 @@
 
 	<xsl:template match="mn:permission/mn:label">
 		<fo:block xsl:use-attribute-sets="permission-label-style">
+			<xsl:call-template name="refine_permission-label-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -8993,6 +9130,7 @@
 	<xsl:template match="mn:requirement">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
+			<xsl:call-template name="refine_requirement-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 			<xsl:apply-templates select="mn:label"/>
 			<xsl:apply-templates select="@obligation"/>
@@ -9005,6 +9143,7 @@
 		<xsl:if test="normalize-space() != ''">
 
 			<fo:block xsl:use-attribute-sets="requirement-name-style">
+				<xsl:call-template name="refine_requirement-name-style"/>
 				<xsl:apply-templates/>
 					<xsl:text>:</xsl:text>
 			</fo:block>
@@ -9013,6 +9152,7 @@
 
 	<xsl:template match="mn:requirement/mn:label">
 		<fo:block xsl:use-attribute-sets="requirement-label-style">
+			<xsl:call-template name="refine_requirement-label-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9038,6 +9178,7 @@
 	<xsl:template match="mn:recommendation">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
+			<xsl:call-template name="refine_recommendation-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
@@ -9047,6 +9188,7 @@
 		<xsl:if test="normalize-space() != ''">
 
 			<fo:block xsl:use-attribute-sets="recommendation-name-style">
+				<xsl:call-template name="refine_recommendation-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -9054,6 +9196,7 @@
 
 	<xsl:template match="mn:recommendation/mn:label">
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
+			<xsl:call-template name="refine_recommendation-label-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9235,36 +9378,69 @@
 		<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 	</xsl:attribute-set> <!-- term-style -->
 
+	<xsl:template name="refine_term-style">
+		<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
+			<xsl:attribute name="space-before">12pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="term-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- term-name-style -->
 
-		<xsl:attribute-set name="preferred-block-style">
+	<xsl:template name="refine_term-name-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="preferred-block-style">
 		<xsl:attribute name="line-height">1.1</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
+	<xsl:template name="refine_preferred-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-term-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
 
+	<xsl:template name="refine_preferred-term-style">
+		<xsl:if test="mn:strong">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="domain-style">
 	</xsl:attribute-set> <!-- domain-style -->
 
+	<xsl:template name="refine_domain-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admitted-style">
 	</xsl:attribute-set> <!-- admitted-style -->
 
+	<xsl:template name="refine_admitted-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="deprecates-style">
 	</xsl:attribute-set> <!-- deprecates-style -->
 
+	<xsl:template name="refine_deprecates-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_related-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="definition-style">
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- definition-style -->
 
+	<xsl:template name="refine_definition-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="termsource-style">
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 	</xsl:attribute-set> <!-- termsource-style -->
@@ -9275,9 +9451,15 @@
 	<xsl:attribute-set name="termsource-text-style">
 	</xsl:attribute-set> <!-- termsource-text-style -->
 
+	<xsl:template name="refine_termsource-text-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="origin-style">
 	</xsl:attribute-set> <!-- origin-style -->
 
+	<xsl:template name="refine_origin-style">
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- term      -->
 	<!-- ====== -->
@@ -9293,10 +9475,8 @@
 	<xsl:template match="mn:term">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
+			<xsl:call-template name="refine_term-style"/>
 
-			<xsl:if test="parent::mn:term and not(preceding-sibling::mn:term)">
-				<xsl:attribute name="space-before">12pt</xsl:attribute>
-			</xsl:if>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
 	</xsl:template>
@@ -9372,6 +9552,7 @@
 	<!-- text SOURCE: -->
 	<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
 		<fo:inline xsl:use-attribute-sets="termsource-text-style">
+			<xsl:call-template name="refine_termsource-text-style"/>
 			<xsl:value-of select="."/>
 		</fo:inline>
 	</xsl:template>
@@ -9384,6 +9565,7 @@
 						<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 					</xsl:if>
 					<fo:inline xsl:use-attribute-sets="origin-style">
+						<xsl:call-template name="refine_origin-style"/>
 						<xsl:apply-templates/>
 					</fo:inline>
 				</fo:basic-link>
@@ -9433,9 +9615,12 @@
 		</xsl:variable>
 		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
 
+			<xsl:call-template name="refine_preferred-block-style"/>
+
 			<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
 
 				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
+					<xsl:call-template name="refine_term-name-style"/>
 
 					<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
 						<xsl:call-template name="setIDforNamedDestination"/>
@@ -9446,7 +9631,7 @@
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
-				<xsl:call-template name="setStyle_preferred"/>
+				<xsl:call-template name="refine_preferred-term-style"/>
 
 				<xsl:apply-templates/>
 			</fo:block>
@@ -9467,22 +9652,18 @@
 
 	<xsl:template match="mn:fmt-admitted">
 		<fo:block xsl:use-attribute-sets="admitted-style">
+			<xsl:call-template name="refine_admitted-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:fmt-deprecates">
 		<fo:block xsl:use-attribute-sets="deprecates-style">
+			<xsl:call-template name="refine_deprecates-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template name="setStyle_preferred">
-		<xsl:if test="mn:strong">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-		</xsl:if>
-	</xsl:template>
-
 	<!-- regarding ISO 10241-1:2011,  If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
 	<!-- in metanorma xml preferred terms delimited by semicolons -->
 	<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
@@ -9492,6 +9673,7 @@
 
 	<xsl:template match="mn:fmt-related">
 		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
+			<xsl:call-template name="refine_related-block-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9506,6 +9688,7 @@
 	<!-- ========== -->
 	<xsl:template match="mn:fmt-definition">
 		<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
+			<xsl:call-template name="refine_definition-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -9568,6 +9751,9 @@
 		<xsl:attribute name="margin-right">7mm</xsl:attribute>
 	</xsl:attribute-set> <!-- example-body-style -->
 
+	<xsl:template name="refine_example-body-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="example-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -9622,6 +9808,8 @@
 			<xsl:when test="contains($element, 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
 
+					<xsl:call-template name="refine_example-p-style"/>
+
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -9678,6 +9866,7 @@
 						</fo:block>
 
 						<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+							<xsl:call-template name="refine_example-body-style"/>
 							<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 								<xsl:variable name="example_body">
 									<xsl:apply-templates select="node()[not(self::mn:fmt-name)]">
@@ -9740,6 +9929,7 @@
 						<xsl:if test="*[not(self::mn:fmt-name)][position() &gt; 1]">
 							<!-- display further elements in blocks -->
 							<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+								<xsl:call-template name="refine_example-body-style"/>
 								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 									<xsl:apply-templates select="*[not(self::mn:fmt-name)][position() &gt; 1]">
 										<xsl:with-param name="fo_element" select="'block'"/>
@@ -10078,6 +10268,9 @@
 		<!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
+	<xsl:template name="refine_table-fn-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-fmt-fn-label-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
@@ -10090,30 +10283,12 @@
 		</xsl:if>
 	</xsl:template>
 
-	<xsl:attribute-set name="fn-container-body-style">
-		<xsl:attribute name="text-indent">0</xsl:attribute>
-		<xsl:attribute name="start-indent">0</xsl:attribute>
-	</xsl:attribute-set>
-
 	<xsl:attribute-set name="table-fn-body-style">
 	</xsl:attribute-set>
 
-	<xsl:attribute-set name="figure-fn-number-style">
-		<xsl:attribute name="padding-right">5mm</xsl:attribute>
-	</xsl:attribute-set> <!-- figure-fn-number-style -->
-
-	<xsl:attribute-set name="figure-fmt-fn-label-style">
-		<xsl:attribute name="font-size">80%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
-
-	<xsl:template name="refine_figure-fmt-fn-label-style">
+	<xsl:template name="refine_table-fn-body-style">
 	</xsl:template>
 
-	<xsl:attribute-set name="figure-fn-body-style">
-		<xsl:attribute name="text-align">justify</xsl:attribute>
-		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
 	<!-- ========================== -->
 	<!-- END Table styles -->
 	<!-- ========================== -->
@@ -11459,6 +11634,7 @@
 					</xsl:apply-templates>
 
 					<fo:inline xsl:use-attribute-sets="table-fn-body-style">
+						<xsl:call-template name="refine_table-fn-body-style"/>
 						<!-- <xsl:copy-of select="./node()"/> -->
 						<xsl:apply-templates/>
 					</fo:inline>
@@ -11477,6 +11653,7 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:inline xsl:use-attribute-sets="table-fn-number-style" role="SKIP">
+				<xsl:call-template name="refine_table-fn-number-style"/>
 
 				<!-- tab is padding-right -->
 				<xsl:apply-templates select=".//mn:tab">
@@ -12348,9 +12525,18 @@
 	<xsl:attribute-set name="dl-block-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dl-block-style">
+		<xsl:if test="@key = 'true' and ancestor::mn:figure">
+			<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:attribute-set name="dt-row-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_dt-row-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="dt-cell-style">
 	</xsl:attribute-set>
 
@@ -12374,6 +12560,9 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- dl-name-style -->
 
+	<xsl:template name="refine_dl-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set>
@@ -12412,9 +12601,7 @@
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
 		<fo:block-container xsl:use-attribute-sets="dl-block-style" role="SKIP">
 
-			<xsl:if test="@key = 'true' and ancestor::mn:figure">
-				<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-			</xsl:if>
+			<xsl:call-template name="refine_dl-block-style"/>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 			<xsl:if test="not(ancestor::mn:quote)">
@@ -12720,6 +12907,8 @@
 		<xsl:if test="$process = 'true'">
 			<fo:block xsl:use-attribute-sets="dl-name-style">
 
+				<xsl:call-template name="refine_dl-name-style"/>
+
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -12908,6 +13097,8 @@
 		<xsl:param name="split_keep-within-line"/>
 
 		<fo:table-row xsl:use-attribute-sets="dt-row-style">
+			<xsl:call-template name="refine_dt-row-style"/>
+
 			<xsl:call-template name="insert_dt_cell">
 				<xsl:with-param name="key_iso" select="$key_iso"/>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
@@ -13121,18 +13312,25 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_appendix-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="appendix-example-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_appendix-example-style">
+	</xsl:template>
+
 	<!-- ======================== -->
 	<!-- Appendix processing -->
 	<!-- ======================== -->
 	<xsl:template match="mn:appendix">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
+			<xsl:call-template name="refine_appendix-style"/>
 			<xsl:apply-templates select="mn:fmt-title"/>
 		</fo:block>
 		<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
@@ -13151,6 +13349,7 @@
 	<xsl:template match="mn:appendix//mn:example" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
+			<xsl:call-template name="refine_appendix-example-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 		</fo:block>
 		<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
@@ -13159,7 +13358,16 @@
 	<xsl:attribute-set name="xref-style">
 		<xsl:attribute name="color">blue</xsl:attribute>
 		<xsl:attribute name="text-decoration">underline</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- xref-style -->
+
+	<xsl:template name="refine_xref-style">
+		<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[self::mn:table or self::mn:dl])">
+			<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="parent::mn:add">
+			<xsl:call-template name="append_add-style"/>
+		</xsl:if>
+	</xsl:template> <!-- refine_xref-style -->
 
 	<xsl:template match="mn:fmt-xref">
 		<xsl:call-template name="insert_basic_link">
@@ -13168,12 +13376,8 @@
 					<xsl:call-template name="getAltText"/>
 				</xsl:variable>
 				<fo:basic-link internal-destination="{@target}" fox:alt-text="{$alt_text}" xsl:use-attribute-sets="xref-style">
-					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[self::mn:table or self::mn:dl])">
-						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="parent::mn:add">
-						<xsl:call-template name="append_add-style"/>
-					</xsl:if>
+					<xsl:call-template name="refine_xref-style"/>
+
 					<xsl:apply-templates/>
 				</fo:basic-link>
 			</xsl:with-param>
@@ -13286,7 +13490,7 @@
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-style -->
 
 	<xsl:template name="refine_note-style">
 		<xsl:if test="$layoutVersion = '1951'">
@@ -13311,14 +13515,20 @@
 		<xsl:if test="$doctype = 'amendment' and parent::mn:quote">
 			<xsl:attribute name="font-size">inherit</xsl:attribute>
 		</xsl:if>
-	</xsl:template>
+		<xsl:if test="ancestor::mn:bibliography">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:if test="following-sibling::*[1][self::mn:bibitem or self::mn:note]">
+				<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+	</xsl:template> <!-- refine_note-style -->
 
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
 
 	<xsl:attribute-set name="note-name-style">
 		<xsl:attribute name="padding-right">6mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-name-style -->
 
 	<xsl:template name="refine_note-name-style">
 		<xsl:variable name="note_name" select="mn:fmt-name"/>
@@ -13351,14 +13561,20 @@
 	<xsl:attribute-set name="note-p-style">
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-p-style -->
+
+	<xsl:template name="refine_note-p-style">
+		<xsl:if test="ancestor::mn:bibliography">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 
 	<xsl:attribute-set name="termnote-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-style -->
 
 	<xsl:template name="refine_termnote-style">
 		<xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or $layoutVersion = '1989'">
@@ -13370,7 +13586,7 @@
 	</xsl:template> <!-- refine_termnote-style -->
 
 	<xsl:attribute-set name="termnote-name-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-name-style -->
 
 	<xsl:template name="refine_termnote-name-style">
 	</xsl:template>
@@ -13378,6 +13594,9 @@
 	<xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termnote-p-style">
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- note      -->
 	<!-- termnote -->
@@ -13460,11 +13679,13 @@
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
 				<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
+					<xsl:call-template name="refine_note-p-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
+					<xsl:call-template name="refine_note-p-style"/>
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -13559,11 +13780,13 @@
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- first paragraph renders in the same line as titlenote name -->
 				<fo:inline xsl:use-attribute-sets="termnote-p-style">
+					<xsl:call-template name="refine_termnote-p-style"/>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="termnote-p-style">
+					<xsl:call-template name="refine_termnote-p-style"/>
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -13577,7 +13800,7 @@
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
 		<xsl:if test="$doctype = 'amendment' and (mn:note or mn:termnote)">
@@ -13590,6 +13813,9 @@
 		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_quote-source-style">
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -13618,6 +13844,7 @@
 				</fo:block-container>
 				<xsl:if test="mn:author or mn:fmt-source or mn:attribution">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
+						<xsl:call-template name="refine_quote-source-style"/>
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
 						<xsl:apply-templates select="mn:author"/>
 						<xsl:apply-templates select="mn:fmt-source"/>
@@ -13690,6 +13917,9 @@
 	<xsl:attribute-set name="figure-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -13697,7 +13927,7 @@
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="space-after">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- figure-name-style -->
 
 	<xsl:template name="refine_figure-name-style">
 	</xsl:template> <!-- refine_figure-name-style -->
@@ -13705,7 +13935,7 @@
 	<xsl:attribute-set name="image-style">
 		<xsl:attribute name="role">SKIP</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- image-style -->
 
 	<xsl:template name="refine_image-style">
 	</xsl:template>
@@ -13715,14 +13945,51 @@
 		<xsl:attribute name="content-height">100%</xsl:attribute>
 		<xsl:attribute name="scaling">uniform</xsl:attribute>
 		<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- image-graphic-style -->
+
+	<xsl:template name="refine_image-graphic-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="figure-source-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-source-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_figure-pseudocode-p-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-fn-number-style">
+		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fn-number-style -->
+
+	<xsl:template name="refine_figure-fn-number-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-fmt-fn-label-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
+
+	<xsl:template name="refine_figure-fmt-fn-label-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="figure-fn-body-style">
+		<xsl:attribute name="text-align">justify</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-fn-body-style">
+		<xsl:variable name="key_iso">true
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="margin-bottom">0</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
 	<!-- ============================ -->
@@ -13835,9 +14102,8 @@
 									</fo:table-cell>
 									<fo:table-cell>
 										<fo:block xsl:use-attribute-sets="figure-fn-body-style">
-											<xsl:if test="normalize-space($key_iso) = 'true'">
-												<xsl:attribute name="margin-bottom">0</xsl:attribute>
-											</xsl:if>
+											<xsl:call-template name="refine_figure-fn-body-style"/>
+
 											<!-- <xsl:copy-of select="./node()"/> -->
 											<xsl:apply-templates/>
 										</fo:block>
@@ -13855,6 +14121,7 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:inline xsl:use-attribute-sets="figure-fn-number-style" role="SKIP">
+				<xsl:call-template name="refine_figure-fn-number-style"/>
 				<xsl:attribute name="padding-right">0mm</xsl:attribute>
 
 				<!-- tab is padding-right -->
@@ -13892,6 +14159,7 @@
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 		</xsl:if>
 		<fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}"  -->
+			<xsl:call-template name="refine_figure-fn-number-style"/>
 			<!-- <xsl:value-of select="@reference"/> -->
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -13939,6 +14207,8 @@
 
 			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
 
+				<xsl:call-template name="refine_figure-style"/>
+
 				<xsl:for-each select="mn:fmt-name"> <!-- set context -->
 					<xsl:call-template name="setIDforNamedDestination"/>
 				</xsl:for-each>
@@ -13982,6 +14252,7 @@
 
 	<xsl:template match="mn:figure[@class = 'pseudocode']//mn:p">
 		<fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
+			<xsl:call-template name="refine_figure-pseudocode-p-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -14111,6 +14382,8 @@
 										</xsl:variable>
 										<xsl:copy-of select="xalan:nodeset($image-graphic-style_attributes)/attributes/@*"/>
 
+										<xsl:call-template name="refine_image-graphic-style"/>
+
 										<xsl:if test="not(@mimetype = 'image/svg+xml') and not(ancestor::mn:table)">
 											<xsl:variable name="scale">
 												<xsl:call-template name="getImageScale">
@@ -14810,6 +15083,9 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-style -->
 
+	<xsl:template name="refine_formula-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="formula-stem-block-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
 		<xsl:attribute name="text-align">left</xsl:attribute>
@@ -14881,6 +15157,8 @@
 	<xsl:template match="mn:formula[mn:fmt-name]/mn:fmt-stem">
 		<fo:block xsl:use-attribute-sets="formula-style">
 
+			<xsl:call-template name="refine_formula-style"/>
+
 			<fo:table table-layout="fixed" width="100%">
 				<fo:table-column column-width="95%"/>
 				<fo:table-column column-width="5%"/>
@@ -15311,6 +15589,9 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- list-name-style -->
 
+	<xsl:template name="refine_list-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="list-item-style">
 	</xsl:attribute-set>
 
@@ -15651,6 +15932,7 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:block xsl:use-attribute-sets="list-name-style">
+				<xsl:call-template name="refine_list-name-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -15711,29 +15993,50 @@
 	<!-- END Lists processing -->
 	<!-- ===================================== -->
 
+	<xsl:attribute-set name="footnote-separator-leader-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_footnote-separator-leader-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="fn-container-body-style">
+		<xsl:attribute name="text-indent">0</xsl:attribute>
+		<xsl:attribute name="start-indent">0</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_fn-container-body-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-reference-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-reference-style -->
 
 	<xsl:template name="refine_fn-reference-style">
 		<xsl:if test="ancestor::*[local-name()='table']">
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
 			<xsl:attribute name="baseline-shift">15%</xsl:attribute>
 		</xsl:if>
+		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_fn-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="fn-num-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<!--<xsl:attribute name="vertical-align">super</xsl:attribute> -->
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-num-style -->
+
+	<xsl:template name="refine_fn-num-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="fn-body-style">
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -15742,7 +16045,7 @@
 		<xsl:attribute name="start-indent">0</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-body-style" -->
 
 	<xsl:template name="refine_fn-body-style">
 		<xsl:if test="$layoutVersion = '1951'">
@@ -15826,10 +16129,12 @@
 					<xsl:choose>
 						<xsl:when test="ancestor::mn:bibitem">
 							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
+								<xsl:call-template name="refine_bibitem-note-fn-style"/>
 							</fn_styles>
 						</xsl:when>
 						<xsl:otherwise>
 							<fn_styles xsl:use-attribute-sets="fn-num-style">
+								<xsl:call-template name="refine_fn-num-style"/>
 							</fn_styles>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -15839,13 +16144,16 @@
 					<xsl:copy-of select="."/>
 				</xsl:for-each>
 
-				<xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
+				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
+				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
-				</xsl:if>
+				</xsl:if> -->
 				<xsl:if test="$layoutVersion = '2024'">
 					<xsl:attribute name="font-size">70%</xsl:attribute>
 				</xsl:if>
 
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
@@ -15867,10 +16175,12 @@
 			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false' or $footnote_body_from_table = 'true'">
 
 				<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
+					<xsl:call-template name="refine_fn-style"/>
 					<xsl:copy-of select="$footnote_inline"/>
 					<fo:footnote-body role="Note">
 
 						<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
+							<xsl:call-template name="refine_fn-container-body-style"/>
 
 							<xsl:variable name="fn_block">
 								<xsl:call-template name="refine_fn-body-style"/>
@@ -15969,17 +16279,30 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-style -->
 
+	<xsl:template name="refine_admonition-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admonition-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-container-style -->
 
+	<xsl:template name="refine_admonition-container-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-name-style -->
 
+	<xsl:template name="refine_admonition-name-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="admonition-p-style">
 	</xsl:attribute-set> <!-- admonition-p-style -->
+
+	<xsl:template name="refine_admonition-p-style">
+	</xsl:template>
+
 	<!-- end admonition -->
 
 	<!-- ================ -->
@@ -15988,6 +16311,8 @@
 	<xsl:template match="mn:admonition">
 		<fo:block xsl:use-attribute-sets="admonition-style">
 
+			<xsl:call-template name="refine_admonition-style"/>
+
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:if test="@type = 'editorial'">
@@ -16064,11 +16389,24 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
 
+	<xsl:attribute-set name="references-non-normative-title-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_references-non-normative-title-style">
+
+	</xsl:template>
+
 	<!-- bibitem in Normative References (references/@normative="true") -->
 	<xsl:attribute-set name="bibitem-normative-style">
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-style -->
 
+	<xsl:template name="refine_bibitem-normative-style">
+		<xsl:if test="$layoutVersion = '2024'">
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- bibitem in Normative References (references/@normative="true"), renders as list -->
 	<xsl:attribute-set name="bibitem-normative-list-style">
 		<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
@@ -16076,9 +16414,15 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-list-style -->
 
+	<xsl:template name="refine_bibitem-normative-list-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="bibitem-non-normative-style">
 	</xsl:attribute-set> <!-- bibitem-non-normative-style -->
 
+	<xsl:template name="refine_bibitem-non-normative-style">
+	</xsl:template>
+
 	<!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
 	<xsl:attribute-set name="bibitem-non-normative-list-style">
 		<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
@@ -16086,18 +16430,33 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
 
+	<xsl:template name="refine_bibitem-non-normative-list-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="bibitem-non-normative-list-item-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_bibitem-non-normative-list-item-style">
+		<xsl:if test="$layoutVersion = '2024'">
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- bibitem in bibliography section (references/@normative="false"), list body -->
 	<xsl:attribute-set name="bibitem-normative-list-body-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_bibitem-normative-list-body-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="bibitem-non-normative-list-body-style">
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
 
+	<xsl:template name="refine_bibitem-non-normative-list-body-style">
+	</xsl:template>
+
 	<!-- footnote reference number for bibitem, in the text  -->
 	<xsl:attribute-set name="bibitem-note-fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
@@ -16106,6 +16465,9 @@
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
 
+	<xsl:template name="refine_bibitem-note-fn-style">
+	</xsl:template>
+
 	<!-- footnote number on the page bottom -->
 	<xsl:attribute-set name="bibitem-note-fn-number-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
@@ -16124,6 +16486,9 @@
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 
+	<xsl:template name="refine_references-non-normative-style">
+	</xsl:template>
+
 		<!-- ======================= -->
 	<!-- Bibliography rendering -->
 	<!-- ======================= -->
@@ -16170,6 +16535,7 @@
 		<xsl:apply-templates select="mn:fmt-title[@columns = 1]"/>
 
 		<fo:block xsl:use-attribute-sets="references-non-normative-style">
+			<xsl:call-template name="refine_references-non-normative-style"/>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-title and @columns = 1)]"/>
 		</fo:block>
 	</xsl:template> <!-- references -->
@@ -16183,9 +16549,8 @@
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
-				<xsl:if test="$layoutVersion = '2024'">
-					<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-				</xsl:if>
+			<xsl:call-template name="refine_bibitem-normative-style"/>
+
 			<xsl:call-template name="processBibitem"/>
 		</fo:block>
 
@@ -16197,13 +16562,14 @@
 	</xsl:variable>
 	<xsl:if test="normalize-space($list_items) != ''">
 		<fo:list-block xsl:use-attribute-sets="bibitem-non-normative-list-style">
+			<xsl:call-template name="refine_bibitem-non-normative-list-style"/>
 			<xsl:copy-of select="$list_items"/>
 		</fo:list-block>
 	</xsl:if>
 </xsl:template>
 
 	<!-- Bibliography (non-normative references) -->
-	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
+	<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 		<xsl:choose>
 			<xsl:when test="$skip = 'true'"><!-- skip bibitem --></xsl:when>
@@ -16214,15 +16580,17 @@
 
 	</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
 
+	<!-- bibitem's notes will be processing in 'processBibitemFollowingNotes' -->
+	<xsl:template match="mn:references/mn:note" priority="2"/> <!-- [not(@normative='true')] -->
+
 	<xsl:template name="insertListItem_Bibitem">
 		<xsl:choose>
 			<xsl:when test="@hidden = 'true'"><!-- skip --></xsl:when>
 			<xsl:otherwise>
 				<xsl:call-template name="setNamedDestination"/>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
-					<xsl:if test="$layoutVersion = '2024'">
-						<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_bibitem-non-normative-list-item-style"/>
+
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">
@@ -16233,16 +16601,18 @@
 						</fo:block>
 					</fo:list-item-label>
 					<fo:list-item-body start-indent="body-start()">
-						<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style" role="SKIP">
+						<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style"> <!-- role="SKIP" -->
+							<xsl:call-template name="refine_bibitem-non-normative-list-body-style"/>
 							<xsl:call-template name="processBibitem">
 								<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
 							</xsl:call-template>
 						</fo:block>
+						<xsl:call-template name="processBibitemFollowingNotes"/>
 					</fo:list-item-body>
 				</fo:list-item>
 			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
+		<xsl:apply-templates select="following-sibling::*[self::mn:bibitem][1]">
 			<xsl:with-param name="skip">false</xsl:with-param>
 		</xsl:apply-templates>
 	</xsl:template>
@@ -16258,25 +16628,19 @@
 			<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
-		<!-- end bibitem processing -->
+				<xsl:if test="ancestor::mn:references[@normative = 'true']">
+					<xsl:call-template name="processBibitemFollowingNotes"/>
+				</xsl:if>
 
-		<xsl:call-template name="processBibliographyNote"/>
+		<!-- end bibitem processing -->
 	</xsl:template> <!-- processBibitem (bibitem) -->
 
-	<xsl:template name="processBibliographyNote">
-		<xsl:if test="self::mn:note">
-			<xsl:variable name="note_node">
-				<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
-					<xsl:copy> <!-- skip @id -->
-						<xsl:copy-of select="node()"/>
-					</xsl:copy>
-				</xsl:element>
-			</xsl:variable>
-			<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
-				<xsl:call-template name="note"/>
-			</xsl:for-each> -->
+	<xsl:template name="processBibitemFollowingNotes">
+		<!-- current context is bibitem element -->
+		<xsl:variable name="bibitem_id" select="@id"/>
+		<xsl:for-each select="following-sibling::mn:note[preceding-sibling::mn:bibitem[1][@id = $bibitem_id] and     preceding-sibling::*[1][self::mn:note or self::mn:bibitem]]">
 			<xsl:call-template name="note"/>
-		</xsl:if>
+		</xsl:for-each>
 	</xsl:template>
 
 	<xsl:template match="mn:title" mode="title">
@@ -16479,14 +16843,20 @@
 		<xsl:attribute name="font-size">16pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="margin-bottom">84pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- indexsect-title-style -->
+
+	<xsl:template name="refine_indexsect-title-style">
+	</xsl:template>
 
 	<xsl:attribute-set name="indexsect-clause-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- indexsect-clause-title-style -->
+
+	<xsl:template name="refine_indexsect-clause-title-style">
+	</xsl:template>
 	<!-- End Index section styles -->
 
 	<!-- =================== -->
@@ -16680,6 +17050,7 @@
 
 	<xsl:template match="mn:indexsect/mn:fmt-title | mn:indexsect/mn:title" priority="4">
 		<fo:block xsl:use-attribute-sets="indexsect-title-style">
+			<xsl:call-template name="refine_indexsect-title-style"/>
 			<!-- Index -->
 			<xsl:apply-templates/>
 		</fo:block>
@@ -16688,6 +17059,7 @@
 	<xsl:template match="mn:indexsect/mn:clause/mn:fmt-title | mn:indexsect/mn:clause/mn:title" priority="4">
 		<!-- Letter A, B, C, ... -->
 		<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
+			<xsl:call-template name="refine_indexsect-clause-title-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -16915,9 +17287,15 @@
 		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
 
+	<xsl:template name="refine_toc-leader-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-pagenumber-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-pagenumber-style">
+	</xsl:template>
+
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
@@ -16931,6 +17309,9 @@
 	<xsl:attribute-set name="toc-listof-item-block-style">
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-item-block-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="toc-listof-item-style">
 		<xsl:attribute name="role">TOCI</xsl:attribute>
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -16938,6 +17319,9 @@
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_toc-listof-item-style">
+	</xsl:template>
+
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -18051,23 +18435,55 @@
 	<!-- Ruby text (CJK languages) rendering -->
 	<!-- ===================================== -->
 	<!-- ===================================== -->
+
+	<xsl:attribute-set name="ruby-style">
+		<xsl:attribute name="text-indent">0mm</xsl:attribute>
+		<xsl:attribute name="last-line-end-indent">0mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_ruby-style">
+		<xsl:if test="not(ancestor::mn:ruby)">
+			<xsl:attribute name="alignment-baseline">central</xsl:attribute>
+		</xsl:if>
+		<xsl:variable name="rt_text" select="mn:rt"/>
+		<xsl:variable name="rb_text" select=".//mn:rb[not(mn:ruby)]"/>
+		<!-- Example: width="2em"  -->
+		<xsl:variable name="text_rt_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rt_text, $font_main, 6)"/>
+		<xsl:variable name="text_rb_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rb_text, $font_main, 10)"/>
+		<xsl:variable name="text_width">
+			<xsl:choose>
+				<xsl:when test="$text_rt_width &gt;= $text_rb_width"><xsl:value-of select="$text_rt_width"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$text_rb_width"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:attribute name="width"><xsl:value-of select="$text_width div 10"/>em</xsl:attribute>
+	</xsl:template> <!-- refine_ruby-style -->
+
+	<xsl:attribute-set name="rb-style">
+		<xsl:attribute name="line-height">1em</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_rb-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="rt-style">
+		<xsl:attribute name="font-size">0.5em</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="line-height">1.2em</xsl:attribute>
+		<xsl:attribute name="space-before">-1.4em</xsl:attribute>
+		<xsl:attribute name="space-before.conditionality">retain</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_rt-style">
+		<xsl:if test="ancestor::mn:ruby[last()]//mn:ruby or     ancestor::mn:rb">
+			<xsl:attribute name="space-before">0em</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template match="mn:ruby">
-		<fo:inline-container text-indent="0mm" last-line-end-indent="0mm">
-			<xsl:if test="not(ancestor::mn:ruby)">
-				<xsl:attribute name="alignment-baseline">central</xsl:attribute>
-			</xsl:if>
-			<xsl:variable name="rt_text" select="mn:rt"/>
-			<xsl:variable name="rb_text" select=".//mn:rb[not(mn:ruby)]"/>
-			<!-- Example: width="2em"  -->
-			<xsl:variable name="text_rt_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rt_text, $font_main, 6)"/>
-			<xsl:variable name="text_rb_width" select="java:org.metanorma.fop.Util.getStringWidthByFontSize($rb_text, $font_main, 10)"/>
-			<xsl:variable name="text_width">
-				<xsl:choose>
-					<xsl:when test="$text_rt_width &gt;= $text_rb_width"><xsl:value-of select="$text_rt_width"/></xsl:when>
-					<xsl:otherwise><xsl:value-of select="$text_rb_width"/></xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			<xsl:attribute name="width"><xsl:value-of select="$text_width div 10"/>em</xsl:attribute>
+		<fo:inline-container xsl:use-attribute-sets="ruby-style">
+			<xsl:call-template name="refine_ruby-style"/>
 
 			<xsl:choose>
 				<xsl:when test="ancestor::mn:ruby">
@@ -18085,17 +18501,14 @@
 	</xsl:template>
 
 	<xsl:template match="mn:rb">
-		<fo:block line-height="1em" text-align="center"><xsl:apply-templates/></fo:block>
+		<fo:block xsl:use-attribute-sets="rb-style"><xsl:call-template name="refine_rb-style"/><xsl:apply-templates/></fo:block>
 	</xsl:template>
 
 	<xsl:template match="mn:rt">
-		<fo:block font-size="0.5em" text-align="center" line-height="1.2em" space-before="-1.4em" space-before.conditionality="retain"> <!--  -->
-			<xsl:if test="ancestor::mn:ruby[last()]//mn:ruby or      ancestor::mn:rb">
-				<xsl:attribute name="space-before">0em</xsl:attribute>
-			</xsl:if>
+		<fo:block xsl:use-attribute-sets="rt-style"> <!--  -->
+			<xsl:call-template name="refine_rt-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
-
 	</xsl:template>
 
 	<!-- ===================================== -->
@@ -18104,6 +18517,18 @@
 	<!-- ===================================== -->
 	<!-- ===================================== -->
 
+	<xsl:attribute-set name="annex-title-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_annex-title-style">
+	</xsl:template>
+
+	<xsl:attribute-set name="p-zzSTDTitle1-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_p-zzSTDTitle1-style">
+	</xsl:template>
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>