RubyGems - metanorma-ribose - Versions diffs - 2.6.6 → 2.6.8 - Mend

metanorma-ribose 2.6.6 → 2.6.8

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 +0 -2
data/lib/isodoc/ribose/presentation_xml_convert.rb +0 -8
data/lib/isodoc/ribose/ribose.standard.xsl +744 -1277
data/lib/metanorma/ribose/isodoc.rng +32 -2
data/lib/metanorma/ribose/version.rb +1 -1
metadata +2 -2

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ribose="https://www.metanorma.org/ns/standoc" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java redirect" extension-element-prefixes="redirect" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ribose="https://www.metanorma.org/ns/standoc" xmlns:mn="https://www.metanorma.org/ns/xslt" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java redirect" extension-element-prefixes="redirect" version="1.0">
 	<xsl:output version="1.0" method="xml" encoding="UTF-8" indent="no"/>
@@ -18,7 +18,7 @@
 	</xsl:variable>
 	<xsl:variable name="contents_">
-		<contents>
+		<mn:contents>
 			<xsl:apply-templates select="/ribose:metanorma/ribose:preface/ribose:abstract" mode="contents"/>
 			<xsl:apply-templates select="/ribose:metanorma/ribose:preface/ribose:foreword" mode="contents"/>
@@ -30,7 +30,7 @@
 			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 			<xsl:call-template name="processTablesFigures_Contents"/>
-		</contents>
+		</mn:contents>
 	</xsl:variable>
 	<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
@@ -56,7 +56,6 @@
 	</xsl:variable>
 	<xsl:template match="/">
-		<xsl:call-template name="namespaceCheck"/>
 		<fo:root xml:lang="{$lang}">
 			<xsl:variable name="root-style">
 				<root-style xsl:use-attribute-sets="root-style"/>
@@ -603,14 +602,14 @@
 			<xsl:if test="count(*) = 1 and *[local-name() = 'title']"> <!-- if there isn't user ToC -->
-				<xsl:if test="$contents//item[@display = 'true']">
+				<xsl:if test="$contents//mn:item[@display = 'true']">
 					<fo:block-container margin-left="32mm" margin-right="-17mm">
 						<fo:block-container margin-left="0mm" margin-right="0mm">
-							<xsl:for-each select="$contents//item[@display = 'true']">
+							<xsl:for-each select="$contents//mn:item[@display = 'true']">
 								<fo:block font-size="13pt" role="TOCI">
 									<xsl:if test="@level = 1">
-										<xsl:if test="preceding-sibling::item[@display = 'true' and @level = 1]">
+										<xsl:if test="preceding-sibling::mn:item[@display = 'true' and @level = 1]">
 											<xsl:attribute name="space-before">16pt</xsl:attribute>
 										</xsl:if>
 										<xsl:attribute name="space-after">4pt</xsl:attribute>
@@ -624,10 +623,10 @@
 										<xsl:attribute name="space-after">5pt</xsl:attribute>
 									</xsl:if>
 									<fo:block text-align-last="justify">
-										<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
+										<fo:basic-link internal-destination="{@id}" fox:alt-text="{mn:title}">
 											<xsl:value-of select="@section"/>
 											<xsl:text> </xsl:text>
-											<xsl:apply-templates select="title"/>
+											<xsl:apply-templates select="mn:title"/>
 											<xsl:text>  </xsl:text>
 											<fo:inline>
 												<fo:leader leader-pattern="rule" rule-thickness="0.2mm"/>
@@ -639,21 +638,21 @@
 							</xsl:for-each>
 							<!-- List of Tables -->
-							<xsl:if test="$contents//tables/table">
+							<xsl:if test="$contents//mn:tables/mn:table">
 								<xsl:call-template name="insertListOf_Title">
 									<xsl:with-param name="title" select="$title-list-tables"/>
 								</xsl:call-template>
-								<xsl:for-each select="$contents//tables/table">
+								<xsl:for-each select="$contents//mn:tables/mn:table">
 									<xsl:call-template name="insertListOf_Item"/>
 								</xsl:for-each>
 							</xsl:if>
 							<!-- List of Figures -->
-							<xsl:if test="$contents//figures/figure">
+							<xsl:if test="$contents//mn:figures/mn:figure">
 								<xsl:call-template name="insertListOf_Title">
 									<xsl:with-param name="title" select="$title-list-figures"/>
 								</xsl:call-template>
-								<xsl:for-each select="$contents//figures/figure">
+								<xsl:for-each select="$contents//mn:figures/mn:figure">
 									<xsl:call-template name="insertListOf_Item"/>
 								</xsl:for-each>
 							</xsl:if>
@@ -735,12 +734,12 @@
 				<xsl:value-of select="local-name()"/>
 			</xsl:variable>
-			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
-				<title>
+			<mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
+				<mn:title>
 					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
-				</title>
+				</mn:title>
 				<xsl:apply-templates mode="contents"/>
-			</item>
+			</mn:item>
 		</xsl:if>
@@ -1319,34 +1318,25 @@
 		</xsl:if>
 	</xsl:template>
-			<!-- <xsl:strip-space elements="ribose:xref"/> -->
+	<!-- https://www.metanorma.org/ns/standoc -->
+	<xsl:variable name="namespace_full" select="namespace-uri(//*[local-name() = 'metanorma'][1])"/>
-	<xsl:variable name="namespace_full_">
-		<xsl:choose>
-			<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[local-name() = 'metanorma'][1])"/></xsl:when>
-			<xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/standoc -->
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
+	<!-- https://www.metanorma.org/ns/xsl -->
+	<xsl:variable name="namespace_mn_xsl">https://www.metanorma.org/ns/xslt</xsl:variable>
-	<xsl:variable name="root_element_">
-		<xsl:choose>
-			<xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[local-name() = 'metanorma'][1])"/></xsl:when>
-			<xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: metanorma (former iso-standard) -->
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:variable name="root_element" select="normalize-space($root_element_)"/>
+	<xsl:variable name="root_element">metanorma</xsl:variable>
+	<!---examples: 2013, 2024 -->
 	<xsl:variable name="document_scheme" select="normalize-space(//*[local-name() = 'metanorma']/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'document-scheme']/*[local-name() = 'value'])"/>
 	<!-- external parameters -->
 	<xsl:param name="svg_images"/> <!-- svg images array -->
 	<xsl:variable name="images" select="document($svg_images)"/>
 	<xsl:param name="basepath"/> <!-- base path for images -->
 	<xsl:param name="inputxml_basepath"/> <!-- input xml file path -->
 	<xsl:param name="inputxml_filename"/> <!-- input xml file name -->
 	<xsl:param name="output_path"/> <!-- output PDF file name -->
+	<xsl:param name="outputpdf_basepath"/> <!-- output PDF folder -->
 	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:param name="syntax-highlight">false</xsl:param> <!-- syntax highlighting feature, default - off -->
 	<xsl:param name="add_math_as_text">true</xsl:param> <!-- add math in text behind svg formula, to copy-paste formula from PDF as text -->
@@ -1393,20 +1383,13 @@
 	<xsl:param name="table_if_debug">false</xsl:param> <!-- set 'true' to put debug width data before table or dl -->
-	<xsl:variable name="isApplyAutolayoutAlgorithm_">
-		true
+	<!-- don't remove and rename this variable, it's using in mn2pdf tool -->
+	<xsl:variable name="isApplyAutolayoutAlgorithm_">true
 	</xsl:variable>
 	<xsl:variable name="isApplyAutolayoutAlgorithm" select="normalize-space($isApplyAutolayoutAlgorithm_)"/>
-	<xsl:variable name="isGenerateTableIF_">
-		<xsl:choose>
-			<xsl:when test="$isApplyAutolayoutAlgorithm = 'true'">
-				<xsl:value-of select="normalize-space($table_if) = 'true'"/>
-			</xsl:when>
-			<xsl:otherwise>false</xsl:otherwise>
-		</xsl:choose>
-	</xsl:variable>
-	<xsl:variable name="isGenerateTableIF" select="normalize-space($isGenerateTableIF_)"/>
+	<xsl:variable name="isGenerateTableIF"><xsl:value-of select="$table_if"/></xsl:variable>
+	<!-- <xsl:variable name="isGenerateTableIF" select="normalize-space(normalize-space($table_if) = 'true' and 1 = 1)"/> -->
 	<xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
@@ -1458,8 +1441,7 @@
 	<xsl:variable name="pageWidth_">
 		<xsl:choose>
 			<xsl:when test="$papersize_width != ''"><xsl:value-of select="$papersize_width"/></xsl:when>
-			<xsl:otherwise>
-				215.9
+			<xsl:otherwise>215.9
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -1469,8 +1451,7 @@
 	<xsl:variable name="pageHeight_">
 		<xsl:choose>
 			<xsl:when test="$papersize_height != ''"><xsl:value-of select="$papersize_height"/></xsl:when>
-			<xsl:otherwise>
-				279.4
+			<xsl:otherwise>279.4
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -1479,23 +1460,19 @@
 	<!-- Page margins in mm (just digits, without 'mm')-->
 	<!-- marginLeftRight1 and marginLeftRight2 - is left or right margin depends on odd/even page,
 	for example, left margin on odd page and right margin on even page -->
-	<xsl:variable name="marginLeftRight1_">
-		29
+	<xsl:variable name="marginLeftRight1_">29
 	</xsl:variable>
 	<xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/>
-	<xsl:variable name="marginLeftRight2_">
-		29
+	<xsl:variable name="marginLeftRight2_">29
 	</xsl:variable>
 	<xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/>
-	<xsl:variable name="marginTop_">
-		14
+	<xsl:variable name="marginTop_">14
 	</xsl:variable>
 	<xsl:variable name="marginTop" select="normalize-space($marginTop_)"/>
-	<xsl:variable name="marginBottom_">
-		22
+	<xsl:variable name="marginBottom_">22
 	</xsl:variable>
 	<xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/>
@@ -1544,13 +1521,10 @@
 		<title-toc lang="zh">目次</title-toc>
 		<title-part lang="en">
 		</title-part>
 		<title-part lang="fr">
 		</title-part>
 		<title-part lang="ru">
 		</title-part>
 		<title-part lang="zh">第 # 部分:</title-part>
@@ -1604,6 +1578,7 @@
 	<xsl:variable name="hair_space"> </xsl:variable>
 	<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="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -1645,13 +1620,11 @@
 	<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-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-family">OpenSans, 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-set> <!-- root-style -->
 	<xsl:template name="insertRootStyle">
@@ -1739,28 +1712,22 @@
 	<!-- Preface sections styles -->
 	<xsl:attribute-set name="copyright-statement-style">
 	</xsl:attribute-set> <!-- copyright-statement-style -->
 	<xsl:attribute-set name="copyright-statement-title-style">
 	</xsl:attribute-set> <!-- copyright-statement-title-style -->
 	<xsl:attribute-set name="copyright-statement-p-style">
 	</xsl:attribute-set> <!-- copyright-statement-p-style -->
 	<xsl:attribute-set name="license-statement-style">
 	</xsl:attribute-set>
 	<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:attribute-set name="license-statement-p-style">
 	</xsl:attribute-set> <!-- license-statement-p-style -->
 	<xsl:attribute-set name="legal-statement-style">
@@ -1769,117 +1736,93 @@
 	<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>
-			<xsl:attribute name="padding-top">2mm</xsl:attribute>
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="padding-top">2mm</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-title-style -->
 	<xsl:attribute-set name="legal-statement-p-style">
 	</xsl:attribute-set> <!-- legal-statement-p-style -->
 	<xsl:attribute-set name="feedback-statement-style">
 	</xsl:attribute-set> <!-- feedback-statement-style -->
 	<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:attribute-set name="feedback-statement-p-style">
 	</xsl:attribute-set> <!-- feedback-statement-p-style -->
 	<!-- End Preface sections styles -->
 	<xsl:attribute-set name="link-style">
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
-			<xsl:attribute name="font-weight">300</xsl:attribute><!-- bold -->
-			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+		<xsl:attribute name="font-weight">300</xsl:attribute><!-- bold -->
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_link-style">
-			<xsl:if test="ancestor::*[local-name() = 'bibitem']">
-				<xsl:attribute name="color">black</xsl:attribute>
-				<xsl:attribute name="text-decoration">none</xsl:attribute>
-				<xsl:attribute name="font-weight">300</xsl:attribute>
-			</xsl:if>
+		<xsl:if test="ancestor::*[local-name() = 'bibitem']">
+			<xsl:attribute name="color">black</xsl:attribute>
+			<xsl:attribute name="text-decoration">none</xsl:attribute>
+			<xsl:attribute name="font-weight">300</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_link-style -->
 	<xsl:attribute-set name="sourcecode-container-style">
-			<xsl:attribute name="space-after">12pt</xsl:attribute>
+		<xsl:attribute name="space-after">12pt</xsl:attribute>
 	</xsl:attribute-set>
 	<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 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>
-	<xsl:template name="refine_sourcecode-style">
-		 <!-- background for image -->
-			<xsl:if test="starts-with(*[local-name() = 'name']/text()[1], 'Figure ')">
-				<xsl:attribute name="background-color">rgb(236,242,246)</xsl:attribute>
-				<xsl:attribute name="padding-left">11mm</xsl:attribute>
-				<xsl:attribute name="margin-left">0mm</xsl:attribute>
-				<xsl:attribute name="padding-right">11mm</xsl:attribute>
-				<xsl:attribute name="margin-right">0mm</xsl:attribute>
-				<xsl:attribute name="padding-top">7.5mm</xsl:attribute>
-				<xsl:attribute name="padding-bottom">7.5mm</xsl:attribute>
-				<xsl:if test="following-sibling::*[1][local-name() = 'sourcecode'] and starts-with(*[local-name() = 'name']/text()[1], 'Figure ')">
-					<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
-				</xsl:if>
+	<xsl:template name="refine_sourcecode-style"> <!-- background for image -->
+		<xsl:if test="starts-with(*[local-name() = 'name']/text()[1], 'Figure ')">
+			<xsl:attribute name="background-color">rgb(236,242,246)</xsl:attribute>
+			<xsl:attribute name="padding-left">11mm</xsl:attribute>
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			<xsl:attribute name="padding-right">11mm</xsl:attribute>
+			<xsl:attribute name="margin-right">0mm</xsl:attribute>
+			<xsl:attribute name="padding-top">7.5mm</xsl:attribute>
+			<xsl:attribute name="padding-bottom">7.5mm</xsl:attribute>
+			<xsl:if test="following-sibling::*[1][local-name() = 'sourcecode'] and starts-with(*[local-name() = 'name']/text()[1], 'Figure ')">
+				<xsl:attribute name="margin-bottom">16pt</xsl:attribute>
 			</xsl:if>
+		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
 	<xsl:attribute-set name="pre-style">
 		<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="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
-			<xsl:attribute name="line-height">113%</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 name="permission-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="permission-name-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="permission-label-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="requirement-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="requirement-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="requirement-label-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="subject-style">
@@ -1907,135 +1850,106 @@
 	</xsl:attribute-set>
 	<xsl:attribute-set name="recommendation-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="recommendation-name-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="recommendation-label-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="termexample-style">
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_termexample-style">
 	</xsl:template>
 	<xsl:attribute-set name="example-style">
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- example-style -->
 	<xsl:template name="refine_example-style">
