RubyGems - metanorma-ribose - Versions diffs - 2.7.2 → 2.7.4 - Mend

metanorma-ribose 2.7.2 → 2.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

checksums.yaml +4 -4
data/lib/isodoc/ribose/html/htmlstyle.css +24 -30
data/lib/isodoc/ribose/ribose.standard.xsl +819 -252
data/lib/metanorma/ribose/isodoc.rng +44 -19
data/lib/metanorma/ribose/version.rb +1 -1
data/metanorma.yml +4 -1
metadata +2 -2

data/lib/isodoc/ribose/ribose.standard.xsl CHANGED Viewed

@@ -350,9 +350,13 @@
 				<xsl:variable name="toc_and_boilerplate">
 					<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:clause[@type = 'toc']"/>
+					<!-- <xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:copyright-statement"/>
 					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:legal-statement"/>
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/> -->
-					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/mn:feedback-statement"/>
+					<xsl:apply-templates select="/mn:metanorma/mn:boilerplate/*"/>
 				</xsl:variable>
 				<xsl:if test="normalize-space($toc_and_boilerplate) != ''">
@@ -388,9 +392,9 @@
 							<xsl:call-template name="insertHeaderFooter">
 								<xsl:with-param name="section">main</xsl:with-param>
 							</xsl:call-template>
-							<fo:flow flow-name="xsl-region-body">
+							<fo:flow flow-name="xsl-region-body" role="SKIP">
-								<fo:block line-height="130%">
+								<fo:block line-height="130%" role="SKIP">
 									<!-- <xsl:apply-templates select="/mn:metanorma/mn:preface/mn:abstract" />
 									<xsl:apply-templates select="/mn:metanorma/mn:preface/mn:foreword" />
@@ -410,6 +414,8 @@
 				</xsl:for-each>
 			</xsl:for-each>
+			<xsl:call-template name="back-page"/>
 		</fo:root>
 	</xsl:template>
@@ -500,9 +506,17 @@
 					<xsl:if test="string-length($title) &gt; 80">
 						<xsl:attribute name="margin-right">-30mm</xsl:attribute>
 					</xsl:if>
-					<fo:block font-size="27pt" font-weight="bold" role="H1">
-							<xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang]" mode="cover_page"/>
-					</fo:block>
+					<xsl:variable name="titles">
+						<xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and (@type = 'intro' or not(@type))]"/>
+						<xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'main'][last()]"/>
+					</xsl:variable>
+					<xsl:for-each select="xalan:nodeset($titles)/mn:title">
+						<fo:block font-size="27pt" font-weight="bold" role="H1">
+							<xsl:apply-templates/><xsl:if test="position() != last()"><xsl:value-of select="$nonbreak_space_em_dash"/></xsl:if>
+						</fo:block>
+					</xsl:for-each>
 					<fo:block space-before="9pt" font-size="16.8pt" font-weight="600">
 						<xsl:value-of select="$docnumber_version"/>
 					</fo:block>
@@ -511,6 +525,9 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- END: cover-page -->
+	<xsl:template name="back-page">
+	</xsl:template>
 	<xsl:template name="processPrefaceAndMainSectionsRibose_items">
 		<xsl:variable name="updated_xml_step_move_pagebreak">
@@ -598,12 +615,8 @@
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="mn:title" mode="cover_page">
-		<xsl:apply-templates/>
-	</xsl:template>
 	<xsl:template match="mn:preface/mn:clause[@type = 'toc']" name="toc" priority="3">
-		<fo:block role="TOC">
+		<fo:block role="SKIP">
 			<xsl:apply-templates/>
 			<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
@@ -611,7 +624,7 @@
 				<xsl:if test="$contents//mnx:item[@display = 'true']">
 					<fo:block-container xsl:use-attribute-sets="toc-style">
-						<fo:block-container margin-left="0mm" margin-right="0mm">
+						<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 							<xsl:for-each select="$contents//mnx:item[@display = 'true']">
 								<fo:block xsl:use-attribute-sets="toc-item-style">
@@ -744,18 +757,20 @@
 	<!-- ============================= -->
 	<!-- ============================= -->
+	<xsl:template match="mn:copyright-statement" priority="2"/>
+	<xsl:template match="mn:legal-statement" priority="2">
+		<xsl:apply-templates/>
+	</xsl:template>
 	<xsl:template match="mn:feedback-statement" priority="2">
