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

metanorma-bipm 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 (20) hide show

checksums.yaml +4 -4
data/lib/isodoc/bipm/base_convert.rb +3 -28
data/lib/isodoc/bipm/bipm.brochure.xsl +704 -190
data/lib/isodoc/bipm/bipm.guide.xsl +704 -190
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +704 -190
data/lib/isodoc/bipm/bipm.rapport.xsl +704 -190
data/lib/isodoc/bipm/jcgm.standard.xsl +707 -199
data/lib/isodoc/bipm/metadata.rb +23 -12
data/lib/isodoc/bipm/presentation_footnotes.rb +5 -3
data/lib/isodoc/bipm/presentation_xml_convert.rb +3 -2
data/lib/isodoc/bipm/xref.rb +3 -2
data/lib/metanorma/bipm/biblio-standoc.rng +0 -49
data/lib/metanorma/bipm/biblio.rng +11 -1
data/lib/metanorma/bipm/converter.rb +2 -2
data/lib/metanorma/bipm/front.rb +35 -31
data/lib/metanorma/bipm/isodoc.rng +24 -1
data/lib/metanorma/bipm/relaton-bipm.rng +0 -45
data/lib/metanorma/bipm/version.rb +1 -1
data/metanorma.yml +3 -0
metadata +2 -2

data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED Viewed

@@ -80,7 +80,13 @@
 		</xsl:call-template>
 	</xsl:variable>
-	<xsl:variable name="copyrightText" select="concat('© ', (//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym, ' ', (//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from, ' — ', $all_rights_reserved)"/>
+	<xsl:variable name="committee_acronym" select="(//mn:metanorma)[1]/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:identifier[not(@full)]"/>
+	<xsl:variable name="copyright_year" select="(//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from"/>
+	<!-- <xsl:variable name="copyrightText" select="concat('© ', (//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym, ' ', (//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from, ' — ', $all_rights_reserved)"/> -->
+	<xsl:variable name="copyrightText" select="concat('© ', $committee_acronym, ' ', $copyright_year, ' — ', $all_rights_reserved)"/>
+	<xsl:variable name="docnumber" select="(//mn:metanorma)[1]/mn:bibdata/mn:docnumber"/>
 	<!-- Example:
 		<item level="1" id="Foreword" display="true">Foreword</item>
@@ -375,9 +381,10 @@
 				<!-- Example © JCGM 2009 -->
 				<fo:block font-size="11pt">
 					<fo:inline font-family="Times New Roman" font-size="12pt"><xsl:text>© </xsl:text></fo:inline>
-					<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/>
+					<!-- <xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/> -->
+					<xsl:value-of select="$committee_acronym"/>
 					<xsl:text> </xsl:text>
-					<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from"/>
+					<xsl:value-of select="$copyright_year"/>
 				</fo:block>
 			</fo:static-content>
 			<fo:flow flow-name="xsl-region-body">
@@ -385,11 +392,12 @@
 				<xsl:call-template name="insertDraftWatermark"/>
 				<fo:block-container font-weight="bold">
 					<fo:block font-size="16.5pt">
-						<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/>
+						<!-- <xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/> -->
+						<xsl:value-of select="$committee_acronym"/>
 						<xsl:text> </xsl:text>
-						<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:docnumber"/>
+						<xsl:value-of select="$docnumber"/>
 						<fo:inline font-weight="normal">:</fo:inline>
-						<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from"/>
+						<xsl:value-of select="$copyright_year"/>
 					</fo:block>
 					<fo:block font-size="13pt" font-weight="normal" space-after="19.5mm">
 						<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:title[@type = 'title-provenance']"/>
@@ -435,12 +443,14 @@
 					<fo:table-body>
 						<fo:table-row>
 							<fo:table-cell>
-								<fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/></fo:block>
+								<!-- <fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee"/></fo:block> -->
+								<fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description = 'committee']/mn:organization/mn:subdivision[@type = 'Committee']/mn:name"/></fo:block>
 							</fo:table-cell>
 							<fo:table-cell line-height="140%">
-								<fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/></fo:block>
-								<fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:docnumber"/></fo:block>
-								<fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from"/></fo:block>
+								<!-- <fo:block><xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/></fo:block> -->
+								<fo:block><xsl:value-of select="$committee_acronym"/></fo:block>
+								<fo:block><xsl:value-of select="$docnumber"/></fo:block>
+								<fo:block><xsl:value-of select="$copyright_year"/></fo:block>
 							</fo:table-cell>
 						</fo:table-row>
 					</fo:table-body>