-			<xsl:if test="ancestor::ribose:ul or ancestor::ribose:ol">
-				<xsl:attribute name="margin-top">6pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			</xsl:if>
+		<xsl:if test="ancestor::ribose:ul or ancestor::ribose:ol">
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_example-style -->
 	<xsl:attribute-set name="example-body-style">
 	</xsl:attribute-set> <!-- example-body-style -->
 	<xsl:attribute-set name="example-name-style">
-			<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 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> <!-- example-name-style -->
 	<xsl:template name="refine_example-name-style">
 	</xsl:template>
 	<xsl:attribute-set name="example-p-style">
-			<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
 	</xsl:attribute-set> <!-- example-p-style -->
 	<xsl:template name="refine_example-p-style">
 	</xsl:template> <!-- refine_example-p-style -->
 	<xsl:attribute-set name="termexample-name-style">
-			<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 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> <!-- termexample-name-style -->
 	<xsl:template name="refine_termexample-name-style">
 	</xsl:template>
 	<!-- ========================== -->
 	<!-- Table styles -->
 	<!-- ========================== -->
 	<xsl:variable name="table-border_">
 	</xsl:variable>
 	<xsl:variable name="table-border" select="normalize-space($table-border_)"/>
 	<xsl:variable name="table-cell-border_">
 	</xsl:variable>
 	<xsl:variable name="table-cell-border" select="normalize-space($table-cell-border_)"/>
 	<xsl:attribute-set name="table-container-style">
 		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 		<xsl:attribute name="margin-right">0mm</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- table-container-style -->
 	<xsl:template name="refine_table-container-style">
 		<xsl:param name="margin-side"/>
 		<!-- end table block-container attributes -->
 	</xsl:template> <!-- refine_table-container-style -->
 	<xsl:attribute-set name="table-style">
 		<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
 		<xsl:attribute name="table-layout">fixed</xsl:attribute>
-			<xsl:attribute name="border">0pt solid black</xsl:attribute>
-			<xsl:attribute name="font-size">9.5pt</xsl:attribute> <!-- 8pt -->
+		<xsl:attribute name="border">0pt solid black</xsl:attribute>
+		<xsl:attribute name="font-size">9.5pt</xsl:attribute> <!-- 8pt -->
 	</xsl:attribute-set><!-- table-style -->
 	<xsl:template name="refine_table-style">
 		<xsl:param name="margin-side"/>
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:attribute name="font-size">13pt</xsl:attribute>
-			<xsl:attribute name="font-weight">300</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
-			<xsl:attribute name="text-align">left</xsl:attribute>
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="font-size">13pt</xsl:attribute>
+		<xsl:attribute name="font-weight">300</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- table-name-style -->
 	<xsl:template name="refine_table-name-style">
@@ -2043,37 +1957,29 @@
 		<xsl:if test="$continued = 'true'">
 			<xsl:attribute name="role">SKIP</xsl:attribute>
 		</xsl:if>
 	</xsl:template> <!-- refine_table-name-style -->
 	<xsl:attribute-set name="table-row-style">
 		<xsl:attribute name="min-height">4mm</xsl:attribute>
-			<xsl:attribute name="min-height">8.5mm</xsl:attribute>
+		<xsl:attribute name="min-height">8.5mm</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="background-color">rgb(32, 98, 169)</xsl:attribute>
-			<xsl:attribute name="color">white</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="background-color">rgb(32, 98, 169)</xsl:attribute>
+		<xsl:attribute name="color">white</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_table-header-row-style">
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-header-row-style -->
 	<xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 	</xsl:attribute-set>
 	<xsl:template name="refine_table-footer-row-style">
 	</xsl:template> <!-- refine_table-footer-row-style -->
 	<xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
@@ -2083,12 +1989,10 @@
 	<xsl:template name="refine_table-body-row-style">
 		<xsl:call-template name="setBordersTableArray"/>
-			<xsl:variable name="number"><xsl:number/></xsl:variable>
-			<xsl:if test="$number mod 2 = 0">
-				<xsl:attribute name="background-color">rgb(254, 247, 228)</xsl:attribute>
-			</xsl:if>
+		<xsl:variable name="number"><xsl:number/></xsl:variable>
+		<xsl:if test="$number mod 2 = 0">
+			<xsl:attribute name="background-color">rgb(254, 247, 228)</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_table-body-row-style -->
 	<xsl:attribute-set name="table-header-cell-style">
@@ -2096,10 +2000,8 @@
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="border">0pt solid black</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="border">0pt solid black</xsl:attribute>
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 	<xsl:template name="refine_table-header-cell-style">
@@ -2111,17 +2013,14 @@
 		</xsl:if>
 		<xsl:call-template name="setTableCellAttributes"/>
 	</xsl:template> <!-- refine_table-header-cell-style -->
 	<xsl:attribute-set name="table-cell-style">
 		<xsl:attribute name="display-align">center</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
-			<xsl:attribute name="border">0pt solid black</xsl:attribute>
-			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+		<xsl:attribute name="border">0pt solid black</xsl:attribute>
+		<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 	</xsl:attribute-set> <!-- table-cell-style -->
 	<xsl:template name="refine_table-cell-style">
@@ -2130,8 +2029,6 @@
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		</xsl:if>
-		 <!-- bsi -->
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-cell-style -->
@@ -2141,58 +2038,45 @@
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="padding-top">1mm</xsl:attribute>
-			<xsl:attribute name="border">solid black 0pt</xsl:attribute>
+		<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 	</xsl:attribute-set> <!-- table-footer-cell-style -->
 	<xsl:template name="refine_table-footer-cell-style">
 	</xsl:template> <!-- refine_table-footer-cell-style -->
 	<xsl:attribute-set name="table-note-style">
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-			<xsl:attribute name="font-size">8pt</xsl:attribute>
+		<xsl:attribute name="font-size">8pt</xsl:attribute>
 	</xsl:attribute-set><!-- table-note-style -->
 	<xsl:template name="refine_table-note-style">
 	</xsl:template> <!-- refine_table-note-style -->
 	<xsl:attribute-set name="table-fn-style">
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- table-fn-style -->
 	<xsl:template name="refine_table-fn-style">
 	</xsl:template>
 	<xsl:attribute-set name="table-fn-number-style">
 		<!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 	<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 -->
 	<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">
@@ -2202,17 +2086,14 @@
 	<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>
 	<!-- ========================== -->
 	<!-- END Table styles -->
@@ -2223,51 +2104,39 @@
 	<!-- ========================== -->
 	<xsl:attribute-set name="dl-block-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="dt-row-style">
-			<xsl:attribute name="min-height">7mm</xsl:attribute>
+		<xsl:attribute name="min-height">7mm</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="dt-cell-style">
 	</xsl:attribute-set>
 	<xsl:template name="refine_dt-cell-style">
 	</xsl:template> <!-- refine_dt-cell-style -->
 	<xsl:attribute-set name="dt-block-style">
 		<xsl:attribute name="margin-top">0pt</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="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_dt-block-style">
 	</xsl:template> <!-- refine_dt-block-style -->
 	<xsl:attribute-set name="dl-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="font-weight">300</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="font-weight">300</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:attribute-set> <!-- dl-name-style -->
 	<xsl:attribute-set name="dd-cell-style">
 		<xsl:attribute name="padding-left">2mm</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_dd-cell-style">
 	</xsl:template> <!-- refine_dd-cell-style -->
 	<!-- ========================== -->
@@ -2275,266 +2144,202 @@
 	<!-- ========================== -->
 	<xsl:attribute-set name="appendix-style">
-			<xsl:attribute name="font-size">12pt</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set>
 	<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 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:attribute-set name="xref-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="eref-style">
 	</xsl:attribute-set>
 	<xsl:template name="refine_eref-style">
 		<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
 		<xsl:variable name="text" select="normalize-space()"/>
 	</xsl:template> <!-- refine_eref-style -->
 	<xsl:attribute-set name="note-style">
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_note-style">
-			<xsl:if test="ancestor::ribose:ul or ancestor::ribose:ol and not(ancestor::ribose:note[1]/following-sibling::*)">
-				<xsl:attribute name="margin-top">6pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			</xsl:if>
+		<xsl:if test="ancestor::ribose:ul or ancestor::ribose:ol and not(ancestor::ribose: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: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="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 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:template name="refine_note-name-style">
 	</xsl:template> <!-- refine_note-name-style -->
 	<xsl:attribute-set name="table-note-name-style">
 		<xsl:attribute name="padding-right">2mm</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="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_table-note-name-style">
 	</xsl:template> <!-- refine_table-note-name-style -->
 	<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 name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="termnote-style">
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_termnote-style">
 	</xsl:template> <!-- refine_termnote-style -->
 	<xsl:attribute-set name="termnote-name-style">
-			<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 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:template name="refine_termnote-name-style">
-		<!-- <xsl:if test="$namespace = 'ieee'">
-			<xsl:attribute name="padding-right">0mm</xsl:attribute>
-		</xsl:if> -->
 	</xsl:template>
 	<xsl:attribute-set name="termnote-p-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="quote-style">
 		<xsl:attribute name="margin-left">12mm</xsl:attribute>
 		<xsl:attribute name="margin-right">12mm</xsl:attribute>
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-left">13mm</xsl:attribute>
+		<xsl:attribute name="margin-top">12pt</xsl:attribute>
+		<xsl:attribute name="margin-left">13mm</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_quote-style">
 	</xsl:template>
 	<xsl:attribute-set name="quote-source-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
-			<xsl:attribute name="margin-right">25mm</xsl:attribute>
+		<xsl:attribute name="margin-right">25mm</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="termsource-style">
-			<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_termsource-style">
 	</xsl:template> <!-- refine_termsource-style -->
 	<xsl:attribute-set name="termsource-text-style">
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
+		<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="origin-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="term-style">
 	</xsl:attribute-set>
 	<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>
 	<xsl:attribute-set name="figure-block-style">
 		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_figure-block-style">
 	</xsl:template>
-	<xsl:attribute-set name="figure-style">
-		 <!-- background for image -->
-			<xsl:attribute name="background-color">rgb(236,242,246)</xsl:attribute>
-			<xsl:attribute name="padding-left">11mm</xsl:attribute>
-			<xsl:attribute name="margin-left">0mm</xsl:attribute>
-			<xsl:attribute name="padding-right">11mm</xsl:attribute>
-			<xsl:attribute name="margin-right">0mm</xsl:attribute>
-			<xsl:attribute name="padding-top">7.5mm</xsl:attribute>
-			<xsl:attribute name="padding-bottom">7.5mm</xsl:attribute>
-			<xsl:attribute name="margin-bottom">3mm</xsl:attribute>
+	<xsl:attribute-set name="figure-style"> <!-- background for image -->
+		<xsl:attribute name="background-color">rgb(236,242,246)</xsl:attribute>
+		<xsl:attribute name="padding-left">11mm</xsl:attribute>
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="padding-right">11mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="padding-top">7.5mm</xsl:attribute>
+		<xsl:attribute name="padding-bottom">7.5mm</xsl:attribute>
+		<xsl:attribute name="margin-bottom">3mm</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
-			<xsl:attribute name="font-size">13pt</xsl:attribute>
-			<xsl:attribute name="font-weight">300</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
-			<xsl:attribute name="text-align">left</xsl:attribute>
-			<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 name="font-size">13pt</xsl:attribute>
+		<xsl:attribute name="font-weight">300</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<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:template name="refine_figure-name-style">
 	</xsl:template> <!-- refine_figure-name-style -->
 	<xsl:attribute-set name="figure-source-style">
 	</xsl:attribute-set>
 	<!-- Formula's styles -->
 	<xsl:attribute-set name="formula-style">
 		<xsl:attribute name="margin-top">6pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-style -->
 	<xsl:attribute-set name="formula-stem-block-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
-			<xsl:attribute name="text-align">left</xsl:attribute>
-			<xsl:attribute name="margin-left">5mm</xsl:attribute>
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="margin-left">5mm</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-stem-block-style -->
 	<xsl:template name="refine_formula-stem-block-style">
 	</xsl:template> <!-- refine_formula-stem-block-style -->
 	<xsl:attribute-set name="formula-stem-number-style">
 		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set> <!-- formula-stem-number-style -->
 	<!-- End Formula's styles -->
 	<xsl:template name="refine_formula-stem-number-style">
 	</xsl:template>
 	<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:template name="refine_image-style">
 	</xsl:template>
 	<xsl:attribute-set name="figure-pseudocode-p-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="image-graphic-style">
 		<xsl:attribute name="width">100%</xsl:attribute>
 		<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 name="content-height">scale-to-fit</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="tt-style">
-			<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
+		<xsl:attribute name="font-family"><xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="sourcecode-name-style">
@@ -2543,68 +2348,55 @@
 		<xsl:attribute name="text-align">center</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
-			<xsl:attribute name="font-size">13pt</xsl:attribute>
-			<xsl:attribute name="font-weight">300</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
-			<xsl:attribute name="text-align">left</xsl:attribute>
-			<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 name="font-size">13pt</xsl:attribute>
+		<xsl:attribute name="font-weight">300</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="text-align">left</xsl:attribute>
+		<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 name="preferred-block-style">
 	</xsl:attribute-set>
 	<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>
 	<xsl:attribute-set name="domain-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="admitted-style">
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="deprecates-style">
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
 	</xsl:attribute-set>
 	<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 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>
 	<xsl:variable name="color-added-text">
 		<xsl:text>rgb(0, 255, 0)</xsl:text>
 	</xsl:variable>
 	<xsl:attribute-set name="add-style">
-				<xsl:attribute name="color">red</xsl:attribute>
-				<xsl:attribute name="text-decoration">underline</xsl:attribute>
-				<!-- <xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="color">red</xsl:attribute>
+		<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		<!-- <xsl:attribute name="color">black</xsl:attribute>
 				<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
 				<xsl:attribute name="padding-top">1mm</xsl:attribute>
 				<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
 	</xsl:attribute-set>
 	<xsl:variable name="add-style">
@@ -2624,60 +2416,44 @@
 	<xsl:attribute-set name="mathml-style">
 		<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_mathml-style">
 	</xsl:template>
 	<xsl:attribute-set name="list-style">
-			<xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
+		<xsl:attribute name="provisional-distance-between-starts">6mm</xsl:attribute>
 	</xsl:attribute-set> <!-- list-style -->
 	<xsl:template name="refine_list-style">
 	</xsl:template> <!-- refine_list-style -->
 	<xsl:attribute-set name="list-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:attribute name="font-weight">300</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="font-weight">300</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:attribute-set> <!-- list-name-style -->
 	<xsl:attribute-set name="list-item-style">
-			<xsl:attribute name="space-after">4pt</xsl:attribute>
+		<xsl:attribute name="space-after">4pt</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_list-item-style">
 	</xsl:template> <!-- refine_list-item-style -->
 	<xsl:attribute-set name="list-item-label-style">