-		<fo:block-container border="1pt solid black" padding="1mm" padding-left="2mm">
+		<fo:block-container xsl:use-attribute-sets="feedback-statement-style">
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:block-container>
 	</xsl:template>
-	<xsl:template match="mn:legal-statement" priority="2">
-		<xsl:apply-templates/>
-	</xsl:template>
 	<!-- ====== -->
 	<!-- title      -->
 	<!-- ====== -->
@@ -843,20 +858,21 @@
 			<xsl:choose>
 				<xsl:when test="$level = 1">
-					<fo:block-container margin-left="-15mm">
-						<fo:block-container margin-left="0mm">
-							<fo:table width="100%" table-layout="fixed">
+					<fo:block-container margin-left="-15mm" role="SKIP">
+						<fo:block-container margin-left="0mm" role="SKIP">
+							<fo:table width="100%" table-layout="fixed" role="SKIP">
 								<fo:table-column column-width="15mm"/>
 								<fo:table-column column-width="150mm"/>
-								<fo:table-body>
-									<fo:table-row>
-										<fo:table-cell text-align="left">
-											<fo:block>
+								<fo:table-body role="SKIP">
+									<fo:table-row role="SKIP">
+										<fo:table-cell text-align="left" role="SKIP">
+											<fo:block role="SKIP">
+												<xsl:call-template name="setIDforNamedDestinationInline"/>
 												<xsl:call-template name="extractSection"/><!-- section number 1 2 3  ... -->
 											</fo:block>
 										</fo:table-cell>
-										<fo:table-cell>
-											<fo:block>
+										<fo:table-cell role="SKIP">
+											<fo:block role="SKIP">
 													<xsl:call-template name="extractTitle"/> <!-- section title -->
 													<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 												</fo:block>
@@ -868,6 +884,7 @@
 					</fo:block-container>
 				</xsl:when>
 				<xsl:otherwise>
+						<xsl:call-template name="setIDforNamedDestinationInline"/>
 						<xsl:apply-templates/>
 						<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 				</xsl:otherwise>
@@ -889,7 +906,9 @@
 	</xsl:template> -->
 	<xsl:template match="mn:terms" priority="3">
-		<fo:block break-after="page"/>
+		<xsl:if test="not(ancestor::*[@type = 'terms'])">
+			<fo:block break-after="page"/>
+		</xsl:if>
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
@@ -907,6 +926,8 @@
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
+		<xsl:call-template name="setNamedDestination"/>
 		<xsl:element name="{$element-name}">
 			<xsl:attribute name="id">
 				<xsl:value-of select="@id"/>
@@ -944,11 +965,11 @@
 	</xsl:template>
 	<xsl:template match="mn:ul | mn:ol" mode="list" priority="2">
-		<fo:block-container>
-			<fo:block-container margin-left="0mm">
+		<fo:block-container role="SKIP">
+			<fo:block-container margin-left="0mm" role="SKIP">
 				<xsl:choose>
 					<xsl:when test="not(ancestor::mn:ul) and not(ancestor::mn:ol)">
-						<fo:block padding-bottom="12pt" padding-top="4pt">
+						<fo:block padding-bottom="12pt" padding-top="4pt" role="SKIP">
 							<xsl:call-template name="listProcessing"/>
 						</fo:block>
 					</xsl:when>
@@ -982,27 +1003,16 @@
 	</xsl:template>
 	<xsl:template match="mn:fmt-preferred | mn:fmt-deprecates | mn:fmt-admitted" priority="2">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="$level &gt;= 2">13pt</xsl:when>
-				<xsl:otherwise>12pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:variable name="levelTerm">
-			<xsl:call-template name="getLevelTermName"/>
-		</xsl:variable>
-		<fo:block font-weight="bold" color="black" font-size="{$font-size}" keep-with-next="always" role="H{$levelTerm}"> <!-- 600 - semibold -->
+		<fo:block xsl:use-attribute-sets="preferred-style">
+			<xsl:call-template name="refine_preferred-style"/>
 			<xsl:if test="preceding-sibling::*[1][self::mn:fmt-name]">
-				<xsl:attribute name="space-before">11mm</xsl:attribute>
 				<fo:inline padding-right="1mm">
 					<xsl:apply-templates select="ancestor::mn:term[1]/mn:fmt-name"/>
 				</fo:inline>
 			</xsl:if>