@@ -835,7 +845,7 @@
 				<xsl:apply-templates select="preceding-sibling::mn:term_name[1]" mode="presentation"/>
 			</fo:block>
 			<fo:block xsl:use-attribute-sets="preferred-term-style">
-				<xsl:call-template name="setStyle_preferred"/>
+				<xsl:call-template name="refine_preferred-term-style"/>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:block>
@@ -852,6 +862,7 @@
 	<xsl:template match="mn:domain[not(parent::mn:term)]" priority="2">
 		<fo:block xsl:use-attribute-sets="domain-style">
+			<xsl:call-template name="refine_domain-style"/>
 			<fo:inline>
 				<xsl:text>&lt;</xsl:text>
 				<xsl:apply-templates/>
@@ -1006,11 +1017,12 @@
 	</xsl:template>
 	<xsl:variable name="header_text">
-		<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/>
+		<!-- <xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:ext/mn:editorialgroup/mn:committee/@acronym"/>-->
+		<xsl:value-of select="$committee_acronym"/>
 		<xsl:text> </xsl:text>
-		<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:docnumber"/>
+		<xsl:value-of select="$docnumber"/>
 		<xsl:text>:</xsl:text>
-		<xsl:value-of select="(//mn:metanorma)[1]/mn:bibdata/mn:copyright/mn:from"/>
+		<xsl:value-of select="$copyright_year"/>
 	</xsl:variable>
 	<xsl:template name="insertHeaderFooter">
@@ -1070,7 +1082,10 @@
 	<xsl:template name="insertDraftWatermark">
 		<xsl:param name="isDraft"/>