-			<xsl:attribute name="color"><xsl:value-of select="$color_blue"/></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="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_list-item-label-style">
 	</xsl:template> <!-- refine_list-item-label-style -->
 	<xsl:attribute-set name="list-item-body-style">
-			<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
+		<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:template name="refine_list-item-body-style">
 	</xsl:template> <!-- refine_list-item-body-style -->
 	<xsl:attribute-set name="toc-style">
@@ -2687,15 +2463,13 @@
 	<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 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:template name="refine_fn-reference-style">
 	</xsl:template> <!-- refine_fn-reference-style -->
 	<xsl:attribute-set name="fn-style">
@@ -2704,10 +2478,8 @@
 	<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 name="font-size">65%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="fn-body-style">
@@ -2715,137 +2487,103 @@
 		<xsl:attribute name="font-style">normal</xsl:attribute>
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
-			<xsl:attribute name="font-size">10pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-			<xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
-			<xsl:attribute name="text-align">left</xsl:attribute>
+		<xsl:attribute name="font-size">10pt</xsl:attribute>
+		<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:template name="refine_fn-body-style">
 	</xsl:template> <!-- refine_fn-body-style -->
 	<xsl:attribute-set name="fn-body-num-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-			<xsl:attribute name="font-size">60%</xsl:attribute>
-			<xsl:attribute name="vertical-align">super</xsl:attribute>
+		<xsl:attribute name="font-size">60%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set> <!-- fn-body-num-style -->
 	<xsl:template name="refine_fn-body-num-style">
 	</xsl:template> <!-- refine_fn-body-num-style -->
 	<!-- admonition -->
 	<xsl:attribute-set name="admonition-style">
-			<xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
-			<xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
-			<xsl:attribute name="margin-left">16mm</xsl:attribute>
-			<xsl:attribute name="margin-right">16mm</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="border">0.5pt solid rgb(79, 129, 189)</xsl:attribute>
+		<xsl:attribute name="color">rgb(79, 129, 189)</xsl:attribute>
+		<xsl:attribute name="margin-left">16mm</xsl:attribute>
+		<xsl:attribute name="margin-right">16mm</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-style -->
 	<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 name="padding">2mm</xsl:attribute>
-			<xsl:attribute name="padding-top">3mm</xsl:attribute>
+		<xsl:attribute name="padding">2mm</xsl:attribute>
+		<xsl:attribute name="padding-top">3mm</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-container-style -->
 	<xsl:attribute-set name="admonition-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:attribute name="font-size">11pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="font-style">italic</xsl:attribute>
-			<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="font-size">11pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="font-style">italic</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-name-style -->
 	<xsl:attribute-set name="admonition-p-style">
-			<xsl:attribute name="font-style">italic</xsl:attribute>
+		<xsl:attribute name="font-style">italic</xsl:attribute>
 	</xsl:attribute-set> <!-- admonition-p-style -->
 	<!-- end admonition -->
 	<!-- 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 name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-style -->
 	<!-- 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>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-		<!-- <xsl:if test="$namespace = 'ieee'">
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
-		</xsl:if> -->
-			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
-			<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
+		<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+		<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-normative-list-style -->
 	<xsl:attribute-set name="bibitem-non-normative-style">
 	</xsl:attribute-set> <!-- bibitem-non-normative-style -->
 	<!-- 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="margin-bottom">4pt</xsl:attribute>
+		<xsl:attribute name="provisional-distance-between-starts">8mm</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-style -->
 	<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 name="margin-bottom">4pt</xsl:attribute>
 	</xsl:attribute-set>
 	<!-- bibitem in bibliography section (references/@normative="false"), list body -->
 	<xsl:attribute-set name="bibitem-normative-list-body-style">
 	</xsl:attribute-set>
 	<xsl:attribute-set name="bibitem-non-normative-list-body-style">
 	</xsl:attribute-set> <!-- bibitem-non-normative-list-body-style -->
 	<!-- 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>
 		<xsl:attribute name="font-size">65%</xsl:attribute>
-			<xsl:attribute name="vertical-align">super</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
 	<!-- 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>
-			<xsl:attribute name="font-size">60%</xsl:attribute>
-			<xsl:attribute name="vertical-align">super</xsl:attribute>
+		<xsl:attribute name="font-size">60%</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
 	<!-- footnote body (text) on the page bottom -->
@@ -2853,13 +2591,10 @@
 		<xsl:attribute name="font-size">10pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="start-indent">0pt</xsl:attribute>
-			<xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
+		<xsl:attribute name="color">rgb(168, 170, 173)</xsl:attribute>
 	</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
 	<xsl:attribute-set name="references-non-normative-style">
 	</xsl:attribute-set> <!-- references-non-normative-style -->
 	<!-- Highlight.js syntax GitHub styles -->
@@ -3019,12 +2754,10 @@
 	<!-- Index section styles -->
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</xsl:attribute>
 	</xsl:attribute-set>
 	<xsl:attribute-set name="indexsect-clause-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set>
 	<!-- End Index section styles -->
@@ -3101,47 +2834,47 @@
 	</xsl:template>
 	<xsl:template name="processTables_Contents">
-		<tables>
+		<mn:tables>
 			<xsl:for-each select="//*[local-name() = 'table'][not(ancestor::*[local-name() = 'metanorma-extension'])][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
 				<xsl:choose>
 					<xsl:when test="*[local-name() = 'fmt-name']">
 						<xsl:variable name="fmt_name">
 							<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
 						</xsl:variable>
-						<table id="{@id}" alt-text="{normalize-space($fmt_name)}">
+						<mn:table id="{@id}" alt-text="{normalize-space($fmt_name)}">
 							<xsl:copy-of select="$fmt_name"/>
-						</table>
+						</mn:table>
 					</xsl:when>
 					<xsl:otherwise>
-						<table id="{@id}" alt-text="{*[local-name() = 'name']}">
+						<mn:table id="{@id}" alt-text="{*[local-name() = 'name']}">
 							<xsl:copy-of select="*[local-name() = 'name']"/>
-						</table>
+						</mn:table>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:for-each>
-		</tables>
+		</mn:tables>
 	</xsl:template>
 	<xsl:template name="processFigures_Contents">
-		<figures>
+		<mn:figures>
 			<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
 				<xsl:choose>
 					<xsl:when test="*[local-name() = 'fmt-name']">
 						<xsl:variable name="fmt_name">
 							<xsl:apply-templates select="*[local-name() = 'fmt-name']" mode="update_xml_step1"/>
 						</xsl:variable>
-						<figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
+						<mn:figure id="{@id}" alt-text="{normalize-space($fmt_name)}">
 							<xsl:copy-of select="$fmt_name"/>
-						</figure>
+						</mn:figure>
 					</xsl:when>
 					<xsl:otherwise>
-						<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
+						<mn:figure id="{@id}" alt-text="{*[local-name() = 'name']}">
 							<xsl:copy-of select="*[local-name() = 'name']"/>
-						</figure>
+						</mn:figure>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:for-each>
-		</figures>
+		</mn:figures>
 	</xsl:template>
 	<xsl:template name="processPrefaceSectionsDefault">
@@ -3160,7 +2893,6 @@
 		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
 		<xsl:for-each select="/*/*[local-name()='annex']">
@@ -3267,7 +2999,6 @@
 				<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
 					<xsl:sort select="@displayorder" data-type="number"/>
 					<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
 				</xsl:for-each>
 			</xsl:element>
 		</xsl:element>
@@ -3401,7 +3132,6 @@
 				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak">
 					<xsl:with-param name="page_sequence_at_top">true</xsl:with-param>
 				</xsl:apply-templates>
 			</xsl:for-each>
 		</xsl:element>
@@ -3441,19 +3171,17 @@
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:template match="text()" name="text">
-				<xsl:choose>
-					<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
-					<xsl:otherwise>
-						<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
-						<xsl:call-template name="replace_fo_inline_tags">
-							<xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
-							<xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
-							<xsl:with-param name="text" select="$text"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
+				<xsl:call-template name="replace_fo_inline_tags">
+					<xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
+					<xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
+					<xsl:with-param name="text" select="$text"/>
+				</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<xsl:template name="replace_fo_inline_tags">
@@ -3507,7 +3235,7 @@
 						<xsl:with-param name="keep_sep">true</xsl:with-param>
 					</xsl:call-template>
 				</xsl:variable>
-				<xsl:for-each select="xalan:nodeset($items)/item">
+				<xsl:for-each select="xalan:nodeset($items)/mn:item">
 					<xsl:choose>
 						<xsl:when test=". = $sep">
 							<xsl:value-of select="$sep"/><xsl:value-of select="$zero_width_space"/>
@@ -3536,17 +3264,13 @@
 	</xsl:template> <!-- copyright-statement -->
 	<xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
-				<!-- process in the template 'title' -->
-				<xsl:call-template name="title"/>
+		<!-- process in the template 'title' -->
+		<xsl:call-template name="title"/>
 	</xsl:template> <!-- copyright-statement//title -->
 	<xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
-				<!-- process in the template 'paragraph' -->
-				<xsl:call-template name="paragraph"/>
+		<!-- process in the template 'paragraph' -->
+		<xsl:call-template name="paragraph"/>
 	</xsl:template> <!-- copyright-statement//p -->
 	<xsl:template match="*[local-name()='license-statement']">
@@ -3556,47 +3280,39 @@
 	</xsl:template> <!-- license-statement -->
 	<xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
-				<!-- process in the template 'title' -->
-				<xsl:call-template name="title"/>
+		<!-- process in the template 'title' -->
+		<xsl:call-template name="title"/>
 	</xsl:template> <!-- license-statement/title -->
 	<xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
-				<!-- process in the template 'paragraph' -->
-				<xsl:call-template name="paragraph"/>
+		<!-- process in the template 'paragraph' -->
+		<xsl:call-template name="paragraph"/>
 	</xsl:template> <!-- license-statement/p -->
 	<xsl:template match="*[local-name()='legal-statement']">
 		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
 	<xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
-				<!-- ogc-white-paper rsd -->
-				<xsl:variable name="level">
-					<xsl:call-template name="getLevel"/>
-				</xsl:variable>
-				<fo:block role="H{$level}" xsl:use-attribute-sets="legal-statement-title-style">
-					<xsl:apply-templates/>
-				</fo:block>
+		<!-- ogc-white-paper rsd -->
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<fo:block role="H{$level}" xsl:use-attribute-sets="legal-statement-title-style">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template> <!-- legal-statement/title -->
 	<xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
 		<xsl:param name="margin"/>
-				<!-- process in the template 'paragraph' -->
-				<xsl:call-template name="paragraph">
-					<xsl:with-param name="margin" select="$margin"/>
-				</xsl:call-template>
+		<!-- process in the template 'paragraph' -->
+		<xsl:call-template name="paragraph">
+			<xsl:with-param name="margin" select="$margin"/>
+		</xsl:call-template>
 	</xsl:template> <!-- legal-statement/p -->
 	<xsl:template match="*[local-name()='feedback-statement']">
@@ -3606,20 +3322,16 @@
 	</xsl:template> <!-- feedback-statement -->
 	<xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
-				<!-- process in the template 'title' -->
-				<xsl:call-template name="title"/>
+		<!-- process in the template 'title' -->
+		<xsl:call-template name="title"/>
 	</xsl:template>
 	<xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
 		<xsl:param name="margin"/>
-				<!-- process in the template 'paragraph' -->
-				<xsl:call-template name="paragraph">
-					<xsl:with-param name="margin" select="$margin"/>
-				</xsl:call-template>
+		<!-- process in the template 'paragraph' -->
+		<xsl:call-template name="paragraph">
+			<xsl:with-param name="margin" select="$margin"/>
+		</xsl:call-template>
 	</xsl:template>
 	<!-- ================================= -->
@@ -3672,7 +3384,6 @@
 	<xsl:template match="*[local-name()='table']" name="table">
 		<xsl:variable name="table-preamble">
 		</xsl:variable>
 		<xsl:variable name="table">
@@ -3690,8 +3401,7 @@
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
-					<xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
+			<xsl:apply-templates select="*[local-name()='name']"/> <!-- table's title rendered before table -->
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
@@ -3744,8 +3454,7 @@
 				<xsl:variable name="table_width_default">100%</xsl:variable>
 				<xsl:variable name="table_width">
-					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
-					<xsl:value-of select="$table_width_default"/>
+					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) --><xsl:value-of select="$table_width_default"/>
 				</xsl:variable>
 				<xsl:variable name="table_attributes">
@@ -3888,27 +3597,25 @@
 			<xsl:when test="@width and @width != 'full-page-width' and @width != 'text-width'">
 				<!-- centered table when table name is centered (see table-name-style) -->
-					<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
-						<fo:table-column column-width="proportional-column-width(1)"/>
-						<fo:table-column column-width="{@width}"/>
-						<fo:table-column column-width="proportional-column-width(1)"/>
-						<fo:table-body role="SKIP">
-							<fo:table-row role="SKIP">
-								<fo:table-cell column-number="2" role="SKIP">
-									<xsl:copy-of select="$table-preamble"/>
-									<fo:block role="SKIP">
-										<xsl:call-template name="setTrackChangesStyles">
-											<xsl:with-param name="isAdded" select="$isAdded"/>
-											<xsl:with-param name="isDeleted" select="$isDeleted"/>
-										</xsl:call-template>
-										<xsl:copy-of select="$table"/>
-									</fo:block>
-								</fo:table-cell>
-							</fo:table-row>
-						</fo:table-body>
-					</fo:table>
+				<fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style" role="SKIP">
+					<fo:table-column column-width="proportional-column-width(1)"/>
+					<fo:table-column column-width="{@width}"/>
+					<fo:table-column column-width="proportional-column-width(1)"/>
+					<fo:table-body role="SKIP">
+						<fo:table-row role="SKIP">
+							<fo:table-cell column-number="2" role="SKIP">
+								<xsl:copy-of select="$table-preamble"/>
+								<fo:block role="SKIP">
+									<xsl:call-template name="setTrackChangesStyles">
+										<xsl:with-param name="isAdded" select="$isAdded"/>
+										<xsl:with-param name="isDeleted" select="$isDeleted"/>
+									</xsl:call-template>
+									<xsl:copy-of select="$table"/>
+								</fo:block>
+							</fo:table-cell>
+						</fo:table-row>
+					</fo:table-body>
+				</fo:table>
 			</xsl:when>
 			<xsl:otherwise>
@@ -3934,7 +3641,6 @@
 	</xsl:template>
 	<xsl:template name="setBordersTableArray">
 	</xsl:template>
 	<!-- table/name-->
@@ -3943,51 +3649,50 @@
 		<xsl:param name="cols-count"/>
 		<xsl:if test="normalize-space() != ''">