-			<fo:inline padding-right="4mm"><xsl:if test="self::mn:fmt-preferred"><xsl:call-template name="setStyle_preferred"/></xsl:if><xsl:apply-templates/></fo:inline>
+			<fo:inline padding-right="4mm"><xsl:if test="self::mn:fmt-preferred"><xsl:call-template name="refine_preferred-term-style"/></xsl:if><xsl:apply-templates/></fo:inline>
 			<xsl:variable name="term_kind">
 				<xsl:choose>
@@ -1030,52 +1040,54 @@
 					</fo:inline>
 				</fo:block>
 			</fo:inline-container>
 		</fo:block>
 	</xsl:template>
 	<xsl:template match="mn:references[not(@normative='true')]" priority="3">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
-			<fo:table width="100%" table-layout="fixed">
+		<fo:block id="{@id}" role="SKIP">
+			<fo:table width="100%" table-layout="fixed" role="Sect">
 				<fo:table-column column-width="100%"/>
-				<fo:table-header>
-					<fo:table-row>
-						<fo:table-cell text-align="left">
-							<fo:block margin-left="-15mm" role="H1"> <!-- Bibliography section title -->
-								<xsl:attribute name="font-size">22pt</xsl:attribute>
-								<xsl:attribute name="font-weight">bold</xsl:attribute>
-								<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
-								<xsl:attribute name="color">black</xsl:attribute>
-								<xsl:attribute name="line-height">125%</xsl:attribute>
+				<fo:table-header role="SKIP">
+					<!-- repeat table header on each page -->
+					<fo:table-row role="SKIP">
+						<fo:table-cell text-align="left" role="SKIP">
+							<fo:block xsl:use-attribute-sets="references-non-normative-title-style"> <!-- Bibliography section title -->
 								<xsl:apply-templates select="mn:fmt-title/node()"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-header>
-				<fo:table-body>
-					<fo:table-row>
-						<fo:table-cell text-align="left">
-							<fo:block>
+				<fo:table-body role="SKIP">
+					<fo:table-row role="SKIP">
+						<fo:table-cell text-align="left" role="SKIP">
+							<fo:block role="L">
 								<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 				</fo:table-body>
 			</fo:table>
 		</fo:block>
 	</xsl:template>
 	<xsl:template match="*[self::mn:table or self::mn:figure or self::mn:sourcecode]/mn:fmt-name/node()[1][self::text()]" priority="2">
+		<xsl:variable name="styles_">
+			<xsl:choose>
+				<xsl:when test="ancestor::mn:table"><styles xsl:use-attribute-sets="table-number-style"><xsl:call-template name="refine_table-number-style"/></styles></xsl:when>
+				<xsl:when test="ancestor::mn:figure"><styles xsl:use-attribute-sets="figure-number-style"><xsl:call-template name="refine_figure-number-style"/></styles></xsl:when>
+				<xsl:when test="ancestor::mn:sourcecode"><styles xsl:use-attribute-sets="sourcecode-number-style"><xsl:call-template name="refine_sourcecode-number-style"/></styles></xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
 		<xsl:choose>
 			<xsl:when test="contains(., '—')">
 				<xsl:variable name="name_number" select="normalize-space(translate(substring-before(., '—'), ' ', ' '))"/>
-				<fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new($name_number))"/><xsl:text>:</xsl:text></fo:inline>
+				<fo:inline><xsl:copy-of select="$styles/styles/@*"/><xsl:value-of select="$name_number"/><xsl:text>:</xsl:text></fo:inline>
 				<xsl:value-of select="substring-after(., '—')"/>
 			</xsl:when>
 			<xsl:when test="starts-with(., 'Figure ') or starts-with(., 'Table ')">
-				<fo:inline font-weight="bold" font-style="normal" color="black"><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/></fo:inline>
+				<fo:inline><xsl:copy-of select="$styles/styles/@*"/><xsl:value-of select="."/></fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="."/>
@@ -1084,17 +1096,12 @@
 	</xsl:template>
 	<xsl:template match="mn:clause" priority="2">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel">
-				<xsl:with-param name="depth" select="mn:title/@depth"/>
-			</xsl:call-template>
-		</xsl:variable>
-		<fo:block-container>
-			<xsl:if test="$level &gt;= 4">
-				<xsl:attribute name="margin-left">13mm</xsl:attribute>
-			</xsl:if>
-			<fo:block-container margin-left="0mm">
-				<fo:block>
+		<fo:block-container xsl:use-attribute-sets="clause-style">
+			<xsl:call-template name="refine_clause-style"/>
+			<fo:block-container margin-left="0mm" role="SKIP">
+				<xsl:call-template name="setNamedDestination"/>
+				<fo:block role="SKIP">
 					<xsl:call-template name="setId"/>
 					<xsl:call-template name="addReviewHelper"/>
 					<xsl:apply-templates/>