-		<xsl:if test="$isDraft = 'true' or normalize-space(//mn:metanorma/mn:bibdata/mn:version/mn:draft or   contains(//mn:metanorma/mn:bibdata/mn:status/mn:stage, 'draft') or   contains(//mn:metanorma/mn:bibdata/mn:status/mn:stage, 'projet')) = 'true'">
+		<!-- <xsl:if test="$isDraft = 'true' or normalize-space(//mn:metanorma/mn:bibdata/mn:version/mn:draft or
+		contains(//mn:metanorma/mn:bibdata/mn:status/mn:stage, 'draft') or
+		contains(//mn:metanorma/mn:bibdata/mn:status/mn:stage, 'projet')) = 'true'"> -->
+		<xsl:if test="$isDraft = 'true' or normalize-space(normalize-space(//mn:metanorma/mn:bibdata/mn:version/mn:draft) != '' or       normalize-space(//mn:metanorma/mn:metanorma-extension/mn:semantic-metadata/mn:stage-published) = 'false') = 'true'">
 			<!-- DRAFT -->
 			<xsl:variable name="draft_label">
 				<xsl:call-template name="getLocalizedString">
@@ -1227,10 +1242,10 @@
 			<fo:flow flow-name="xsl-region-body">
 				<fo:block id="{@id}" span="all">
-					<xsl:apply-templates select="mn:title"/>
+					<xsl:apply-templates select="mn:fmt-title"/>
 				</fo:block>
 				<fo:block role="Index">
-					<xsl:apply-templates select="*[not(self::mn:title)]"/>
+					<xsl:apply-templates select="*[not(self::mn:title or self::mn:fmt-title)]"/>
 				</fo:block>
 			</fo:flow>
 		</fo:page-sequence>
@@ -3499,42 +3514,86 @@
 	<xsl:attribute-set name="copyright-statement-style">
 	</xsl:attribute-set> <!-- copyright-statement-style -->
+	<xsl:template name="refine_copyright-statement-style">
+	</xsl:template>
 	<xsl:attribute-set name="copyright-statement-title-style">
 	</xsl:attribute-set> <!-- copyright-statement-title-style -->
+	<xsl:template name="refine_copyright-statement-title-style">
+	</xsl:template>
 	<xsl:attribute-set name="copyright-statement-p-style">
 	</xsl:attribute-set> <!-- copyright-statement-p-style -->
-		<xsl:attribute-set name="license-statement-style">
+	<xsl:template name="refine_copyright-statement-p-style">
+	</xsl:template>
+	<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 -->
+	<xsl:template name="refine_license-statement-p-style">
+	</xsl:template>
 	<xsl:attribute-set name="legal-statement-style">
 	</xsl:attribute-set> <!-- legal-statement-style -->
+	<xsl:template name="refine_legal-statement-style">
+	</xsl:template>
 	<xsl:attribute-set name="legal-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-title-style -->
+	<xsl:template name="refine_legal-statement-title-style">
+	</xsl:template>
 	<xsl:attribute-set name="legal-statement-p-style">
 	</xsl:attribute-set> <!-- legal-statement-p-style -->
+	<xsl:template name="refine_legal-statement-p-style">
+		<xsl:if test="@align">
+			<xsl:attribute name="text-align">
+				<xsl:value-of select="@align"/>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<xsl:attribute-set name="feedback-statement-style">
 	</xsl:attribute-set> <!-- feedback-statement-style -->
+	<xsl:template name="refine_feedback-statement-style">
+	</xsl:template>
 	<xsl:attribute-set name="feedback-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
+	<xsl:template name="refine_feedback-statement-title-style">
+	</xsl:template>
 	<xsl:attribute-set name="feedback-statement-p-style">
 	</xsl:attribute-set> <!-- feedback-statement-p-style -->
+	<xsl:template name="refine_feedback-statement-p-style">
+	</xsl:template>
 	<!-- End boilerplate sections styles -->
 	<!-- ================================= -->
@@ -3542,6 +3601,8 @@
 	<!-- ================================= -->
 	<xsl:template match="mn:copyright-statement">
 		<fo:block xsl:use-attribute-sets="copyright-statement-style" role="SKIP">
+			<xsl:call-template name="refine_copyright-statement-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- copyright-statement -->
@@ -3558,6 +3619,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 -->
@@ -3575,6 +3637,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 -->
@@ -3744,6 +3807,27 @@
 	<xsl:attribute-set name="sourcecode-container-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_sourcecode-container-style">
+		<xsl:if test="not(ancestor::mn:li) or ancestor::mn:example">
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:example">
+			<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		</xsl:if>
+		<xsl:copy-of select="@id"/>
+		<xsl:if test="parent::mn:note">
+			<xsl:attribute name="margin-left">
+				<xsl:choose>
+					<xsl:when test="not(ancestor::mn:table)"><xsl:value-of select="$note-body-indent"/></xsl:when>
+					<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -3763,6 +3847,9 @@
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
 	</xsl:attribute-set> <!-- sourcecode-name-style -->
+	<xsl:template name="refine_sourcecode-name-style">
+	</xsl:template>
 	<xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
@@ -3850,24 +3937,8 @@
 			<xsl:otherwise>
 				<fo:block-container xsl:use-attribute-sets="sourcecode-container-style" role="SKIP">
-					<xsl:if test="not(ancestor::mn:li) or ancestor::mn:example">
-						<xsl:attribute name="margin-left">0mm</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="ancestor::mn:example">
-						<xsl:attribute name="margin-right">0mm</xsl:attribute>
-					</xsl:if>
-					<xsl:copy-of select="@id"/>
+					<xsl:call-template name="refine_sourcecode-container-style"/>
-					<xsl:if test="parent::mn:note">
-						<xsl:attribute name="margin-left">
-							<xsl:choose>
-								<xsl:when test="not(ancestor::mn:table)"><xsl:value-of select="$note-body-indent"/></xsl:when>
-								<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
-							</xsl:choose>
-						</xsl:attribute>
-					</xsl:if>
 					<fo:block-container margin-left="0mm" role="SKIP">
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
@@ -4194,6 +4265,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>
@@ -4241,12 +4313,31 @@
 		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- pre-style -->
+	<xsl:template name="refine_pre-style">
+	</xsl:template>
 	<xsl:attribute-set name="tt-style">
 		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_tt-style">
+		<xsl:variable name="_font-size"> <!-- inherit -->10
+		</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>
@@ -4259,9 +4350,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>
@@ -4274,24 +4370,77 @@
 		<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="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>
@@ -4300,44 +4449,27 @@
 		</fo:inline>
 	</xsl:template>
-	<xsl:template name="refine_strong_style">
-		<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 -->10
-			</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 -->
@@ -4356,7 +4488,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>
@@ -4514,6 +4647,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>
@@ -4523,7 +4657,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>
@@ -4609,7 +4744,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>
@@ -4637,7 +4773,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
+				<xsl:if test="$key = 'font-family' or           $key = 'font-size' or          $key = 'color' or          $key = 'baseline-shift' or          $key = 'line-height'          ">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 				<xsl:if test="$key = 'text-indent'">
@@ -4689,6 +4825,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>
@@ -4719,22 +4856,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>
@@ -4762,18 +4917,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>
@@ -4782,6 +4947,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>
@@ -4789,6 +4955,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>
@@ -4801,6 +4968,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"/>
@@ -4813,6 +4981,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>
@@ -4820,6 +4989,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>
@@ -4845,6 +5015,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>
@@ -4854,6 +5025,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>
@@ -4861,6 +5033,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>
@@ -5042,37 +5215,67 @@
 		<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 	</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-block-style">
 		<xsl:attribute name="line-height">1.1</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-block-style -->
+	<xsl:template name="refine_preferred-block-style">
+	</xsl:template>
 	<xsl:attribute-set name="preferred-term-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
+	<xsl:template name="refine_preferred-term-style">
+		<xsl:if test="mn:strong">
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<xsl:attribute-set name="domain-style">
 	</xsl:attribute-set> <!-- domain-style -->
+	<xsl:template name="refine_domain-style">
+	</xsl:template>
 	<xsl:attribute-set name="admitted-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- admitted-style -->
+	<xsl:template name="refine_admitted-style">
+	</xsl:template>
 	<xsl:attribute-set name="deprecates-style">
 	</xsl:attribute-set> <!-- deprecates-style -->
+	<xsl:template name="refine_deprecates-style">
+	</xsl:template>
 	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_related-block-style">
+	</xsl:template>
 	<xsl:attribute-set name="definition-style">
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- definition-style -->
+	<xsl:template name="refine_definition-style">
+	</xsl:template>
 	<xsl:attribute-set name="termsource-style">
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 	</xsl:attribute-set> <!-- termsource-style -->
@@ -5083,9 +5286,15 @@
 	<xsl:attribute-set name="termsource-text-style">
 	</xsl:attribute-set> <!-- termsource-text-style -->
+	<xsl:template name="refine_termsource-text-style">
+	</xsl:template>
 	<xsl:attribute-set name="origin-style">
 	</xsl:attribute-set> <!-- origin-style -->
+	<xsl:template name="refine_origin-style">
+	</xsl:template>
 	<!-- ====== -->
 	<!-- term      -->
 	<!-- ====== -->
@@ -5101,9 +5310,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>
@@ -5179,6 +5387,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>
@@ -5191,6 +5400,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>
@@ -5240,9 +5450,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"/>
@@ -5253,7 +5466,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>
@@ -5274,22 +5487,18 @@
 	<xsl:template match="mn:fmt-admitted">
 		<fo:block xsl:use-attribute-sets="admitted-style">
+			<xsl:call-template name="refine_admitted-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	<xsl:template match="mn:fmt-deprecates">
 		<fo:block xsl:use-attribute-sets="deprecates-style">
+			<xsl:call-template name="refine_deprecates-style"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
-	<xsl:template name="setStyle_preferred">
-		<xsl:if test="mn:strong">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-		</xsl:if>
-	</xsl:template>
 	<!-- regarding ISO 10241-1:2011,  If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
 	<!-- in metanorma xml preferred terms delimited by semicolons -->
 	<xsl:template match="mn:fmt-preferred/text()[contains(., ';')] | mn:fmt-preferred/mn:strong/text()[contains(., ';')]">
@@ -5299,6 +5508,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>
@@ -5313,6 +5523,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>
@@ -5364,6 +5575,9 @@
 	<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="padding-right">5mm</xsl:attribute>
 	</xsl:attribute-set> <!-- example-name-style -->
@@ -5412,6 +5626,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>
@@ -5463,6 +5679,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)]">
@@ -5525,6 +5742,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'"/>
@@ -5789,6 +6007,9 @@
 		<!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
 	</xsl:attribute-set> <!-- table-fn-number-style -->