-					<fo:block xsl:use-attribute-sets="table-name-style">
-						<xsl:call-template name="refine_table-name-style">
-							<xsl:with-param name="continued" select="$continued"/>
-						</xsl:call-template>
+			<fo:block xsl:use-attribute-sets="table-name-style">
-						<xsl:choose>
-							<xsl:when test="$continued = 'true'">
+				<xsl:call-template name="refine_table-name-style">
+					<xsl:with-param name="continued" select="$continued"/>
+				</xsl:call-template>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates/>
-							</xsl:otherwise>
-						</xsl:choose>
+				<xsl:choose>
+					<xsl:when test="$continued = 'true'">
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates/>
+					</xsl:otherwise>
+				</xsl:choose>
-					</fo:block>
+			</fo:block>
-					<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
-					<xsl:if test="$continued = 'true'">
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<xsl:if test="$continued = 'true'">
-						<!-- to prevent the error 'THead element may contain only TR elements' -->
+				<!-- to prevent the error 'THead element may contain only TR elements' -->
-						<xsl:choose>
-							<xsl:when test="string(number($cols-count)) != 'NaN'">
-								<fo:table width="100%" table-layout="fixed" role="SKIP">
-									<fo:table-body role="SKIP">
-										<fo:table-row>
-											<fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
-												<fo:block text-align="right" role="SKIP">
-													<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
-												</fo:block>
-											</fo:table-cell>
-										</fo:table-row>
-									</fo:table-body>
-								</fo:table>
-							</xsl:when>
-							<xsl:otherwise>
-								<fo:block text-align="right">
-									<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
-								</fo:block>
-							</xsl:otherwise>
-						</xsl:choose>
+				<xsl:choose>
+					<xsl:when test="string(number($cols-count)) != 'NaN'">
+						<fo:table width="100%" table-layout="fixed" role="SKIP">
+							<fo:table-body role="SKIP">
+								<fo:table-row>
+									<fo:table-cell role="TH" number-columns-spanned="{$cols-count}">
+										<fo:block text-align="right" role="SKIP">
+											<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+							</fo:table-body>
+						</fo:table>
+					</xsl:when>
+					<xsl:otherwise>
+						<fo:block text-align="right">
+							<xsl:apply-templates select="../*[local-name() = 'note'][@type = 'units']/node()"/>
+						</fo:block>
+					</xsl:otherwise>
+				</xsl:choose>
-					</xsl:if>
-					<!-- </xsl:if> -->
+			</xsl:if>
+			<!-- </xsl:if> -->
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
@@ -4362,7 +4067,6 @@
 	<xsl:template match="*[local-name()='thead']">
 		<xsl:param name="cols-count"/>
 		<fo:table-header>
 			<xsl:apply-templates/>
 		</fo:table-header>
 	</xsl:template> <!-- thead -->
@@ -4376,21 +4080,20 @@
 				<xsl:call-template name="refine_table-header-title-style"/>
-						<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
-							<xsl:with-param name="continued">true</xsl:with-param>
-							<xsl:with-param name="cols-count" select="$cols-count"/>
-						</xsl:apply-templates>
+				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
+					<xsl:with-param name="continued">true</xsl:with-param>
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+				</xsl:apply-templates>
-						<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
-							<fo:block role="SKIP"/>
-						</xsl:if>
+				<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='name'])"> <!-- to prevent empty fo:table-cell in case of missing table's name -->
+					<fo:block role="SKIP"/>
+				</xsl:if>
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template> <!-- table-header-title -->
 	<xsl:template name="refine_table-header-title-style">
 	</xsl:template> <!-- refine_table-header-title-style -->
 	<xsl:template match="*[local-name()='thead']" mode="process_tbody">
@@ -4420,7 +4123,6 @@
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name'] or ../*[local-name()='source'] or ../*[local-name()='p']"/>
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 		</xsl:variable>
 		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
@@ -4482,26 +4184,19 @@
 								<xsl:call-template name="setBordersTableArray"/>
 								<!-- fn will be processed inside 'note' processing -->
-								<!-- for BSI (not PAS) display Notes before footnotes -->
-								<!-- except gb and bsi  -->
-										<xsl:apply-templates select="../*[local-name()='p']"/>
-										<xsl:apply-templates select="../*[local-name()='dl']"/>
-										<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
-										<xsl:apply-templates select="../*[local-name()='example']"/>
-										<xsl:apply-templates select="../*[local-name()='source']"/>
+								<xsl:apply-templates select="../*[local-name()='p']"/>
+								<xsl:apply-templates select="../*[local-name()='dl']"/>
+								<xsl:apply-templates select="../*[local-name()='note'][not(@type = 'units')]"/>
+								<xsl:apply-templates select="../*[local-name()='example']"/>
+								<xsl:apply-templates select="../*[local-name()='source']"/>
 								<xsl:variable name="isDisplayRowSeparator">
 								</xsl:variable>
 								<!-- horizontal row separator -->
 								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
 									<xsl:if test="(../*[local-name()='note'][not(@type = 'units')] or ../*[local-name()='example']) and normalize-space($table_fn_block) != ''">
 										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
 											<xsl:call-template name="setBordersTableArray"/>
 											<fo:block font-size="1pt"> </fo:block>
 										</fo:block-container>
@@ -4509,11 +4204,8 @@
 								</xsl:if>
 								<!-- fn processing -->
-										<!-- <xsl:call-template name="table_fn_display" /> -->
-										<xsl:copy-of select="$table_fn_block"/>
-								<!-- for PAS display Notes after footnotes -->
+								<!-- <xsl:call-template name="table_fn_display" /> -->
+								<xsl:copy-of select="$table_fn_block"/>
 							</fo:table-cell>
 						</fo:table-row>
@@ -4640,7 +4332,7 @@
 						<xsl:with-param name="pText" select="$border_under_row_"/>
 					</xsl:call-template>
 				</xsl:variable>
-				<xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
+				<xsl:if test="xalan:nodeset($border_under_row)/mn:item[. = normalize-space($row_num)]">
 					<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
 				</xsl:if>
 			</xsl:when>
@@ -4757,7 +4449,7 @@
 		</xsl:variable>
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
-			<xsl:for-each select="xalan:nodeset($styles__)/item">
+			<xsl:for-each select="xalan:nodeset($styles__)/mn:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
 				<xsl:if test="$key = 'color' or       $key = 'background-color' or      $key = 'border' or      $key = 'border-top' or      $key = 'border-right' or      $key = 'border-left' or      $key = 'border-bottom' or      $key = 'border-style' or      $key = 'border-width' or      $key = 'border-color' or      $key = 'border-top-style' or      $key = 'border-top-width' or      $key = 'border-top-color' or      $key = 'border-right-style' or      $key = 'border-right-width' or      $key = 'border-right-color' or      $key = 'border-left-style' or      $key = 'border-left-width' or      $key = 'border-left-color' or      $key = 'border-bottom-style' or      $key = 'border-bottom-width' or      $key = 'border-bottom-color'">
@@ -4807,9 +4499,7 @@
 			<fo:block role="SKIP">
 				<xsl:if test="$isGenerateTableIF = 'true'">
-							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 				</xsl:if>
 				<xsl:apply-templates/>
@@ -4824,25 +4514,23 @@
 	<!-- table/note, table/example, table/tfoot//note, table/tfoot//example -->
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example'] |       *[local-name()='table']/*[local-name()='tfoot']//*[local-name()='note' or local-name() = 'example']" priority="2">
+		<xsl:call-template name="setNamedDestination"/>
+		<fo:block xsl:use-attribute-sets="table-note-style">
+			<xsl:copy-of select="@id"/>
-				<xsl:call-template name="setNamedDestination"/>
-				<fo:block xsl:use-attribute-sets="table-note-style">
-					<xsl:copy-of select="@id"/>
-					<xsl:call-template name="refine_table-note-style"/>
-					<!-- Table's note/example name (NOTE, for example) -->
-					<fo:inline xsl:use-attribute-sets="table-note-name-style">
+			<xsl:call-template name="refine_table-note-style"/>
-						<xsl:call-template name="refine_table-note-name-style"/>
+			<!-- Table's note/example name (NOTE, for example) -->
+			<fo:inline xsl:use-attribute-sets="table-note-name-style">
-						<xsl:apply-templates select="*[local-name() = 'name']"/>
+				<xsl:call-template name="refine_table-note-name-style"/>
-					</fo:inline>
+				<xsl:apply-templates select="*[local-name() = 'name']"/>
-					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-				</fo:block>
+			</fo:inline>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+		</fo:block>
 	</xsl:template> <!-- table/note -->
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p'] |  *[local-name()='table']/*[local-name()='tfoot']//*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
@@ -4887,9 +4575,7 @@
 		<xsl:variable name="current_fn_number" select="@reference"/>
 		<xsl:variable name="current_fn_number_text">
-					<xsl:value-of select="$current_fn_number"/>
+			<xsl:value-of select="$current_fn_number"/>
 		</xsl:variable>
 		<xsl:variable name="ref_id" select="@target"/>
@@ -4901,12 +4587,10 @@
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'bibitem']">
 							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
 							</fn_styles>
 						</xsl:when>
 						<xsl:otherwise>
 							<fn_styles xsl:use-attribute-sets="fn-num-style">
 							</fn_styles>
 						</xsl:otherwise>
 					</xsl:choose>
@@ -4924,7 +4608,6 @@
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
 							<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
 								<xsl:copy-of select="$current_fn_number_text"/>
 							</fo:inline>
@@ -4962,10 +4645,9 @@
 								<here><xsl:copy-of select="$footnotes"/></here> -->
 								<xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $ref_id]"/>
 							</xsl:variable>
-									<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
-										<xsl:copy-of select="$fn_block"/>
-									</fo:block>
+							<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
+								<xsl:copy-of select="$fn_block"/>
+							</fo:block>
 						</fo:block-container>
 					</fo:footnote-body>
@@ -5042,21 +4724,20 @@
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])">  --> <!-- only unique reference puts in note-->
 		<xsl:for-each select="..//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
+				<fo:block xsl:use-attribute-sets="table-fn-style">
+					<xsl:copy-of select="@id"/>
+					<xsl:call-template name="refine_table-fn-style"/>
-						<fo:block xsl:use-attribute-sets="table-fn-style">
-							<xsl:copy-of select="@id"/>
-							<xsl:call-template name="refine_table-fn-style"/>
-							<xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
-								<xsl:with-param name="process">true</xsl:with-param>
-							</xsl:apply-templates>
+					<xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
+						<xsl:with-param name="process">true</xsl:with-param>
+					</xsl:apply-templates>
-							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
-								<!-- <xsl:copy-of select="./node()"/> -->
-								<xsl:apply-templates/>
-							</fo:inline>
+					<fo:inline xsl:use-attribute-sets="table-fn-body-style">
+						<!-- <xsl:copy-of select="./node()"/> -->
+						<xsl:apply-templates/>
+					</fo:inline>
-						</fo:block>
+				</fo:block>
 			<!-- </xsl:if> -->
 		</xsl:for-each>
@@ -5109,7 +4790,6 @@
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<xsl:attribute name="padding-right">5mm</xsl:attribute>
 		</xsl:if>
 	</xsl:template>
@@ -5193,7 +4873,6 @@
 		<xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
 			<xsl:variable name="key_iso">
 			</xsl:variable>
 			<fo:block>
@@ -5239,7 +4918,6 @@
 				<fo:table width="95%" table-layout="fixed">
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="font-size">10pt</xsl:attribute>
 					</xsl:if>
 					<xsl:choose>
 						<!-- if there 'dl', then set same columns width -->
@@ -5263,23 +4941,19 @@
 								<fo:table-row>
 									<fo:table-cell>
 										<fo:block>
-													<fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
-														<!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
-														<!-- <xsl:value-of select="@reference"/> -->
-														<xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
-													</fo:inline>
+											<fo:inline id="{@id}" xsl:use-attribute-sets="figure-fmt-fn-label-style">
+												<!-- <xsl:attribute name="padding-right">0mm</xsl:attribute> -->
+												<!-- <xsl:value-of select="@reference"/> -->
+												<xsl:value-of select="normalize-space(.//*[local-name() = 'fmt-fn-label'])"/>
+											</fo:inline>
 										</fo:block>
 									</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:attribute name="margin-bottom">0</xsl:attribute>
 											</xsl:if>
 											<!-- <xsl:copy-of select="./node()"/> -->
 											<xsl:apply-templates/>
 										</fo:block>