@@ -1105,11 +1112,21 @@
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="section"/>
+		<xsl:call-template name="insertHoneycomb">
+			<xsl:with-param name="section" select="$section"/>
+		</xsl:call-template>
+		<xsl:call-template name="insertFooter"/>
+	</xsl:template>
+	<xsl:template name="insertHoneycomb">
+		<xsl:param name="section"/>
 		<!-- LT - left top -->
 		<!-- RT - right top -->
 		<!-- LB - left bottom -->
 		<!-- RB - right bottom -->
-		<xsl:variable name="width">170,26</xsl:variable>
+		<!-- <xsl:variable name="width">170,26</xsl:variable> -->
 		<xsl:variable name="left_left">-28.02</xsl:variable>
 		<xsl:variable name="left_right">72</xsl:variable>
 		<xsl:variable name="top_top">-25.75</xsl:variable>
@@ -1201,19 +1218,36 @@
 					</fo:block>
 			</fo:block-container>
 		</fo:static-content>
-		<xsl:call-template name="insertFooter"/>
 	</xsl:template>
 	<xsl:template name="insertFooter">
-		<xsl:param name="invert"/>
+		<!-- <xsl:param name="invert"/> -->
 		<xsl:variable name="footerText">
 			<xsl:text>Ribose</xsl:text>
 			<xsl:text> </xsl:text>
-			<xsl:call-template name="capitalize">
-				<xsl:with-param name="str" select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
+			<xsl:call-template name="capitalizeWords">
+				<xsl:with-param name="str">
+					<xsl:choose>
+						<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:doctype-alias">
+							<xsl:value-of select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:doctype-alias"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="/mn:metanorma/mn:bibdata/mn:ext/mn:doctype"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:with-param>
 			</xsl:call-template>
 		</xsl:variable>
+		<xsl:call-template name="insertFooterOdd">
+			<xsl:with-param name="footerText" select="$footerText"/>
+		</xsl:call-template>
+		<xsl:call-template name="insertFooterEven">
+			<xsl:with-param name="footerText" select="$footerText"/>
+		</xsl:call-template>
+	</xsl:template>
+	<xsl:template name="insertFooterOdd">
+		<xsl:param name="footerText"/>
 		<fo:static-content flow-name="footer-odd" role="artifact">
 			<fo:block-container font-size="8pt" height="100%" color="black">
 				<fo:block text-align-last="justify" margin-right="1mm">
@@ -1226,14 +1260,18 @@
 				</fo:block>
 			</fo:block-container>
 		</fo:static-content>
+	</xsl:template>
+	<xsl:template name="insertFooterEven">
+		<xsl:param name="footerText"/>
 		<fo:static-content flow-name="footer-even" role="artifact">
 			<fo:block-container font-size="8pt" height="100%" color="black">
 				<fo:block text-align-last="justify" margin-right="1mm">
 					<fo:inline padding-right="11mm"><fo:page-number/></fo:inline>
 					<fo:inline>
-						<xsl:if test="$invert = 'true'">
+						<!-- <xsl:if test="$invert = 'true'">
 							<xsl:attribute name="color">white</xsl:attribute>
-						</xsl:if>
+						</xsl:if> -->
 						<xsl:value-of select="$footerText"/>
 					</fo:inline>
 					<fo:inline keep-together.within-line="always">
@@ -1529,6 +1567,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -1614,11 +1653,12 @@
 	<xsl:variable name="font_noto_sans_mono">Noto Sans Mono, Noto Sans Mono CJK HK, Noto Sans Mono CJK JP, Noto Sans Mono CJK KR, Noto Sans Mono CJK SC, Noto Sans Mono CJK TC</xsl:variable>
 	<xsl:variable name="font_noto_serif">Noto Serif, Noto Serif HK, Noto Serif JP, Noto Serif KR, Noto Serif SC, Noto Serif TC</xsl:variable>
 	<xsl:attribute-set name="root-style">