+	<xsl:template name="refine_table-fn-number-style">
+	</xsl:template>
 	<xsl:attribute-set name="table-fmt-fn-label-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
@@ -5797,30 +6018,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 -->
 	<!-- ========================== -->
@@ -7145,6 +7348,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>
@@ -7163,6 +7367,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">
@@ -8034,9 +8239,18 @@
 	<xsl:attribute-set name="dl-block-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_dl-block-style">
+		<xsl:if test="@key = 'true' and ancestor::mn:figure">
+			<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<xsl:attribute-set name="dt-row-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_dt-row-style">
+	</xsl:template>
 	<xsl:attribute-set name="dt-cell-style">
 	</xsl:attribute-set>
@@ -8056,6 +8270,9 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- dl-name-style -->
+	<xsl:template name="refine_dl-name-style">
+	</xsl:template>
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set>
@@ -8094,9 +8311,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)">
@@ -8399,6 +8614,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>
@@ -8587,6 +8804,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"/>
@@ -8800,18 +9019,25 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_appendix-style">
+	</xsl:template>
 	<xsl:attribute-set name="appendix-example-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_appendix-example-style">
+	</xsl:template>
 	<!-- ======================== -->
 	<!-- Appendix processing -->
 	<!-- ======================== -->
 	<xsl:template match="mn:appendix">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