@@ -5329,11 +5003,9 @@
 	<!-- figure/dl[@key = 'true']/dt/p/sup -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'dl'][@key = 'true']/*[local-name() = 'dt']/     *[local-name() = 'p'][count(node()[normalize-space() != '']) = 1]/*[local-name() = 'sup']" priority="3">
 		<xsl:variable name="key_iso">
 		</xsl:variable>
 		<xsl:if test="normalize-space($key_iso) = 'true'">
 			<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:value-of select="@reference"/> -->
@@ -5379,8 +5051,7 @@
 							<xsl:text>※</xsl:text>
 						</xsl:if> -->
 						<!-- <xsl:value-of select="@reference"/> -->
-								<xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
+						<xsl:value-of select="normalize-space(*[local-name() = 'fmt-fn-label'])"/>
 						<!-- <xsl:if test="$namespace = 'bsi'">
 							<xsl:text>)</xsl:text>
@@ -5452,10 +5123,9 @@
 			</xsl:if>
 			<xsl:call-template name="setBlockSpanAll"/>
-					<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
-						<xsl:attribute name="margin-left">0mm</xsl:attribute>
-					</xsl:if>
+			<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="ancestor::*[local-name() = 'sourcecode']">
 				<!-- set font-size as sourcecode font-size -->
@@ -5476,7 +5146,6 @@
 						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
 					</xsl:choose>
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="setTrackChangesStyles">
@@ -5485,37 +5154,32 @@
 			</xsl:call-template>
 			<fo:block-container margin-left="0mm" role="SKIP">
-						<xsl:attribute name="margin-right">0mm</xsl:attribute>
+				<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				<xsl:variable name="parent" select="local-name(..)"/>
-				<xsl:variable name="key_iso">
-					 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
+				<xsl:variable name="key_iso"> <!-- and  (not(../@class) or ../@class !='pseudocode') -->
 				</xsl:variable>
 				<xsl:variable name="onlyOneComponent" select="normalize-space($parent = 'formula' and count(*[local-name()='dt']) = 1)"/>
 				<xsl:choose>
 					<xsl:when test="$onlyOneComponent = 'true'"> <!-- only one component -->
-								<fo:block margin-bottom="12pt" text-align="left">
-									<!-- <xsl:variable name="title-where">
+						<fo:block margin-bottom="12pt" text-align="left">
+							<!-- <xsl:variable name="title-where">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">where</xsl:with-param>
 										</xsl:call-template>
 									</xsl:variable>
 									<xsl:value-of select="$title-where"/> -->
-									<xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
-									<xsl:text> </xsl:text>
-									<xsl:apply-templates select="*[local-name()='dt']/*"/>
-									<xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
-										<xsl:text> </xsl:text>
-									</xsl:if>
-									<xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
-								</fo:block>
+							<xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
+							<xsl:text> </xsl:text>
+							<xsl:apply-templates select="*[local-name()='dt']/*"/>
+							<xsl:if test="*[local-name()='dd']/node()[normalize-space() != ''][1][self::text()]">
+								<xsl:text> </xsl:text>
+							</xsl:if>
+							<xsl:apply-templates select="*[local-name()='dd']/node()" mode="inline"/>
+						</fo:block>
 					</xsl:when> <!-- END: only one component -->
 					<xsl:when test="$parent = 'formula'"> <!-- a few components -->
 						<fo:block margin-bottom="12pt" text-align="left">
@@ -5535,19 +5199,17 @@
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
 						<!-- Presentation XML contains 'Key' caption, https://github.com/metanorma/isodoc/issues/607 -->
 						<xsl:if test="not(preceding-sibling::*[1][local-name() = 'p' and @keep-with-next])"> <!-- for old Presentation XML -->
+							<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
-									<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
-										<xsl:call-template name="refine_figure_key_style"/>
-										<xsl:variable name="title-key">
-											<xsl:call-template name="getLocalizedString">
-												<xsl:with-param name="key">key</xsl:with-param>
-											</xsl:call-template>
-										</xsl:variable>
-										<xsl:value-of select="$title-key"/>
-									</fo:block>
+								<xsl:call-template name="refine_figure_key_style"/>
+								<xsl:variable name="title-key">
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">key</xsl:with-param>
+									</xsl:call-template>
+								</xsl:variable>
+								<xsl:value-of select="$title-key"/>
+							</fo:block>
 						</xsl:if>
 					</xsl:when>  <!-- END: definition list in a figure -->
 				</xsl:choose>
@@ -5580,12 +5242,10 @@
 								<xsl:if test="$isGenerateTableIF = 'true'">
 									<xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
 								</xsl:if>
 								<xsl:choose>
 									<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
 									<xsl:when test="normalize-space($key_iso) = 'true'">
 										<xsl:attribute name="font-size">10pt</xsl:attribute>
 									</xsl:when>
 								</xsl:choose>
@@ -5690,17 +5350,15 @@
 											<xsl:call-template name="getMaxLength_dt"/>
 										</xsl:variable>
-										<xsl:variable name="isContainsKeepTogetherTag_">
-											false
+										<xsl:variable name="isContainsKeepTogetherTag_">false
 										</xsl:variable>
 										<xsl:variable name="isContainsKeepTogetherTag" select="normalize-space($isContainsKeepTogetherTag_)"/>
 										<!-- isContainsExpressReference=<xsl:value-of select="$isContainsExpressReference"/> -->
-												<xsl:call-template name="setColumnWidth_dl">
-													<xsl:with-param name="colwidths" select="$colwidths"/>
-													<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
-													<xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
-												</xsl:call-template>
+										<xsl:call-template name="setColumnWidth_dl">
+											<xsl:with-param name="colwidths" select="$colwidths"/>
+											<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+											<xsl:with-param name="isContainsKeepTogetherTag" select="$isContainsKeepTogetherTag"/>
+										</xsl:call-template>
 										<fo:table-body>
@@ -5751,24 +5409,19 @@
 	</xsl:template>
 	<xsl:template name="refine_dl_formula_where_style">
 	</xsl:template> <!-- refine_dl_formula_where_style -->
 	<xsl:template name="refine_figure_key_style">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-			<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:template> <!-- refine_figure_key_style -->
 	<xsl:template name="refine_multicomponent_style">
 		<xsl:variable name="parent" select="local-name(..)"/>
 	</xsl:template> <!-- refine_multicomponent_style -->
 	<xsl:template name="refine_multicomponent_block_style">
 		<xsl:variable name="parent" select="local-name(..)"/>
 	</xsl:template> <!-- refine_multicomponent_block_style -->
 	<!-- ignore 'p' with 'where' in formula, before 'dl' -->
@@ -5955,14 +5608,11 @@
 				<xsl:attribute name="id">
 					<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
 				</xsl:attribute>
-						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
-							<xsl:with-param name="process">true</xsl:with-param>
-						</xsl:apply-templates>
+				<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
 			</td>
 		</tr>
 	</xsl:template>
 	<!-- Definition's term -->
@@ -5971,7 +5621,6 @@
 		<xsl:param name="split_keep-within-line"/>
 		<fo:table-row xsl:use-attribute-sets="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"/>
@@ -5993,7 +5642,6 @@
 				<!-- border is mandatory, to calculate real width -->
 				<xsl:attribute name="border">0.1pt solid black</xsl:attribute>
 				<xsl:attribute name="text-align">left</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="refine_dt-cell-style"/>
@@ -6003,9 +5651,7 @@
 				<xsl:choose>
 					<xsl:when test="$isGenerateTableIF = 'true'">
-							<xsl:copy-of select="@id"/>
+					<xsl:copy-of select="@id"/>
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:copy-of select="@id"/>
@@ -6042,9 +5688,7 @@
 			<fo:block role="SKIP">
 				<xsl:if test="$isGenerateTableIF = 'true'">
-							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+					<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
 				</xsl:if>
 				<xsl:choose>
@@ -6192,7 +5836,6 @@
 	</xsl:template>
 	<xsl:template name="refine_italic_style">
 	</xsl:template>
 	<xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
@@ -6208,12 +5851,10 @@
 	</xsl:template>
 	<xsl:template name="refine_strong_style">
-			<xsl:if test="not(parent::*[local-name() = 'termsource'])">
-				<xsl:attribute name="font-weight">normal</xsl:attribute>
-				<xsl:attribute name="color">black</xsl:attribute>
-			</xsl:if>
+		<xsl:if test="not(parent::*[local-name() = '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>
@@ -6238,15 +5879,11 @@
 	<xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
-			<xsl:variable name="_font-size">
-				 <!-- inherit -->
-					<xsl:choose>
-						<xsl:when test="ancestor::*[local-name() = 'table']">inherit</xsl:when>
-						<xsl:otherwise>95%</xsl:otherwise> <!-- 110% -->
-					</xsl:choose>
+			<xsl:variable name="_font-size"> <!-- inherit -->
+				<xsl:choose>
+					<xsl:when test="ancestor::*[local-name() = '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 != ''">
@@ -6462,8 +6099,7 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="ratio_">
-			0.75
+		<xsl:variable name="ratio_">0.75
 		</xsl:variable>
 		<xsl:variable name="ratio" select="number(normalize-space($ratio_))"/>
 		<fo:inline font-size="{$ratio * 100}%" role="SKIP">
@@ -6553,7 +6189,7 @@
 		<xsl:variable name="quot">"</xsl:variable>
 		<xsl:variable name="styles_">
-			<xsl:for-each select="xalan:nodeset($styles__)/item">
+			<xsl:for-each select="xalan:nodeset($styles__)/mn:item">
 				<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
 				<xsl:variable name="value_" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
 				<xsl:variable name="value">
@@ -6565,7 +6201,7 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
-				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color'">
+				<xsl:if test="$key = 'font-family' or $key = 'font-size' or $key = 'color' or $key = 'baseline-shift'">
 					<style name="{$key}"><xsl:value-of select="$value"/></style>
 				</xsl:if>
 				<xsl:if test="$key = 'text-indent'">
@@ -6579,7 +6215,6 @@
 				<fo:inline>
 					<xsl:for-each select="$styles/style">
 						<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
 					</xsl:for-each>
 					<xsl:apply-templates/>
 				</fo:inline>
@@ -7566,10 +7201,9 @@
 			<xsl:variable name="mathml_content">
 				<xsl:apply-templates select="." mode="mathml_actual_text"/>
 			</xsl:variable>
-					<xsl:call-template name="mathml_instream_object">
-						<xsl:with-param name="mathml_content" select="$mathml_content"/>
-					</xsl:call-template>
+			<xsl:call-template name="mathml_instream_object">
+				<xsl:with-param name="mathml_content" select="$mathml_content"/>
+			</xsl:call-template>
 		</fo:inline>
 	</xsl:template>
@@ -7603,7 +7237,6 @@
 	<xsl:template name="getMathml_asciimath_text">
 		<xsl:variable name="asciimath" select="../*[local-name() = 'asciimath']"/>
 		<xsl:variable name="latexmath">
 		</xsl:variable>
 		<xsl:variable name="asciimath_text_following">
 			<xsl:choose>
@@ -7676,7 +7309,6 @@
 	</xsl:template>
 	<xsl:template name="refine_mathml_insteam_object_style">
 	</xsl:template> <!-- refine_mathml_insteam_object_style -->
 	<xsl:template match="mathml:*" mode="mathml_actual_text">
@@ -8074,7 +7706,6 @@
 		<xsl:variable name="annotation-id" select="@id"/>
 		<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
 		<fo:block id="{$annotation-id}" white-space="nowrap">
 			<fo:inline>
 				<xsl:apply-templates>
 					<xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -8103,7 +7734,6 @@
 					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 					</xsl:if>
 					<xsl:if test="parent::*[local-name() = 'add']">
 						<xsl:call-template name="append_add-style"/>
 					</xsl:if>
@@ -8114,8 +7744,7 @@
 	</xsl:template>
 	<!-- command between two xref points to non-standard bibitem -->
-	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]">
-		<xsl:value-of select="."/>
+	<xsl:template match="text()[. = ','][preceding-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']] and    following-sibling::node()[1][local-name() = 'sup'][*[local-name() = 'xref'][@type = 'footnote']]]"><xsl:value-of select="."/>
 	</xsl:template>
 	<!-- ====== -->
@@ -8130,7 +7759,6 @@
 						<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:call-template name="setNamedDestination"/>
@@ -8220,53 +7848,49 @@
 	<xsl:template match="*[local-name() = 'note']" name="note">
-				<xsl:call-template name="setNamedDestination"/>
-				<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
-					<xsl:call-template name="setBlockSpanAll"/>
-					<xsl:call-template name="refine_note-style"/>
+		<xsl:call-template name="setNamedDestination"/>
-					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
-								<fo:block>
+			<xsl:call-template name="setBlockSpanAll"/>
-									<xsl:call-template name="refine_note_block_style"/>
+			<xsl:call-template name="refine_note-style"/>
-									<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
+			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+						<fo:block>
-										<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
+							<xsl:call-template name="refine_note_block_style"/>
-										<xsl:call-template name="refine_note-name-style"/>
+							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
-										<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
-										<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
-										<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
-											<xsl:call-template name="append_add-style"/>
-										</xsl:if>
+								<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab"/>
-										<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
-										<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-											<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-												<xsl:with-param name="skip">false</xsl:with-param>
-											</xsl:apply-templates>
-										</xsl:if>
+								<xsl:call-template name="refine_note-name-style"/>
-										<xsl:apply-templates select="*[local-name() = 'name']"/>
+								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
+								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+									<xsl:call-template name="append_add-style"/>
+								</xsl:if>
-									</fo:inline>
+								<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
+								<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+									<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+										<xsl:with-param name="skip">false</xsl:with-param>
+									</xsl:apply-templates>
+								</xsl:if>
-									<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-								</fo:block>
+								<xsl:apply-templates select="*[local-name() = 'name']"/>
-					</fo:block-container>
-				</fo:block-container>
+							</fo:inline>
+							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+						</fo:block>
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template>
 	<xsl:template name="refine_note_block_style">
 	</xsl:template> <!-- refine_note_block_style -->
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
@@ -8319,7 +7943,6 @@
 					<xsl:value-of select="$sfx"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- https://github.com/metanorma/isodoc/issues/607 -->
 					<!-- <xsl:if test="$namespace = 'ieee'">
 						<xsl:text>—</xsl:text> em dash &#x2014;
@@ -8327,7 +7950,6 @@
 					<!-- <xsl:if test="$namespace = 'iho' or $namespace = 'gb' or $namespace = 'm3d' or $namespace = 'unece-rec' or $namespace = 'unece'  or $namespace = 'rsd'">
 						<xsl:text>:</xsl:text>
 					</xsl:if> -->
 					<!-- <xsl:if test="$namespace = 'itu' or $namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
 						<xsl:text> – </xsl:text> en dash &#x2013;
 					</xsl:if> -->
@@ -8348,7 +7970,6 @@
 					<xsl:value-of select="$sfx"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<!-- https://github.com/metanorma/isodoc/issues/607 -->
 					<!-- <xsl:if test="$namespace = 'ieee'">
 						<xsl:text>—</xsl:text> em dash &#x2014;
@@ -8404,7 +8025,6 @@
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
 			</xsl:if>
 			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
@@ -8439,16 +8059,13 @@
 			<xsl:call-template name="setTrackChangesStyles">
 				<xsl:with-param name="isAdded" select="$isAdded"/>
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
-			</xsl:call-template>
-			 <!-- show figure's name BEFORE image -->
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+			</xsl:call-template> <!-- show figure's name BEFORE image -->
+			<xsl:apply-templates select="*[local-name() = 'name']"/>
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="*[local-name() = 'note'][@type = 'units']"/>
-			<xsl:variable name="show_figure_key_in_block_container">
-				true
+			<xsl:variable name="show_figure_key_in_block_container">true
 			</xsl:variable>
 			<fo:block xsl:use-attribute-sets="figure-style" role="SKIP">
@@ -8465,7 +8082,6 @@
 			</xsl:if>
 		</fo:block-container>
 	</xsl:template>
 	<xsl:template name="showFigureKey">
@@ -8503,13 +8119,12 @@
 	<!-- SOURCE: ... -->
 	<!-- figure/source -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'source']" priority="2">
-				<xsl:call-template name="termsource"/>
+		<xsl:call-template name="termsource"/>
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'image']">
 		<xsl:param name="indent">0</xsl:param>
+		<xsl:param name="logo_width"/>
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
@@ -8531,9 +8146,18 @@
 					<!-- debug scale='<xsl:value-of select="$scale"/>', indent='<xsl:value-of select="$indent"/>' -->
-					<!-- <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle"/> -->
 					<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" vertical-align="middle">
+						<xsl:if test="parent::*[local-name() = 'logo']"> <!-- publisher's logo -->
+							<xsl:attribute name="width">100%</xsl:attribute>
+							<xsl:if test="normalize-space($logo_width) != ''">
+								<xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
+							</xsl:if>
+							<xsl:attribute name="content-height">100%</xsl:attribute>
+							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+							<xsl:attribute name="scaling">uniform</xsl:attribute>
+						</xsl:if>
 						<xsl:variable name="width">
 							<xsl:call-template name="setImageWidth"/>
 						</xsl:variable>
@@ -8611,8 +8235,7 @@
 												</xsl:call-template>
 											</xsl:variable>
-											<xsl:variable name="scaleRatio">
-												1
+											<xsl:variable name="scaleRatio">1
 											</xsl:variable>
 											<xsl:if test="number($scale) &lt; 100">
@@ -8723,18 +8346,14 @@
 		</xsl:variable>
 		<xsl:variable name="image_width_effective">
-					<xsl:value-of select="$width_effective - number($indent_left)"/>
+			<xsl:value-of select="$width_effective - number($indent_left)"/>
 		</xsl:variable>
 		<xsl:variable name="image_height_effective" select="$height_effective - number($indent_left)"/>
 		<!-- <xsl:message>width_effective=<xsl:value-of select="$width_effective"/></xsl:message>
 		<xsl:message>indent_left=<xsl:value-of select="$indent_left"/></xsl:message>
 		<xsl:message>image_width_effective=<xsl:value-of select="$image_width_effective"/> for <xsl:value-of select="ancestor::ogc:p[1]/@id"/></xsl:message> -->
 		<xsl:variable name="scale">
-					<xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+			<xsl:value-of select="java:org.metanorma.fop.utils.ImageUtils.getImageScale($img_src, $image_width_effective, $height_effective)"/>
 		</xsl:variable>
 		<xsl:value-of select="$scale"/>
 	</xsl:template>
@@ -8755,7 +8374,8 @@
 			</xsl:when>
 			<xsl:when test="not(starts-with(@src, 'data:'))">
 				<xsl:variable name="src_external"><xsl:call-template name="getImageSrcExternal"/></xsl:variable>
-				<xsl:value-of select="concat('url(file:///', $src_external, ')')"/>
+				<xsl:variable name="file_protocol"><xsl:if test="not(starts-with($src_external, 'http:')) and not(starts-with($src_external, 'https:')) and not(starts-with($src_external, 'www.'))">file:///</xsl:if></xsl:variable>
+				<xsl:value-of select="concat('url(', $file_protocol, $src_external, ')')"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="@src"/>
@@ -9051,8 +8671,8 @@
 				</xsl:call-template>
 			</xsl:variable>
 			<xsl:variable name="viewbox" select="xalan:nodeset($viewbox_)"/>
-			<xsl:variable name="width" select="normalize-space($viewbox//item[3])"/>
-			<xsl:variable name="height" select="normalize-space($viewbox//item[4])"/>
+			<xsl:variable name="width" select="normalize-space($viewbox//mn:item[3])"/>
+			<xsl:variable name="height" select="normalize-space($viewbox//mn:item[4])"/>
 			<xsl:variable name="parent_image_width" select="normalize-space(ancestor::*[1][local-name() = 'image']/@width)"/>
 			<xsl:variable name="parent_image_height" select="normalize-space(ancestor::*[1][local-name() = 'image']/@height)"/>
@@ -9124,8 +8744,8 @@
 		</xsl:variable>
 		<xsl:variable name="components" select="xalan:nodeset($components_)"/>
 		<xsl:variable name="att_name" select="local-name()"/>
-		<xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/item[1], ',', $components/item[2], ',', $components/item[3], ')')"/></xsl:attribute>
-		<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/item[4]"/></xsl:attribute>
+		<xsl:attribute name="{$att_name}"><xsl:value-of select="concat('rgb(', $components/mn:item[1], ',', $components/mn:item[2], ',', $components/mn:item[3], ')')"/></xsl:attribute>
+		<xsl:attribute name="{$att_name}-opacity"><xsl:value-of select="$components/mn:item[4]"/></xsl:attribute>
 	</xsl:template>
 	<!-- ============== -->
@@ -9198,13 +8818,13 @@
 				</xsl:call-template>
 			</xsl:variable>
 			<xsl:variable name="x_coords">
-				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
+				<xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 1]">
 					<xsl:sort select="." data-type="number"/>
 					<x><xsl:value-of select="."/></x>
 				</xsl:for-each>
 			</xsl:variable>
 			<xsl:variable name="y_coords">
-				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
+				<xsl:for-each select="xalan:nodeset($points)//mn:item[position() mod 2 = 0]">
 					<xsl:sort select="." data-type="number"/>
 					<y><xsl:value-of select="."/></y>
 				</xsl:for-each>
@@ -9409,11 +9029,11 @@
 				<xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
 			</xsl:variable>
-			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
-				<title>
+			<mn:item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
+				<mn:title>
 					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
-				</title>
-			</item>
+				</mn:title>
+			</mn:item>
 		</xsl:if>
 	</xsl:template>
@@ -9484,12 +9104,12 @@
 		<xsl:param name="contents"/>
 		<xsl:param name="contents_addon"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
-		<xsl:if test="$contents_nodes//item">
+		<xsl:if test="$contents_nodes//mn:item">
 			<fo:bookmark-tree>
 				<xsl:choose>
-					<xsl:when test="$contents_nodes/doc">
+					<xsl:when test="$contents_nodes/mn:doc">
 						<xsl:choose>
-							<xsl:when test="count($contents_nodes/doc) &gt; 1">
+							<xsl:when test="count($contents_nodes/mn:doc) &gt; 1">
 								<xsl:if test="$contents_nodes/collection">
 									<fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
@@ -9497,8 +9117,8 @@
 									</fo:bookmark>
 								</xsl:if>
-								<xsl:for-each select="$contents_nodes/doc">
-									<fo:bookmark internal-destination="{contents/item[@display = 'true'][1]/@id}" starting-state="hide">
+								<xsl:for-each select="$contents_nodes/mn:doc">
+									<fo:bookmark internal-destination="{contents/mn:item[@display = 'true'][1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
 											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
 										</xsl:if>
@@ -9532,14 +9152,14 @@
 											</xsl:choose>
 										</fo:bookmark-title>
-										<xsl:apply-templates select="contents/item" mode="bookmark"/>
+										<xsl:apply-templates select="contents/mn:item" mode="bookmark"/>
 										<xsl:call-template name="insertFigureBookmarks">
-											<xsl:with-param name="contents" select="contents"/>
+											<xsl:with-param name="contents" select="mn:contents"/>
 										</xsl:call-template>
 										<xsl:call-template name="insertTableBookmarks">
-											<xsl:with-param name="contents" select="contents"/>
+											<xsl:with-param name="contents" select="mn:contents"/>
 											<xsl:with-param name="lang" select="@lang"/>
 										</xsl:call-template>
@@ -9548,16 +9168,16 @@
 								</xsl:for-each>
 							</xsl:when>
 							<xsl:otherwise>
-								<xsl:for-each select="$contents_nodes/doc">
+								<xsl:for-each select="$contents_nodes/mn:doc">
-									<xsl:apply-templates select="contents/item" mode="bookmark"/>
+									<xsl:apply-templates select="mn:contents/mn:item" mode="bookmark"/>
 									<xsl:call-template name="insertFigureBookmarks">
-										<xsl:with-param name="contents" select="contents"/>
+										<xsl:with-param name="contents" select="mn:contents"/>
 									</xsl:call-template>
 									<xsl:call-template name="insertTableBookmarks">
-										<xsl:with-param name="contents" select="contents"/>
+										<xsl:with-param name="contents" select="mn:contents"/>
 										<xsl:with-param name="lang" select="@lang"/>
 									</xsl:call-template>
@@ -9566,14 +9186,14 @@
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
+						<xsl:apply-templates select="$contents_nodes/mn:contents/mn:item" mode="bookmark"/>
 						<xsl:call-template name="insertFigureBookmarks">
-							<xsl:with-param name="contents" select="$contents_nodes/contents"/>
+							<xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
 						</xsl:call-template>
 						<xsl:call-template name="insertTableBookmarks">
-							<xsl:with-param name="contents" select="$contents_nodes/contents"/>
+							<xsl:with-param name="contents" select="$contents_nodes/mn:contents"/>
 							<xsl:with-param name="lang" select="@lang"/>
 						</xsl:call-template>
@@ -9590,80 +9210,72 @@
 	<xsl:template name="insertFigureBookmarks">
 		<xsl:param name="contents"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
-		<xsl:if test="$contents_nodes/figure">
-			<fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
+		<xsl:if test="$contents_nodes/mn:figure">
+			<fo:bookmark internal-destination="{$contents_nodes/mn:figure[1]/@id}" starting-state="hide">
 				<fo:bookmark-title>Figures</fo:bookmark-title>
-				<xsl:for-each select="$contents_nodes/figure">
+				<xsl:for-each select="$contents_nodes/mn:figure">
 					<fo:bookmark internal-destination="{@id}">
 						<fo:bookmark-title>
-							<xsl:value-of select="normalize-space(title)"/>
+							<xsl:value-of select="normalize-space(mn:title)"/>
 						</fo:bookmark-title>
 					</fo:bookmark>
 				</xsl:for-each>
 			</fo:bookmark>
 		</xsl:if>
+		<xsl:if test="$contents_nodes//mn:figures/mn:figure">
+			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
-				<xsl:if test="$contents_nodes//figures/figure">
-					<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
-						<xsl:variable name="bookmark-title">
-									<xsl:value-of select="$title-list-figures"/>
-						</xsl:variable>
-						<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
-						<xsl:for-each select="$contents_nodes//figures/figure">
-							<fo:bookmark internal-destination="{@id}">
-								<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
-							</fo:bookmark>
-						</xsl:for-each>
+				<xsl:variable name="bookmark-title">
+							<xsl:value-of select="$title-list-figures"/>
+				</xsl:variable>
+				<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
+				<xsl:for-each select="$contents_nodes//mn:figures/mn:figure">
+					<fo:bookmark internal-destination="{@id}">
+						<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
 					</fo:bookmark>
-				</xsl:if>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
 	</xsl:template> <!-- insertFigureBookmarks -->
 	<xsl:template name="insertTableBookmarks">
 		<xsl:param name="contents"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
-		<xsl:if test="$contents_nodes/table">
-			<fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
+		<xsl:if test="$contents_nodes/mn:table">
+			<fo:bookmark internal-destination="{$contents_nodes/mn:table[1]/@id}" starting-state="hide">
 				<fo:bookmark-title>
 					<xsl:choose>
 						<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
 						<xsl:otherwise>Tables</xsl:otherwise>
 					</xsl:choose>
 				</fo:bookmark-title>
-				<xsl:for-each select="$contents_nodes/table">
+				<xsl:for-each select="$contents_nodes/mn:table">
 					<fo:bookmark internal-destination="{@id}">
 						<fo:bookmark-title>
-							<xsl:value-of select="normalize-space(title)"/>
+							<xsl:value-of select="normalize-space(mn:title)"/>
 						</fo:bookmark-title>
 					</fo:bookmark>
 				</xsl:for-each>
 			</fo:bookmark>
 		</xsl:if>
+		<xsl:if test="$contents_nodes//mn:tables/mn:table">
+			<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
-				<xsl:if test="$contents_nodes//tables/table">
-					<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
-						<xsl:variable name="bookmark-title">
-									<xsl:value-of select="$title-list-tables"/>
-						</xsl:variable>
+				<xsl:variable name="bookmark-title">
+							<xsl:value-of select="$title-list-tables"/>
+				</xsl:variable>
-						<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
+				<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
-						<xsl:for-each select="$contents_nodes//tables/table">
-							<fo:bookmark internal-destination="{@id}">
-								<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
-								<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
-							</fo:bookmark>
-						</xsl:for-each>
+				<xsl:for-each select="$contents_nodes//mn:tables/mn:table">
+					<fo:bookmark internal-destination="{@id}">
+						<!-- <fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title> -->
+						<fo:bookmark-title><xsl:apply-templates mode="bookmark_clean"/></fo:bookmark-title>
 					</fo:bookmark>
-				</xsl:if>
+				</xsl:for-each>
+			</fo:bookmark>
+		</xsl:if>
 	</xsl:template> <!-- insertTableBookmarks -->
 	<!-- End Bookmarks -->
@@ -9693,17 +9305,15 @@
 		<xsl:param name="title" select="''"/>
 		<xsl:choose>
 			<xsl:when test="$lang = 'en'">
 				</xsl:when>
 			<xsl:when test="$lang = 'fr'">
 			</xsl:when>
 			<xsl:when test="$lang = 'de'">Deutsche</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$lang"/> version</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
-	<xsl:template match="item" mode="bookmark">
+	<xsl:template match="mn:item" mode="bookmark">
 		<xsl:choose>
 			<xsl:when test="@id != ''">
 				<fo:bookmark internal-destination="{@id}" starting-state="hide">
@@ -9713,7 +9323,7 @@
 							<xsl:text> </xsl:text>
 						</xsl:if>
 						<xsl:variable name="title">
-							<xsl:for-each select="title/node()">
+							<xsl:for-each select="mn:title/node()">
 								<xsl:choose>
 									<xsl:when test="local-name() = 'add' and starts-with(., $ace_tag)"><!-- skip --></xsl:when>
 									<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
@@ -9731,7 +9341,7 @@
 		</xsl:choose>
 	</xsl:template>
-	<xsl:template match="title" mode="bookmark"/>
+	<xsl:template match="mn:title" mode="bookmark"/>
 	<xsl:template match="text()" mode="bookmark"/>
 	<!-- figure/name -->
@@ -9960,9 +9570,9 @@
 	<xsl:template match="text()" mode="contents_item">
 		<xsl:variable name="text">
 			<!-- to split by '_' and other chars -->
-			<text><xsl:call-template name="add-zero-spaces-java"/></text>
+			<mn:text><xsl:call-template name="add-zero-spaces-java"/></mn:text>
 		</xsl:variable>
-		<xsl:for-each select="xalan:nodeset($text)/text/text()">
+		<xsl:for-each select="xalan:nodeset($text)/mn:text/text()">
 			<xsl:call-template name="keep_together_standard_number"/>
 		</xsl:for-each>
 	</xsl:template>
@@ -9994,20 +9604,12 @@
 	</xsl:template>
 	<xsl:template name="get_sourcecode_attributes">
-		<xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
-			<xsl:variable name="_font-size">
-				<!-- inherit -->
-				<!-- <xsl:if test="$namespace = 'ieee'">
-					<xsl:if test="$current_template = 'standard'">8</xsl:if>
-				</xsl:if> -->
-					<xsl:choose>
-						<xsl:when test="ancestor::*[local-name() = 'table'][not(parent::*[local-name() = 'sourcecode'][@linenums = 'true'])]">inherit</xsl:when>
-						<xsl:otherwise>95%</xsl:otherwise><!-- 110% -->
-					</xsl:choose>
+		<xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
+			<xsl:variable name="_font-size"><!-- inherit -->
+				<xsl:choose>
+					<xsl:when test="ancestor::*[local-name() = 'table'][not(parent::*[local-name() = 'sourcecode'][@linenums = 'true'])]">inherit</xsl:when>
+					<xsl:otherwise>95%</xsl:otherwise><!-- 110% -->
+				</xsl:choose>
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -10063,11 +9665,9 @@
 								<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="*[local-name()='name']"/> <!-- show sourcecode's name BEFORE content -->
+						<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name BEFORE content -->
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
@@ -10265,25 +9865,6 @@
 		</xsl:choose>
 	</xsl:template>
-	<!-- insert 'char' between each character in the string -->
-	<xsl:template name="interspers">
-		<xsl:param name="str"/>
-		<xsl:param name="char" select="$zero_width_space"/>
-		<xsl:if test="$str != ''">
-			<xsl:value-of select="substring($str, 1, 1)"/>
-			<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
-			<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
-				<xsl:value-of select="$char"/>
-			</xsl:if>
-			<xsl:call-template name="interspers">
-				<xsl:with-param name="str" select="substring($str, 2)"/>
-				<xsl:with-param name="char" select="$char"/>
-			</xsl:call-template>
-		</xsl:if>
-	</xsl:template>
 	<xsl:template name="interspers-java">
 		<xsl:param name="str"/>
 		<xsl:param name="char" select="$zero_width_space"/>
@@ -10380,7 +9961,7 @@
 			</xsl:variable>
 			<xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
-			<xsl:for-each select="$classes/item">
+			<xsl:for-each select="$classes/*[local-name() = 'item']">
 				<xsl:variable name="class_name" select="."/>
 				<xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
 					<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
@@ -10463,12 +10044,9 @@
 	<xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-					<fo:block xsl:use-attribute-sets="permission-name-style">
-						<xsl:apply-templates/>
-					</fo:block>
+			<fo:block xsl:use-attribute-sets="permission-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
 		</xsl:if>
 	</xsl:template>
@@ -10497,12 +10075,9 @@
 	<xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-					<fo:block xsl:use-attribute-sets="requirement-name-style">
-						<xsl:apply-templates/>
-					</fo:block>
+			<fo:block xsl:use-attribute-sets="requirement-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
 		</xsl:if>
 	</xsl:template>
@@ -10541,11 +10116,9 @@
 	<xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
-					<fo:block xsl:use-attribute-sets="recommendation-name-style">
-						<xsl:apply-templates/>
-					</fo:block>
+			<fo:block xsl:use-attribute-sets="recommendation-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
 		</xsl:if>
 	</xsl:template>
@@ -10671,7 +10244,6 @@
 			<xsl:if test="parent::*[local-name()='thead'] or starts-with(*[local-name()='td' or local-name()='th'][1], 'Requirement ') or starts-with(*[local-name()='td' or local-name()='th'][1], 'Recommendation ')">
 				<xsl:attribute name="font-weight">bold</xsl:attribute>
 			</xsl:if>
 			<xsl:apply-templates mode="requirement"/>
@@ -10716,7 +10288,6 @@
 	<xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
 		<fo:block font-size="11pt">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -10756,7 +10327,6 @@
 	<xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
 		<xsl:variable name="element">inline
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($element, 'block')">
@@ -10788,110 +10358,105 @@
 			 text line 2
 	-->
 	<xsl:template match="*[local-name() = 'example']" name="example">
+		<xsl:call-template name="setNamedDestination"/>
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
-				<xsl:call-template name="setNamedDestination"/>
-				<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
+			<xsl:call-template name="setBlockSpanAll"/>
-					<xsl:call-template name="setBlockSpanAll"/>
+			<xsl:call-template name="refine_example-style"/>
-					<xsl:call-template name="refine_example-style"/>
+			<xsl:variable name="fo_element">
+				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>inline
+			</xsl:variable>
-					<xsl:variable name="fo_element">
-						<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
-						inline
-					</xsl:variable>
+			<fo:block-container margin-left="0mm" role="SKIP">
-					<fo:block-container margin-left="0mm" role="SKIP">
+				<xsl:choose>
-						<xsl:choose>
+					<xsl:when test="contains(normalize-space($fo_element), 'block')">
-							<xsl:when test="contains(normalize-space($fo_element), 'block')">
+						<!-- display name 'EXAMPLE' in a separate block  -->
+						<fo:block>
+							<xsl:apply-templates select="*[local-name()='name']">
+								<xsl:with-param name="fo_element" select="$fo_element"/>
+							</xsl:apply-templates>
+						</fo:block>
-								<!-- display name 'EXAMPLE' in a separate block  -->
-								<fo:block>
-									<xsl:apply-templates select="*[local-name()='name']">
+						<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+							<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+								<xsl:variable name="example_body">
+									<xsl:apply-templates select="node()[not(local-name() = 'name')]">
 										<xsl:with-param name="fo_element" select="$fo_element"/>
 									</xsl:apply-templates>
-								</fo:block>
-								<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
-									<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-										<xsl:variable name="example_body">
-											<xsl:apply-templates select="node()[not(local-name() = 'name')]">
-												<xsl:with-param name="fo_element" select="$fo_element"/>
-											</xsl:apply-templates>
-										</xsl:variable>
-										<xsl:choose>
-											<xsl:when test="xalan:nodeset($example_body)/*">
-												<xsl:copy-of select="$example_body"/>
-											</xsl:when>
-											<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
-										</xsl:choose>
-									</fo:block-container>
-								</fo:block-container>
-							</xsl:when> <!-- end block -->
-							<xsl:when test="contains(normalize-space($fo_element), 'list')">
-								<xsl:variable name="provisional_distance_between_starts_">
-									7
 								</xsl:variable>
-								<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
-								<xsl:variable name="indent_">
-									0
-								</xsl:variable>
-								<xsl:variable name="indent" select="normalize-space($indent_)"/>
+								<xsl:choose>
+									<xsl:when test="xalan:nodeset($example_body)/*">
+										<xsl:copy-of select="$example_body"/>
+									</xsl:when>
+									<xsl:otherwise><fo:block/><!-- prevent empty block-container --></xsl:otherwise>
+								</xsl:choose>
+							</fo:block-container>
+						</fo:block-container>
+					</xsl:when> <!-- end block -->
-								<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
-									<fo:list-item>
-										<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
-											<fo:block>
-												<xsl:apply-templates select="*[local-name()='name']">
-													<xsl:with-param name="fo_element">block</xsl:with-param>
-												</xsl:apply-templates>
-											</fo:block>
-										</fo:list-item-label>
-										<fo:list-item-body start-indent="body-start()">
-											<fo:block>
-												<xsl:apply-templates select="node()[not(local-name() = 'name')]">
-													<xsl:with-param name="fo_element" select="$fo_element"/>
-												</xsl:apply-templates>
-											</fo:block>
-										</fo:list-item-body>
-									</fo:list-item>
-								</fo:list-block>
-							</xsl:when> <!-- end list -->
+					<xsl:when test="contains(normalize-space($fo_element), 'list')">
-							<xsl:otherwise> <!-- inline -->
+						<xsl:variable name="provisional_distance_between_starts_">7
+						</xsl:variable>
+						<xsl:variable name="provisional_distance_between_starts" select="normalize-space($provisional_distance_between_starts_)"/>
+						<xsl:variable name="indent_">0
+						</xsl:variable>
+						<xsl:variable name="indent" select="normalize-space($indent_)"/>
-								<!-- display 'EXAMPLE' and first element in the same line -->
-								<fo:block>
-									<xsl:apply-templates select="*[local-name()='name']">
-										<xsl:with-param name="fo_element" select="$fo_element"/>
-									</xsl:apply-templates>
-									<fo:inline>
-										<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
+						<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
+							<fo:list-item>
+								<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
+									<fo:block>
+										<xsl:apply-templates select="*[local-name()='name']">
+											<xsl:with-param name="fo_element">block</xsl:with-param>
+										</xsl:apply-templates>
+									</fo:block>
+								</fo:list-item-label>
+								<fo:list-item-body start-indent="body-start()">
+									<fo:block>
+										<xsl:apply-templates select="node()[not(local-name() = 'name')]">
 											<xsl:with-param name="fo_element" select="$fo_element"/>
 										</xsl:apply-templates>
-									</fo:inline>
-								</fo:block>
+									</fo:block>
+								</fo:list-item-body>
+							</fo:list-item>
+						</fo:list-block>
+					</xsl:when> <!-- end list -->
-								<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
-									<!-- display further elements in blocks -->
-									<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
-										<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
-											<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
-												<xsl:with-param name="fo_element" select="'block'"/>
-											</xsl:apply-templates>
-										</fo:block-container>
-									</fo:block-container>
-								</xsl:if>
-							</xsl:otherwise> <!-- end inline -->
+					<xsl:otherwise> <!-- inline -->
-						</xsl:choose>
-					</fo:block-container>
-				</fo:block-container>
+						<!-- display 'EXAMPLE' and first element in the same line -->
+						<fo:block>
+							<xsl:apply-templates select="*[local-name()='name']">
+								<xsl:with-param name="fo_element" select="$fo_element"/>
+							</xsl:apply-templates>
+							<fo:inline>
+								<xsl:apply-templates select="*[not(local-name() = 'name')][1]">
+									<xsl:with-param name="fo_element" select="$fo_element"/>
+								</xsl:apply-templates>
+							</fo:inline>
+						</fo:block>
+						<xsl:if test="*[not(local-name() = 'name')][position() &gt; 1]">
+							<!-- display further elements in blocks -->
+							<fo:block-container xsl:use-attribute-sets="example-body-style" role="SKIP">
+								<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+									<xsl:apply-templates select="*[not(local-name() = 'name')][position() &gt; 1]">
+										<xsl:with-param name="fo_element" select="'block'"/>
+									</xsl:apply-templates>
+								</fo:block-container>
+							</fo:block-container>
+						</xsl:if>
+					</xsl:otherwise> <!-- end inline -->
+				</xsl:choose>
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template>
 	<!-- example/name -->
@@ -10906,7 +10471,6 @@
 			</xsl:when>
 			<xsl:when test="contains(normalize-space($fo_element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -10923,7 +10487,6 @@
 	<!-- table/example/name, table/tfoot//example/name -->
 	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name'] |  *[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'example']/*[local-name() = 'name']">
 		<fo:inline xsl:use-attribute-sets="example-name-style">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -10933,12 +10496,10 @@
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
-				<xsl:choose>
-					<xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
-					<xsl:otherwise>block</xsl:otherwise>
-				</xsl:choose>
+			<xsl:choose>
+				<xsl:when test="$num = 1 and not(contains($fo_element, 'block'))">inline</xsl:when>
+				<xsl:otherwise>block</xsl:otherwise>
+			</xsl:choose>
 			<xsl:value-of select="$fo_element"/>
 		</xsl:variable>
 		<xsl:choose>
@@ -11056,7 +10617,7 @@
 			</xsl:call-template>
 		</xsl:variable>
-    <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
+		<xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text>—</xsl:text></xsl:if></xsl:when>
 			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:if test="normalize-space($text) != ''"><xsl:text> — </xsl:text></xsl:if></xsl:otherwise>
@@ -11093,7 +10654,6 @@
 					<xsl:attribute name="margin-left">5mm</xsl:attribute>
 				</xsl:if>
 			</xsl:if>
 			<fo:block-container margin-left="0mm" role="SKIP">
 				<fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
@@ -11176,7 +10736,6 @@
 						<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 						<xsl:attribute name="vertical-align">super</xsl:attribute>
 						<xsl:attribute name="font-size">80%</xsl:attribute>
 					</xsl:if>
 					<xsl:call-template name="refine_eref-style"/>
@@ -11225,7 +10784,6 @@
 	</xsl:template>
 	<xsl:template name="refine_basic_link_style">
 	</xsl:template> <!-- refine_basic_link_style -->
 	<!-- ====== -->
@@ -11241,11 +10799,7 @@
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:variable name="padding">
-			1.5
+		<xsl:variable name="padding">1.5
 		</xsl:variable>
 		<xsl:variable name="padding-right">
@@ -11256,7 +10810,6 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'">
 				<fo:inline role="SKIP"><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -11280,9 +10833,7 @@
 	<xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']/*[local-name() = 'tab']" priority="2"/>
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']/*[local-name() = 'tab']" mode="tab">
-			<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
+		<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 	</xsl:template>
 	<xsl:template name="insertNonBreakSpaces">
@@ -11300,8 +10851,7 @@
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
-		<xsl:variable name="font-size">
-			inherit
+		<xsl:variable name="font-size">inherit
 		</xsl:variable>
 		<xsl:variable name="levelTerm">
 			<xsl:call-template name="getLevelTermName"/>
@@ -11353,9 +10903,8 @@
 	</xsl:template>
 	<xsl:template name="setStyle_preferred">
-				<xsl:attribute name="font-weight">normal</xsl:attribute>
-				<xsl:attribute name="color">black</xsl:attribute>
+		<xsl:attribute name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="color">black</xsl:attribute>
 	</xsl:template>
@@ -11433,7 +10982,6 @@
 	<!-- main sections -->
 	<xsl:template match="/*/*[local-name() = 'sections']/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