-		<xsl:attribute name="font-family">OpenSans, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
+		<xsl:attribute name="font-family">Open Sans, Source Sans 3, STIX Two Math, <xsl:value-of select="$font_noto_sans"/></xsl:attribute>
 		<xsl:attribute name="font-family-generic">Sans</xsl:attribute>
 		<xsl:attribute name="font-weight">300</xsl:attribute>
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="color">rgb(88, 88, 90)</xsl:attribute>
+		<xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute>
 	</xsl:attribute-set> <!-- root-style -->
 	<xsl:template name="insertRootStyle">
@@ -2073,6 +2113,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -2087,10 +2128,10 @@
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -2880,10 +2921,16 @@
 	<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-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-set> <!-- license-statement-p-style -->
@@ -2894,6 +2941,9 @@
 	<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 name="font-weight">normal</xsl:attribute>
@@ -2901,19 +2951,43 @@
 		<xsl:attribute name="margin-bottom">6pt</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 name="border">1pt solid black</xsl:attribute>
+		<xsl:attribute name="padding">1mm</xsl:attribute>
+		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</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 -->
 	<!-- ================================= -->
@@ -2939,6 +3013,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 -->
@@ -2956,6 +3031,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 -->
@@ -3137,13 +3213,33 @@
 		<xsl:attribute name="space-after">12pt</xsl:attribute>
 	</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>
 		<xsl:attribute name="role">Code</xsl:attribute>
 		<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="line-height">113%</xsl:attribute>
 	</xsl:attribute-set> <!-- sourcecode-style -->
@@ -3162,6 +3258,16 @@
 		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
+	<xsl:attribute-set name="sourcecode-number-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -3177,6 +3283,9 @@
 		<xsl:attribute name="keep-with-next">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>
@@ -3268,24 +3377,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">
 						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
@@ -3612,6 +3705,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>
@@ -3660,12 +3754,35 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="line-height">113%</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"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_tt-style">
+		<xsl:variable name="_font-size"> <!-- inherit -->
+			<xsl:choose>
+				<xsl:when test="ancestor::mn:table">inherit</xsl:when>
+				<xsl:otherwise>95%</xsl:otherwise> <!-- 110% -->
+			</xsl:choose>
+		</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>
@@ -3678,9 +3795,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>
@@ -3693,24 +3815,81 @@
 		<xsl:attribute name="text-decoration">line-through</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_del-style">
+	</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="not(parent::mn:fmt-termsource)">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="color">black</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::*['preferred']">
+			<xsl:attribute name="role">SKIP</xsl:attribute>
+		</xsl:if>
+	</xsl:template> <!-- refine_strong_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: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 font-style="italic">
-			<xsl:call-template name="refine_italic_style"/>
+	<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 name="refine_italic_style">
-	</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>
@@ -3719,52 +3898,27 @@
 		</fo:inline>
 	</xsl:template>
-	<xsl:template name="refine_strong_style">
-		<xsl:if test="not(parent::mn:fmt-termsource)">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="color">black</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"> <!-- inherit -->
-				<xsl:choose>
-					<xsl:when test="ancestor::mn:table">inherit</xsl:when>
-					<xsl:otherwise>95%</xsl:otherwise> <!-- 110% -->
-				</xsl:choose>
-			</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 -->
@@ -3783,7 +3937,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>
@@ -3941,6 +4096,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>
@@ -3950,7 +4106,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>
@@ -4036,7 +4193,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>
@@ -4116,6 +4274,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>
@@ -4146,22 +4305,40 @@
 	<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-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-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>
@@ -4189,18 +4366,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>
@@ -4209,6 +4396,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>
@@ -4216,6 +4404,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>
@@ -4228,6 +4417,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"/>
@@ -4240,6 +4430,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/>
 			</fo:block>
 		</xsl:if>
@@ -4247,6 +4438,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>
@@ -4272,6 +4464,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>
@@ -4281,6 +4474,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>
@@ -4288,6 +4482,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>
@@ -4468,41 +4663,97 @@
 	<xsl:attribute-set name="term-style">
 	</xsl:attribute-set> <!-- term-style -->
+	<xsl:template name="refine_term-style">
+	</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-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set> <!-- preferred-style -->
+	<xsl:template name="refine_preferred-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:variable name="font-size">
+			<xsl:choose>
+				<xsl:when test="$level &gt;= 2">13pt</xsl:when>
+				<xsl:otherwise>12pt</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
+		<xsl:attribute name="role">H<xsl:value-of select="$levelTerm"/></xsl:attribute>
+		<xsl:if test="preceding-sibling::*[1][self::mn:fmt-name]">
+			<xsl:attribute name="space-before">11mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+	<xsl:attribute-set name="preferred-block-style">
 	</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:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+	</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 name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:attribute-set> <!-- admitted-style -->