+			<xsl:call-template name="refine_appendix-style"/>
 			<xsl:apply-templates select="mn:fmt-title"/>
 		</fo:block>
 		<xsl:apply-templates select="node()[not(self::mn:fmt-title)]"/>
@@ -8830,6 +9056,7 @@
 	<xsl:template match="mn:appendix//mn:example" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
+			<xsl:call-template name="refine_appendix-example-style"/>
 			<xsl:apply-templates select="mn:fmt-name"/>
 		</fo:block>
 		<xsl:apply-templates select="node()[not(self::mn:fmt-name)]"/>
@@ -8838,7 +9065,16 @@
 	<xsl:attribute-set name="xref-style">
 		<xsl:attribute name="color">blue</xsl:attribute>
 		<xsl:attribute name="text-decoration">underline</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- xref-style -->
+	<xsl:template name="refine_xref-style">
+		<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[self::mn:table or self::mn:dl])">
+			<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="parent::mn:add">
+			<xsl:call-template name="append_add-style"/>
+		</xsl:if>
+	</xsl:template> <!-- refine_xref-style -->
 	<xsl:template match="mn:fmt-xref">
 		<xsl:call-template name="insert_basic_link">
@@ -8847,12 +9083,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>
@@ -8963,21 +9195,21 @@
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-style -->
 	<xsl:template name="refine_note-style">
 		<xsl:if test="parent::mn:references">
 			<xsl:attribute name="margin-top">2pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">2pt</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>
 	<xsl:attribute-set name="note-name-style">
 		<xsl:attribute name="padding-right">6mm</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-name-style -->
 	<xsl:template name="refine_note-name-style">
 	</xsl:template> <!-- refine_note-name-style -->
@@ -8992,20 +9224,23 @@
 	<xsl:attribute-set name="note-p-style">
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- note-p-style -->
+	<xsl:template name="refine_note-p-style">
+	</xsl:template>
 	<xsl:attribute-set name="termnote-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-top">8pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-style -->
 	<xsl:template name="refine_termnote-style">
 	</xsl:template> <!-- refine_termnote-style -->
 	<xsl:attribute-set name="termnote-name-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- termnote-name-style -->
 	<xsl:template name="refine_termnote-name-style">
 	</xsl:template>
@@ -9013,6 +9248,9 @@
 	<xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_termnote-p-style">
+	</xsl:template>
 	<!-- ====== -->
 	<!-- note      -->
 	<!-- termnote -->
@@ -9073,11 +9311,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>
@@ -9169,11 +9409,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>
@@ -9189,7 +9431,7 @@
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="font-style">italic</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- quote-style -->
 	<xsl:template name="refine_quote-style">
 		<xsl:if test="ancestor::mn:boilerplate">
@@ -9203,6 +9445,9 @@
 		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_quote-source-style">
+	</xsl:template>
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -9234,6 +9479,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"/>
@@ -9296,6 +9542,9 @@
 	<xsl:attribute-set name="figure-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_figure-style">
+	</xsl:template>
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -9303,7 +9552,7 @@
 		<xsl:attribute name="margin-top">12pt</xsl:attribute>
 		<xsl:attribute name="space-after">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- figure-name-style -->
 	<xsl:template name="refine_figure-name-style">
 	</xsl:template> <!-- refine_figure-name-style -->
@@ -9311,7 +9560,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>
@@ -9321,14 +9570,51 @@
 		<xsl:attribute name="content-height">100%</xsl:attribute>
 		<xsl:attribute name="scaling">uniform</xsl:attribute>
 		<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- image-graphic-style -->
+	<xsl:template name="refine_image-graphic-style">
+	</xsl:template>
 	<xsl:attribute-set name="figure-source-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_figure-source-style">
+	</xsl:template>
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_figure-pseudocode-p-style">
+	</xsl:template>
+	<xsl:attribute-set name="figure-fn-number-style">
+		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fn-number-style -->
+	<xsl:template name="refine_figure-fn-number-style">
+	</xsl:template>
+	<xsl:attribute-set name="figure-fmt-fn-label-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fmt-fn-label-style -->
+	<xsl:template name="refine_figure-fmt-fn-label-style">
+	</xsl:template>
+	<xsl:attribute-set name="figure-fn-body-style">
+		<xsl:attribute name="text-align">justify</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:template name="refine_figure-fn-body-style">
+		<xsl:variable name="key_iso">true
+		</xsl:variable>
+		<xsl:if test="normalize-space($key_iso) = 'true'">
+			<xsl:attribute name="margin-bottom">0</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
 	<!-- ============================ -->