@@ -11468,18 +11016,14 @@
 	</xsl:template>
 	<xsl:template name="sections_element_style">
-			<xsl:variable name="pos"><xsl:number count="ribose:sections/ribose:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!--  | ribose:sections/ribose:terms -->
-			<xsl:if test="$pos &gt;= 2">
-				<xsl:attribute name="space-before">18pt</xsl:attribute>
-			</xsl:if>
+		<xsl:variable name="pos"><xsl:number count="ribose:sections/ribose:clause[not(@type='scope') and not(@type='conformance')]"/></xsl:variable> <!--  | ribose:sections/ribose:terms -->
+		<xsl:if test="$pos &gt;= 2">
+			<xsl:attribute name="space-before">18pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- sections_element_style -->
 	<xsl:template match="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*" priority="2" name="preface_node"> <!-- /*/*[local-name() = 'preface']/* -->
-				<fo:block break-after="page"/>
+		<fo:block break-after="page"/>
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
@@ -11528,7 +11072,6 @@
 	</xsl:template>
 	<xsl:template name="refine_clause_style">
 	</xsl:template> <!-- refine_clause_style -->
 	<xsl:template match="*[local-name() = 'definitions']">
@@ -11568,7 +11111,6 @@
 	</xsl:template>
 	<xsl:template name="refine_annex_style">
 	</xsl:template>
 	<!-- document text (not figures, or tables) footnotes -->
@@ -11672,17 +11214,15 @@
 	<!-- Lists processing -->
 	<!-- ===================================== -->
 	<xsl:variable name="ul_labels_">
-				<label level="1" font-size="75%">o</label> <!-- white circle -->
-				<label level="2">—</label> <!-- em dash -->
-				<label level="3" font-size="140%">•</label> <!-- bullet -->
+		<label level="1" font-size="75%">o</label> <!-- white circle -->
+		<label level="2">—</label> <!-- em dash -->
+		<label level="3" font-size="140%">•</label> <!-- bullet -->
 	</xsl:variable>
 	<xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
 	<xsl:template name="setULLabel">
-		<xsl:variable name="list_level__">
-			<xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+		<xsl:variable name="list_level__"><xsl:value-of select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
 		</xsl:variable>
 		<xsl:variable name="list_level_" select="number($list_level__)"/>
 		<xsl:variable name="list_level">
@@ -11739,28 +11279,22 @@
 				<xsl:variable name="label">
 					<xsl:variable name="style_prefix_">
-						<xsl:if test="$type = 'roman'">
-							 <!-- Example: (i) -->
+						<xsl:if test="$type = 'roman'"> <!-- Example: (i) -->
 						</xsl:if>
 						<xsl:if test="$type = 'alphabet'">
 						</xsl:if>
 					</xsl:variable>
 					<xsl:variable name="style_prefix" select="normalize-space($style_prefix_)"/>
 					<xsl:variable name="style_suffix_">
 						<xsl:choose>
-							<xsl:when test="$type = 'arabic'">
-								.
+							<xsl:when test="$type = 'arabic'">.
 							</xsl:when>
-							<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
-								.
+							<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">.
 							</xsl:when>
-							<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
-								.
+							<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">.
 							</xsl:when>
-							<xsl:when test="$type = 'roman'">
-								.
+							<xsl:when test="$type = 'roman'">.
 							</xsl:when>
 							<xsl:when test="$type = 'roman_upper'">.</xsl:when> <!-- Example: I. -->
 						</xsl:choose>
@@ -11777,8 +11311,7 @@
 						<xsl:value-of select="$style_suffix"/>
 					</xsl:if>
 				</xsl:variable>
-						<xsl:value-of select="normalize-space($label)"/>
+				<xsl:value-of select="normalize-space($label)"/>
 			</xsl:when>
 			<xsl:otherwise> <!-- for ordered lists 'ol' -->
@@ -11835,17 +11368,13 @@
 				<xsl:variable name="format">
 					<xsl:choose>
-						<xsl:when test="$type = 'arabic'">
-							1.
+						<xsl:when test="$type = 'arabic'">1.
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">
-							a.
+						<xsl:when test="$type = 'alphabet' or $type = 'alphabetic'">a.
 						</xsl:when>
-						<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">
-							A.
+						<xsl:when test="$type = 'alphabet_upper' or $type = 'alphabetic_upper'">A.
 						</xsl:when>
-						<xsl:when test="$type = 'roman'">
-							i.
+						<xsl:when test="$type = 'roman'">i.
 						</xsl:when>
 						<xsl:when test="$type = 'roman_upper'">I.</xsl:when>
 						<xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
@@ -11882,19 +11411,16 @@
 				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
-						<fo:block role="SKIP">
-							<xsl:apply-templates select="." mode="list">
-								<xsl:with-param name="indent" select="$indent"/>
-							</xsl:apply-templates>
-						</fo:block>
+				<fo:block role="SKIP">
+					<xsl:apply-templates select="." mode="list">
+						<xsl:with-param name="indent" select="$indent"/>
+					</xsl:apply-templates>
+				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template>
 	<xsl:template name="refine_list_container_style">
 	</xsl:template> <!-- refine_list_container_style -->
 	<xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
@@ -11958,7 +11484,6 @@
 	</xsl:template>
 	<xsl:template name="refine_list-style_provisional-distance-between-starts">
 	</xsl:template> <!-- refine_list-style_provisional-distance-between-starts -->
 	<xsl:template match="*[local-name() = 'ol' or local-name() = 'ul']/*[local-name() = 'name']">
@@ -12243,7 +11768,6 @@
 	<xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -12295,7 +11819,6 @@
 			<fo:table-column column-width="15mm"/>
 			<fo:table-body>
 				<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
 					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Date</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Type</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block role="SKIP">Change</fo:block></fo:table-cell>
@@ -12331,7 +11854,6 @@
 	<xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/>
 	<xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/>
 	</xsl:template>
 	<!-- don't display bibitem with @id starts with '_hidden', that was introduced for references integrity -->
 	<xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/>
@@ -12342,16 +11864,13 @@
 		<xsl:call-template name="setNamedDestination"/>
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	<!-- Bibliography (non-normative references) -->
 	<xsl:template match="*[local-name() = 'references']">
 		<xsl:if test="not(ancestor::*[local-name() = 'annex'])">
-					<fo:block break-after="page"/>
+			<fo:block break-after="page"/>
 		</xsl:if>
 		<!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
@@ -12367,9 +11886,7 @@
 		<fo:block xsl:use-attribute-sets="references-non-normative-style">
 			<xsl:apply-templates select="node()[not(local-name() = 'title' and @columns = 1)]"/>
 		</fo:block>
 	</xsl:template> <!-- references -->
 	<xsl:template match="*[local-name() = 'bibitem']">
@@ -12379,40 +11896,37 @@
 	<!-- Normative references -->
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = '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="processBibitem"/>
-				</fo:block>
+		<xsl:call-template name="setNamedDestination"/>
+		<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
+			<xsl:call-template name="processBibitem"/>
+		</fo:block>
 	</xsl:template> <!-- bibitem -->
 	<!-- Bibliography (non-normative references) -->
 	<xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
 		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
-				<xsl:call-template name="setNamedDestination"/>
-				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
-					<fo:list-item>
-						<fo:list-item-label end-indent="label-end()">
-							<fo:block>
-								<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
-									<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
-								</xsl:apply-templates>
-							</fo:block>
-						</fo:list-item-label>
-						<fo:list-item-body start-indent="body-start()">
-							<fo:block>
-								<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
-									<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
-								</xsl:apply-templates>
-								<xsl:apply-templates select="ribose:formattedref"/>
-							</fo:block>
-						</fo:list-item-body>
-					</fo:list-item>
-				</fo:list-block>
-				 <!-- rsd -->
+		<xsl:call-template name="setNamedDestination"/>
+		<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
+			<fo:list-item>
+				<fo:list-item-label end-indent="label-end()">
+					<fo:block>
+						<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
+							<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
+						</xsl:apply-templates>
+					</fo:block>
+				</fo:list-item-label>
+				<fo:list-item-body start-indent="body-start()">
+					<fo:block>
+						<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
+							<xsl:with-param name="biblio_tag_part">last</xsl:with-param>
+						</xsl:apply-templates>
+						<xsl:apply-templates select="ribose:formattedref"/>
+					</fo:block>
+				</fo:list-item-body>
+			</fo:list-item>
+		</fo:list-block>
+			<!-- rsd -->
 	</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
@@ -12422,7 +11936,6 @@
 			<xsl:otherwise>
 				<xsl:call-template name="setNamedDestination"/>
 				<fo:list-item id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-item-style">
 					<fo:list-item-label end-indent="label-end()">
 						<fo:block role="SKIP">
 							<fo:inline role="SKIP">
@@ -12449,18 +11962,16 @@
 	<xsl:template name="processBibitem">
 		<xsl:param name="biblio_tag_part">both</xsl:param>
+		<!-- start bibitem processing -->
+		<xsl:if test=".//*[local-name() = 'fn']">
+			<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
+		</xsl:if>
-				<!-- start bibitem processing -->
-				<xsl:if test=".//*[local-name() = 'fn']">
-					<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
-				</xsl:if>
-				<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
-					<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
-				</xsl:apply-templates>
-				<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
-				<!-- end bibitem processing -->
+		<xsl:apply-templates select="*[local-name() = 'biblio-tag']">
+			<xsl:with-param name="biblio_tag_part" select="$biblio_tag_part"/>
+		</xsl:apply-templates>
+		<xsl:apply-templates select="*[local-name() = 'formattedref']"/>
+		<!-- end bibitem processing -->
 	</xsl:template> <!-- processBibitem (bibitem) -->
 	<xsl:template match="*[local-name() = 'title']" mode="title">
@@ -12603,8 +12114,7 @@
 		<xsl:choose>
 			<xsl:when test="$pdftoclevels != ''"><xsl:value-of select="number($pdftoclevels)"/></xsl:when> <!-- if there is value in xml -->
 			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
-			<xsl:otherwise><!-- default value -->
-				2
+			<xsl:otherwise><!-- default value -->2
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
@@ -12812,27 +12322,21 @@
 	<!-- ================ -->
 	<!-- Admonition -->
 	<!-- ================ -->
-	<xsl:template match="*[local-name() = 'admonition']">
-		 <!-- text in the box -->
-				<xsl:call-template name="setNamedDestination"/>
-				<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
-					<xsl:call-template name="setBlockSpanAll"/>
-							<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
-										<fo:block xsl:use-attribute-sets="admonition-name-style">
-											<xsl:call-template name="displayAdmonitionName"/>
-										</fo:block>
-										<fo:block xsl:use-attribute-sets="admonition-p-style">
-											<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-										</fo:block>
-							</fo:block-container>
+	<xsl:template match="*[local-name() = 'admonition']"> <!-- text in the box -->
+		<xsl:call-template name="setNamedDestination"/>
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="admonition-style">
-				</fo:block-container>
+			<xsl:call-template name="setBlockSpanAll"/>
+					<fo:block-container xsl:use-attribute-sets="admonition-container-style" role="SKIP">
+								<fo:block xsl:use-attribute-sets="admonition-name-style">
+									<xsl:call-template name="displayAdmonitionName"/>
+								</fo:block>
+								<fo:block xsl:use-attribute-sets="admonition-p-style">
+									<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+								</fo:block>
+					</fo:block-container>
+		</fo:block-container>
 	</xsl:template>
 	<xsl:template name="displayAdmonitionName">
@@ -12880,12 +12384,10 @@
 	</xsl:template> -->
 	<xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
+		<fo:block xsl:use-attribute-sets="admonition-p-style">
-				<fo:block xsl:use-attribute-sets="admonition-p-style">
-					<xsl:apply-templates/>
-				</fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
 	<!-- ================ -->
@@ -12921,11 +12423,9 @@
 		<!-- STEP2: add 'fn' after 'eref' and 'origin', if referenced to bibitem with 'note' = Withdrawn.' or 'Cancelled and replaced...'  -->
 		<xsl:variable name="updated_xml_step2">
-					<xsl:if test="$table_if = 'false'">
-						<xsl:copy-of select="$updated_xml_step1"/>
-					</xsl:if>
+			<xsl:if test="$table_if = 'false'">
+				<xsl:copy-of select="$updated_xml_step1"/>
+			</xsl:if>
 		</xsl:variable>
 		<xsl:variable name="endTime2" select="java:getTime(java:java.util.Date.new())"/>
@@ -13400,7 +12900,6 @@
 	</xsl:template>
 	<xsl:template name="addNamedDestinationAttribute">
 	</xsl:template>
 	<xsl:template match="*[local-name() = 'fmt-name']"/>
@@ -13895,7 +13394,6 @@
 				<!-- enclose standard's number into tag 'keep-together_within-line' -->
 				<xsl:if test="not(ancestor::*[local-name() = 'table'])"><regex><xsl:value-of select="$regex_standard_reference"/></regex></xsl:if>
 				<!-- if EXPRESS reference -->
 				<!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
 				<regex><xsl:value-of select="$regex_solidus_units"/></regex>
 				<!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b  in table's cell ONLY -->
@@ -13949,8 +13447,7 @@
 		<xsl:variable name="text2">
 			<xsl:element name="text" namespace="{$namespace_full}">
-				<xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()">
-					<xsl:copy-of select="."/>
+				<xsl:for-each select="xalan:nodeset($text)/*[local-name() = 'text']/node()"><xsl:copy-of select="."/>
 				</xsl:for-each>
 			</xsl:element>
 		</xsl:variable>
@@ -14242,9 +13739,7 @@
 			</xsl:attribute>
 			<xsl:variable name="skip_footnote_body_" select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
 			<xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
-						<xsl:value-of select="$skip_footnote_body_"/>
+				<xsl:value-of select="$skip_footnote_body_"/>
 			</xsl:attribute>
 			<xsl:attribute name="ref_id">
 				<xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
@@ -14333,7 +13828,6 @@
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
 		<xsl:choose>
 			<xsl:when test="$edition_i18n != ''">
 				<!-- Example: <edition language="fr">deuxième édition</edition> -->
@@ -14562,8 +14056,7 @@
 					<dc:title>
 						<xsl:variable name="title">
 							<xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
-										<xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
+								<xsl:value-of select="*[local-name() = 'title'][@language = $lang]"/>
 							</xsl:for-each>
 						</xsl:variable>
@@ -14582,16 +14075,14 @@
 					</dc:title>
 					<xsl:variable name="dc_creator">
 						<xsl:for-each select="(//*[local-name() = 'metanorma'])[1]/*[local-name() = 'bibdata']">
-									<rdf:Seq>
-										<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
-											<rdf:li>
-												<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
-											</rdf:li>
-											<!-- <xsl:if test="position() != last()">; </xsl:if> -->
-										</xsl:for-each>
-									</rdf:Seq>
+							<rdf:Seq>
+								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role'][not(*[local-name() = 'description'])]/@type='author']">
+									<rdf:li>
+										<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+									</rdf:li>
+									<!-- <xsl:if test="position() != last()">; </xsl:if> -->
+								</xsl:for-each>
+							</rdf:Seq>
 						</xsl:for-each>
 					</xsl:variable>
 					<xsl:if test="normalize-space($dc_creator) != ''">
@@ -14602,9 +14093,7 @@
 					<xsl:variable name="dc_description">
 						<xsl:variable name="abstract">
-									<xsl:copy-of select="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
+							<xsl:copy-of select="//*[local-name() = 'metanorma']/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'fmt-title']) and not(ancestor::*[local-name() = 'title']) and not(ancestor::*[local-name() = 'fmt-xref-label'])]"/>
 						</xsl:variable>
 						<rdf:Alt>
 							<rdf:li xml:lang="x-default">
@@ -14669,7 +14158,9 @@
 			<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden = 'true'][*[local-name() = 'uri'][@type = 'attachment']]">
 				<xsl:variable name="attachment_path" select="*[local-name() = 'uri'][@type = 'attachment']"/>
 				<xsl:variable name="attachment_name" select="java:org.metanorma.fop.Util.getFilenameFromPath($attachment_path)"/>
-				<xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/>
+				<!-- <xsl:variable name="url" select="concat('url(file:///',$basepath, $attachment_path, ')')"/> -->
+				<!-- See https://github.com/metanorma/metanorma-iso/issues/1369 -->
+				<xsl:variable name="url" select="concat('url(file:///',$outputpdf_basepath, $attachment_path, ')')"/>
 				<xsl:variable name="description" select="normalize-space(*[local-name() = 'formattedref'])"/>
 				<!-- Todo: need update -->
 				<xsl:variable name="afrelationship" select="normalize-space(.//*[local-name() = 'classification'][@type = 'pdf-AFRelationship'])"/>
@@ -14834,7 +14325,7 @@
 		<xsl:param name="normalize-space" select="'true'"/>
 		<xsl:param name="keep_sep" select="'false'"/>
 		<xsl:if test="string-length($pText) &gt;0">
-			<item>
+			<xsl:element name="item" namespace="{$namespace_mn_xsl}">
 				<xsl:choose>
 					<xsl:when test="$normalize-space = 'true'">
 						<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
@@ -14843,8 +14334,8 @@
 						<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
 					</xsl:otherwise>
 				</xsl:choose>
-			</item>
-			<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
+			</xsl:element>
+			<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><xsl:element name="item" namespace="{$namespace_mn_xsl}"><xsl:value-of select="$sep"/></xsl:element></xsl:if>
 			<xsl:call-template name="split">
 				<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
 				<xsl:with-param name="sep" select="$sep"/>
@@ -14862,30 +14353,6 @@
 		<xsl:call-template name="getLang_fromCurrentNode"/><xsl:value-of select=".//*[local-name() = 'p'][1]/@id"/>
 	</xsl:template>
-	<xsl:template name="namespaceCheck">
-		<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
-		<xsl:variable name="XSLNS">
-				<xsl:value-of select="document('')//*/namespace::ribose"/>
-		</xsl:variable>
-		<!-- <xsl:if test="$documentNS != $XSLNS">
-			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
-		</xsl:if> -->
-	</xsl:template> <!-- namespaceCheck -->
-	<xsl:template name="getLanguage">
-		<xsl:param name="lang"/>
-		<xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
-		<xsl:choose>
-			<xsl:when test="$language = 'en'">English</xsl:when>
-			<xsl:when test="$language = 'fr'">French</xsl:when>
-			<xsl:when test="$language = 'de'">Deutsch</xsl:when>
-			<xsl:when test="$language = 'cn'">Chinese</xsl:when>
-			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
 	<xsl:template name="setId">
 		<xsl:param name="prefix"/>
 		<xsl:attribute name="id">