+	<xsl:template name="refine_admitted-style">
+	</xsl:template>
 	<xsl:attribute-set name="deprecates-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color">black</xsl:attribute>
 	</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="keep-with-previous">always</xsl:attribute>
 		<xsl:attribute name="space-before">12pt</xsl:attribute>
 		<xsl:attribute name="space-after">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="keep-with-previous">always</xsl:attribute>
 	</xsl:attribute-set> <!-- termsource-style -->
@@ -4514,9 +4765,15 @@
 		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 	</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      -->
 	<!-- ====== -->
@@ -4532,9 +4789,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:if>
 			<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 		</fo:block>
 	</xsl:template>
@@ -4610,6 +4866,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>
@@ -4622,6 +4879,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>
@@ -4671,9 +4929,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"/>
@@ -4684,7 +4945,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>
@@ -4705,22 +4966,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:attribute name="font-weight">normal</xsl:attribute>
-		<xsl:attribute name="color">black</xsl:attribute>
-	</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(., ';')]">
@@ -4730,6 +4987,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>
@@ -4744,6 +5002,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>
@@ -4797,7 +5056,11 @@
 	<xsl:attribute-set name="example-body-style">
 	</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="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 		<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
@@ -4845,6 +5108,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>
@@ -4896,6 +5161,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)]">
@@ -4958,6 +5224,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'"/>
@@ -5081,6 +5348,16 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
+	<xsl:attribute-set name="table-number-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -5204,6 +5481,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-set> <!-- table-fmt-fn-label-style -->
@@ -5211,30 +5491,12 @@
 	<xsl:template name="refine_table-fmt-fn-label-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: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 -->
 	<!-- ========================== -->
@@ -5550,7 +5812,7 @@
 			</fo:block>
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -6511,6 +6773,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>
@@ -6529,6 +6792,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">
@@ -7400,10 +7664,19 @@
 	<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 name="min-height">7mm</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_dt-row-style">
+	</xsl:template>
 	<xsl:attribute-set name="dt-cell-style">
 	</xsl:attribute-set>
@@ -7426,6 +7699,9 @@
 		<xsl:attribute name="color">black</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>
@@ -7464,9 +7740,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)">
@@ -7762,6 +8036,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>
@@ -7950,6 +8226,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"/>
@@ -8164,18 +8442,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-weight">normal</xsl:attribute>
 		<xsl:attribute name="color">black</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</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)]"/>
@@ -8194,13 +8479,23 @@
 	<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)]"/>
 	</xsl:template>
 	<xsl:attribute-set name="xref-style">
-	</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">
@@ -8209,12 +8504,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>
@@ -8323,14 +8614,14 @@
 	<xsl:attribute-set name="note-style">
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-style -->
 	<xsl:template name="refine_note-style">
 		<xsl:if test="ancestor::mn:ul or ancestor::mn:ol and not(ancestor::mn:note[1]/following-sibling::*)">
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> <!-- refine_note-style -->
 	<xsl:variable name="note-body-indent">10mm</xsl:variable>
 	<xsl:variable name="note-body-indent-table">5mm</xsl:variable>
@@ -8339,7 +8630,7 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 		<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-name-style -->
 	<xsl:template name="refine_note-name-style">
 	</xsl:template> <!-- refine_note-name-style -->
@@ -8356,11 +8647,14 @@
 	<xsl:attribute-set name="note-p-style">
 		<xsl:attribute name="margin-top">12pt</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:template>
 	<xsl:attribute-set name="termnote-style">
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-style -->
 	<xsl:template name="refine_termnote-style">
 	</xsl:template> <!-- refine_termnote-style -->
@@ -8369,7 +8663,7 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 		<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-name-style -->
 	<xsl:template name="refine_termnote-name-style">
 	</xsl:template>
@@ -8377,6 +8671,9 @@
 	<xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_termnote-p-style">
+	</xsl:template>
 	<!-- ====== -->
 	<!-- note      -->
 	<!-- termnote -->
@@ -8437,11 +8734,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>
@@ -8533,11 +8832,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>
@@ -8552,7 +8853,7 @@
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="margin-left">13mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-style -->
 	<xsl:template name="refine_quote-style">
 	</xsl:template>