@@ -9441,9 +9727,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>
@@ -9461,6 +9746,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 -->
@@ -9498,6 +9784,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>
@@ -9545,6 +9832,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>
@@ -9588,6 +9877,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>
@@ -9717,6 +10007,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">
@@ -10416,6 +10708,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>
@@ -10487,6 +10782,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%"/>
@@ -10914,6 +11211,9 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- list-name-style -->
+	<xsl:template name="refine_list-name-style">
+	</xsl:template>
 	<xsl:attribute-set name="list-item-style">
 	</xsl:attribute-set>
@@ -11212,6 +11512,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>
@@ -11272,28 +11573,49 @@
 	<!-- END Lists processing -->
 	<!-- ===================================== -->
+	<xsl:attribute-set name="footnote-separator-leader-style">
+	</xsl:attribute-set>
+	<xsl:template name="refine_footnote-separator-leader-style">
+	</xsl:template>
+	<xsl:attribute-set name="fn-container-body-style">
+		<xsl:attribute name="text-indent">0</xsl:attribute>
+		<xsl:attribute name="start-indent">0</xsl:attribute>
+	</xsl:attribute-set>
+	<xsl:template name="refine_fn-container-body-style">
+	</xsl:template>
 	<xsl:attribute-set name="fn-reference-style">
 		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-reference-style -->
 	<xsl:template name="refine_fn-reference-style">
 		<xsl:if test="ancestor::*[local-name()='table']">
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
 			<xsl:attribute name="baseline-shift">15%</xsl:attribute>
 		</xsl:if>
+		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
 	</xsl:template> <!-- refine_fn-reference-style -->
 	<xsl:attribute-set name="fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_fn-style">
+	</xsl:template>
 	<xsl:attribute-set name="fn-num-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 		<xsl:attribute name="font-size">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>
@@ -11304,7 +11626,7 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="line-height">124%</xsl:attribute>
 		<xsl:attribute name="text-align">justify</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- fn-body-style" -->
 	<xsl:template name="refine_fn-body-style">
 	</xsl:template> <!-- refine_fn-body-style -->
@@ -11369,10 +11691,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>
@@ -11382,9 +11706,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">
@@ -11407,10 +11734,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"/>
@@ -11509,17 +11838,30 @@
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-style -->
+	<xsl:template name="refine_admonition-style">
+	</xsl:template>
 	<xsl:attribute-set name="admonition-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-container-style -->
+	<xsl:template name="refine_admonition-container-style">
+	</xsl:template>
 	<xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-name-style -->
+	<xsl:template name="refine_admonition-name-style">
+	</xsl:template>
 	<xsl:attribute-set name="admonition-p-style">
 	</xsl:attribute-set> <!-- admonition-p-style -->
+	<xsl:template name="refine_admonition-p-style">
+	</xsl:template>
 	<!-- end admonition -->
 	<!-- ================ -->
@@ -11528,6 +11870,8 @@
 	<xsl:template match="mn:admonition">
 		<fo:block xsl:use-attribute-sets="admonition-style">
+			<xsl:call-template name="refine_admonition-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 			<xsl:if test="@type = 'editorial'">
@@ -11595,6 +11939,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>
@@ -11604,11 +11949,21 @@
 	<!-- END Admonition -->
 	<!-- ================ -->
+	<xsl:attribute-set name="references-non-normative-title-style">
+	</xsl:attribute-set>
+	<xsl:template name="refine_references-non-normative-title-style">
+	</xsl:template>
 	<!-- bibitem in Normative References (references/@normative="true") -->
 	<xsl:attribute-set name="bibitem-normative-style">
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-style -->
+	<xsl:template name="refine_bibitem-normative-style">
+	</xsl: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>
@@ -11616,9 +11971,15 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-list-style -->
+	<xsl:template name="refine_bibitem-normative-list-style">
+	</xsl:template>
 	<xsl:attribute-set name="bibitem-non-normative-style">
 	</xsl:attribute-set> <!-- bibitem-non-normative-style -->
+	<xsl:template name="refine_bibitem-non-normative-style">
+	</xsl:template>
 	<!-- bibitem in bibliography section (references/@normative="false"), renders as list -->
 	<xsl:attribute-set name="bibitem-non-normative-list-style">
 		<xsl:attribute name="provisional-distance-between-starts">12mm</xsl:attribute>
@@ -11626,18 +11987,30 @@
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
+	<xsl:template name="refine_bibitem-non-normative-list-style">
+	</xsl:template>
 	<xsl:attribute-set name="bibitem-non-normative-list-item-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_bibitem-non-normative-list-item-style">
+	</xsl: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>
@@ -11646,6 +12019,9 @@
 		<xsl:attribute name="baseline-shift">30%</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
+	<xsl:template name="refine_bibitem-note-fn-style">
+	</xsl:template>
 	<!-- footnote number on the page bottom -->
 	<xsl:attribute-set name="bibitem-note-fn-number-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
@@ -11664,6 +12040,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 -->
 	<!-- ======================= -->
@@ -11705,6 +12084,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 -->
@@ -11718,18 +12098,22 @@
 		<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 --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
 			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
 		<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 		<xsl:call-template name="setNamedDestination"/>
 		<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 role="SKIP">
@@ -11742,6 +12126,7 @@
 				</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">
+						<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>
@@ -11752,12 +12137,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">
@@ -11768,16 +12158,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>
@@ -11797,25 +12189,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">
@@ -12017,13 +12400,19 @@
 		<xsl:attribute name="role">H1</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="span">all</xsl:attribute>
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- indexsect-title-style -->
+	<xsl:template name="refine_indexsect-title-style">
+	</xsl:template>
 	<xsl:attribute-set name="indexsect-clause-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="margin-left">25mm</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 -->
 	<!-- =================== -->
@@ -12217,6 +12606,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>
@@ -12225,6 +12615,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>
@@ -12267,13 +12658,31 @@
 				<!-- skip here, see the template 'fmt-review-start' -->
 			</xsl:when>
 			<xsl:otherwise>