@@ -8562,6 +8863,9 @@
 		<xsl:attribute name="margin-right">25mm</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_quote-source-style">
+	</xsl:template>
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -8590,6 +8894,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"/>
@@ -8659,6 +8964,19 @@
 		<xsl:attribute name="margin-bottom">3mm</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_figure-style">
+	</xsl:template>
+	<xsl:attribute-set name="figure-number-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="font-style">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-transform">uppercase</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-size">13pt</xsl:attribute>
@@ -8668,7 +8986,7 @@
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-next">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 -->
@@ -8676,7 +8994,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>
@@ -8686,14 +9004,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">
+		</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 -->
 	<!-- ============================ -->
@@ -8806,9 +9161,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>
@@ -8826,6 +9180,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 -->
@@ -8863,6 +9218,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>
@@ -8911,6 +9267,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>
@@ -8953,6 +9311,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>
@@ -9082,6 +9441,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">
@@ -9781,6 +10142,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>
@@ -9851,6 +10215,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%"/>
@@ -10271,6 +10637,9 @@
 		<xsl:attribute name="color">black</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 name="space-after">4pt</xsl:attribute>
 	</xsl:attribute-set>
@@ -10573,6 +10942,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>
@@ -10633,27 +11003,48 @@
 	<!-- 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 name="font-size">70%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
 		<xsl:attribute name="font-style">italic</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-reference-style -->
 	<xsl:template name="refine_fn-reference-style">
+		<!-- 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">65%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</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>
@@ -10664,7 +11055,7 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
 		<xsl:attribute name="text-align">left</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-body-style" -->
 	<xsl:template name="refine_fn-body-style">
 	</xsl:template> <!-- refine_fn-body-style -->
@@ -10728,10 +11119,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>
@@ -10741,9 +11134,12 @@
 					<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="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -10766,10 +11162,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"/>
@@ -10871,6 +11269,9 @@
 		<xsl:attribute name="margin-bottom">12pt</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>
@@ -10878,6 +11279,9 @@
 		<xsl:attribute name="padding-top">3mm</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 name="font-size">11pt</xsl:attribute>
@@ -10887,9 +11291,16 @@
 		<xsl:attribute name="text-align">center</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 name="font-style">italic</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-p-style -->
+	<xsl:template name="refine_admonition-p-style">
+	</xsl:template>
 	<!-- end admonition -->
 	<!-- ================ -->
@@ -10899,12 +11310,18 @@
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
+			<xsl:call-template name="refine_admonition-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 					<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
+						<xsl:call-template name="refine_admonition-container-style"/>
 								<fo:block xsl:use-attribute-sets="admonition-name-style">
+									<xsl:call-template name="refine_admonition-name-style"/>
 									<xsl:call-template name="displayAdmonitionName"/>
 								</fo:block>
 								<fo:block xsl:use-attribute-sets="admonition-p-style">
+									<xsl:call-template name="refine_admonition-p-style"/>
 									<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
 								</fo:block>
@@ -10958,6 +11375,7 @@
 	<xsl:template match="mn:admonition/mn:p">
 		<fo:block xsl:use-attribute-sets="admonition-p-style">
+			<xsl:call-template name="refine_admonition-p-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
@@ -10967,12 +11385,29 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
+	<xsl:attribute-set name="references-non-normative-title-style">
+		<xsl:attribute name="margin-left">-15mm</xsl:attribute>
+		<xsl:attribute name="role">H1</xsl:attribute>
+		<xsl:attribute name="font-size">22pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="line-height">125%</xsl:attribute>
+	</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">12pt</xsl:attribute>
 		<xsl:attribute name="font-weight">normal</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-style -->
+	<xsl:template name="refine_bibitem-normative-style">
+	</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>
@@ -10981,29 +11416,67 @@
 		<xsl:attribute name="provisional-distance-between-starts">8mm</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>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
 		<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