-				<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
-				<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and        following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
-				<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-				<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+				<xsl:choose>
+					<xsl:when test="parent::mn:example or parent::mn:termexample or parent::mn:note or parent::mn:termnote">
+						<fo:block font-size="1pt" line-height="0.1">
+							<xsl:call-template name="fo_inline_bookmark">
+								<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
+							</xsl:call-template>
+						</fo:block>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="fo_inline_bookmark">
+							<xsl:with-param name="bookmark_id" select="$bookmark_id"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
+	<xsl:template name="fo_inline_bookmark">
+		<xsl:param name="bookmark_id"/>
+		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
+		<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[self::mn:fmt-annotation-start][@source = $bookmark_id] and      following-sibling::node()[self::mn:fmt-annotation-end][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
+		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
+		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
 	<!-- =================== -->
@@ -12406,9 +12815,15 @@
 		<xsl:attribute name="leader-pattern">dots</xsl:attribute>
 	</xsl:attribute-set> <!-- END: toc-leader-style -->
+	<xsl:template name="refine_toc-leader-style">
+	</xsl:template>
 	<xsl:attribute-set name="toc-pagenumber-style">
 	</xsl:attribute-set>
+	<xsl:template name="refine_toc-pagenumber-style">
+	</xsl:template>
 	<!-- List of Figures, Tables -->
 	<xsl:attribute-set name="toc-listof-title-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -12422,12 +12837,18 @@
 	<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="margin-left">17mm</xsl:attribute>
 		<xsl:attribute name="text-indent">-12mm</xsl:attribute>
 	</xsl:attribute-set>
+	<xsl:template name="refine_toc-listof-item-style">
+	</xsl:template>
 	<xsl:template name="processPrefaceSectionsDefault_Contents">
 		<xsl:variable name="nodes_preface_">
 			<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -13539,23 +13960,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">
@@ -13573,17 +14026,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>
 	<!-- ===================================== -->
@@ -13592,6 +14042,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"/>
@@ -14153,11 +14615,35 @@
 	<xsl:template match="mn:svgmap"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
 	<!-- for correct rendering combining chars, added in mode="update_xml_step2" -->
 	<xsl:template match="*[local-name() = 'lang_none']">
 		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
+	<xsl:template name="addTagElementT">
+		<xsl:variable name="title_">
+			<xsl:apply-templates select="mn:fmt-title"/>
+		</xsl:variable>
+		<xsl:variable name="title__">
+			<xsl:for-each select="xalan:nodeset($title_)/*/node()">
+				<xsl:choose>
+					<xsl:when test="self::text()"><xsl:text> </xsl:text><xsl:value-of select="."/><xsl:text> </xsl:text></xsl:when>
+					<xsl:otherwise><xsl:text> </xsl:text><xsl:copy-of select="."/><xsl:text> </xsl:text></xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="title" select="normalize-space($title__)"/>
+		<xsl:if test="$title != ''">
+			<xsl:attribute name="fox:title">
+				<xsl:if test="ancestor::mn:sections">
+					<xsl:text>Section </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="$title"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
 	<xsl:template name="replaceChar">
 		<xsl:param name="text"/>
 		<xsl:param name="replace"/>
@@ -14923,6 +15409,13 @@
 			<xsl:with-param name="default" select="$text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
+		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">
+			<xsl:variable name="styles">
+				<xsl:apply-templates select="*[1]"/>
+			</xsl:variable>
+			<!-- move attribute line-height from inline to block -->
+			<xsl:attribute name="line-height"><xsl:value-of select="xalan:nodeset($styles)//*/@line-height"/></xsl:attribute>
+		</xsl:if>
 	</xsl:template>
 	<xsl:template name="setKeepAttributes">
@@ -14948,34 +15441,41 @@
 		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
 				<xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image[$num]">
-					<xsl:choose>
-						<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
-							<fo:instream-foreign-object fox:alt-text="Image Front">
-								<xsl:attribute name="content-height"><xsl:value-of select="$pageHeight"/>mm</xsl:attribute>
-								<xsl:call-template name="getSVG"/>
-							</fo:instream-foreign-object>
-						</xsl:when>
-						<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
-							<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
-						</xsl:when>
-						<xsl:otherwise> <!-- bitmap image -->
-							<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
-							<xsl:if test="$coverimage_src != ''">
-								<xsl:variable name="coverpage">
-									<xsl:call-template name="getImageURL">
-										<xsl:with-param name="src" select="$coverimage_src"/>
-									</xsl:call-template>
-								</xsl:variable>
-								<!-- <xsl:variable name="coverpage" select="concat('url(file:',$basepath, 'coverpage1.png', ')')"/> --> <!-- for DEBUG -->
-								<fo:external-graphic src="{$coverpage}" width="{$pageWidth}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
-							</xsl:if>
-						</xsl:otherwise>
-					</xsl:choose>
+					<xsl:call-template name="insertPageImage"/>
 				</xsl:for-each>
 			</fo:block>
 		</fo:block-container>
 	</xsl:template>
+	<xsl:template name="insertPageImage">
+		<xsl:param name="svg_content_height" select="$pageHeight"/>
+		<xsl:param name="bitmap_width" select="$pageWidth"/>
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'svg'] or java:endsWith(java:java.lang.String.new(@src), '.svg')">
+				<fo:instream-foreign-object fox:alt-text="Image Front">
+					<xsl:attribute name="content-height"><xsl:value-of select="$svg_content_height"/>mm</xsl:attribute>
+					<xsl:call-template name="getSVG"/>
+				</fo:instream-foreign-object>
+			</xsl:when>
+			<xsl:when test="starts-with(@src, 'data:application/pdf;base64')">
+				<fo:external-graphic src="{@src}" fox:alt-text="Image Front"/>
+			</xsl:when>
+			<xsl:otherwise> <!-- bitmap image -->
+				<xsl:variable name="coverimage_src" select="normalize-space(@src)"/>
+				<xsl:if test="$coverimage_src != ''">
+					<xsl:variable name="coverpage">
+						<xsl:call-template name="getImageURL">
+							<xsl:with-param name="src" select="$coverimage_src"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<fo:external-graphic src="{$coverpage}" width="{$bitmap_width}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image Front"/>
+				</xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
 	<xsl:template name="getImageURL">
 		<xsl:param name="src"/>
 		<xsl:choose>
@@ -15403,6 +15903,14 @@
 		</xsl:attribute>
 	</xsl:template>
+	<xsl:template name="getCharByCodePoint">
+		<xsl:param name="codepoint"/>
+		<xsl:param name="radix">16</xsl:param>
+		<xsl:variable name="codepointInt" select="java:java.lang.Integer.parseInt($codepoint,$radix)"/>
+		<xsl:variable name="chars" select="java:java.lang.Character.toChars($codepointInt)"/>
+		<xsl:value-of select="java:java.lang.String.new($chars)"/>
+	</xsl:template>
 	<xsl:template name="substring-after-last">
 		<xsl:param name="value"/>
 		<xsl:param name="delimiter"/>