+	<xsl:template name="refine_bibitem-non-normative-list-style">
+		<xsl:variable name="last_bibitem_bibliotag">
+			<xsl:apply-templates select="following-sibling::mn:bibitem[not(@hidden='true')][last()]/mn:biblio-tag">
+				<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+			</xsl:apply-templates>
+			<xsl:if test="not(following-sibling::mn:bibitem[not(@hidden='true')][last()]/mn:biblio-tag)">
+				<xsl:apply-templates select="mn:biblio-tag">
+					<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:if>
+		</xsl:variable>
+		<xsl:variable name="last_bibitem_bibliotag_number_length" select="string-length(translate($last_bibitem_bibliotag, '[] ', ''))"/>
+		<xsl:if test="$last_bibitem_bibliotag_number_length &gt; 1">
+			<xsl:attribute name="provisional-distance-between-starts">
+				<xsl:choose>
+					<xsl:when test="$last_bibitem_bibliotag_number_length = 2">9.2mm</xsl:when>
+					<xsl:when test="$last_bibitem_bibliotag_number_length &gt;= 3">11mm</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+	</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">4pt</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_bibitem-non-normative-list-item-style">
+	</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>
@@ -11011,6 +11484,9 @@
 		<xsl:attribute name="vertical-align">super</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>
@@ -11029,6 +11505,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 -->
 	<!-- ======================= -->
@@ -11070,6 +11549,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 -->
@@ -11083,19 +11563,23 @@
 		<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:call-template name="refine_bibitem-normative-style"/>
 			<xsl:call-template name="processBibitem"/>
 		</fo:block>
 	</xsl:template> <!-- bibitem -->
 	<!-- 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:call-template name="setNamedDestination"/>
+		<!-- continue from <xsl:template match="mn:references[not(@normative='true')]" priority="3"> -->
 		<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
+			<xsl:call-template name="refine_bibitem-non-normative-list-style"/>
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block>
+					<fo:block role="SKIP">
 						<xsl:apply-templates select="mn:biblio-tag">
 							<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
 						</xsl:apply-templates>
@@ -11107,8 +11591,8 @@
 							<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
 						</xsl:apply-templates>
 						<xsl:apply-templates select="mn:formattedref"/>
-						<xsl:call-template name="processBibliographyNote"/>
 					</fo:block>
+					<xsl:call-template name="processBibitemFollowingNotes"/>
 				</fo:list-item-body>
 			</fo:list-item>
 		</fo:list-block>
@@ -11116,12 +11600,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: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">
@@ -11132,16 +11621,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>
@@ -11157,25 +11648,16 @@
 			<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
 		</xsl:apply-templates>
 		<xsl:apply-templates select="mn:formattedref"/>
+				<xsl:call-template name="processBibitemFollowingNotes"/>
 		<!-- end bibitem processing -->
-		<xsl:call-template name="processBibliographyNote"/>
 	</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">
@@ -11375,11 +11857,17 @@
 	<!-- Index section styles -->
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</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-set>
+	</xsl:attribute-set> <!-- indexsect-clause-title-style -->
+	<xsl:template name="refine_indexsect-clause-title-style">
+	</xsl:template>
 	<!-- End Index section styles -->
 	<!-- =================== -->
@@ -11573,6 +12061,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>
@@ -11581,6 +12070,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>
@@ -11744,6 +12234,7 @@
 	<xsl:attribute-set name="toc-style">
 		<xsl:attribute name="margin-left">32mm</xsl:attribute>
 		<xsl:attribute name="margin-right">-17mm</xsl:attribute>
+		<xsl:attribute name="role">TOC</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_toc-style">
@@ -11800,10 +12291,16 @@
 		<xsl:attribute name="rule-thickness">0.2mm</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 name="padding-left">2mm</xsl:attribute>
 	</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="font-size">13pt</xsl:attribute>
@@ -11820,6 +12317,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-size">13pt</xsl:attribute>
@@ -11827,6 +12327,9 @@
 		<xsl:attribute name="space-before">4pt</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')]">
@@ -12934,23 +13437,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">
@@ -12968,17 +13503,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>
 	<!-- ===================================== -->
@@ -12987,6 +13519,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"/>
@@ -13325,13 +13869,32 @@
 			</xsl:choose>
 	</xsl:template>
+	<xsl:attribute-set name="clause-style">
+	</xsl:attribute-set>
+	<xsl:template name="refine_clause-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="$level &gt;= 4">
+			<xsl:attribute name="margin-left">13mm</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
+		<xsl:if test="@type = 'terms'">
+			<fo:block break-after="page"/>
+		</xsl:if>
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 			<xsl:call-template name="sections_element_style"/>
+			<xsl:call-template name="addTagElementT"/>
 			<xsl:call-template name="addReviewHelper"/>
@@ -13456,6 +14019,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>