metanorma-ogc 2.8.3 → 2.8.5

data/lib/isodoc/ogc/ogc.user-guide.xsl

@@ -156,67 +156,70 @@
 	</xsl:variable>
 
 	<xsl:variable name="toc_recommendations_">
-		<xsl:for-each select="//mn:table[.//mn:p[@class = 'RecommendationTitle']]">
-			<xsl:variable name="table_id" select="@id"/>
-			<recommendation alt-text="{.//mn:p[@class = 'RecommendationTitle'][1]}">
-				<xsl:copy-of select="@id"/>
-				<xsl:variable name="title">
-					<xsl:apply-templates select=".//mn:p[@class = 'RecommendationTitle'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name/node()"/>
-					<xsl:if test=".//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/node()">
-						<xsl:text>: </xsl:text>
-						<xsl:variable name="recommendationLabel">
-							<tt><xsl:copy-of select=".//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name/node()"/></tt>
-						</xsl:variable>
-						<xsl:apply-templates select="xalan:nodeset($recommendationLabel)/node()"/>
-					</xsl:if>
-				</xsl:variable>
-				<xsl:variable name="bookmark">
-					<xsl:value-of select="normalize-space(.//mn:p[@class = 'RecommendationTitle'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name)"/>
-					<xsl:if test=".//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/node()">
-						<xsl:text>: </xsl:text>
-						<xsl:value-of select="normalize-space(.//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name)"/>
-					</xsl:if>
-				</xsl:variable>
-				<xsl:variable name="regex_str" select="'^([^0-9]+) (\d+).*'"/>
-				<xsl:variable name="class" select="java:replaceAll(java:java.lang.String.new($bookmark), $regex_str, '$1')"/>
-				<xsl:variable name="num" select="java:replaceAll(java:java.lang.String.new($bookmark), $regex_str, '$2')"/>
-				<xsl:variable name="class_lc" select="java:toLowerCase(java:java.lang.String.new($class))"/>
-				<!-- <xsl:attribute name="class_str">
-					<xsl:value-of select="$class"/>
-				</xsl:attribute> -->
-				<xsl:attribute name="class">
-					<xsl:choose>
-						<xsl:when test="$class_lc = 'requirements class'">1</xsl:when>
-						<xsl:when test="$class_lc = 'requirement'">2</xsl:when>
-						<xsl:when test="$class_lc = 'recommendation'">3</xsl:when>
-						<xsl:when test="$class_lc = 'permission'">4</xsl:when>
-						<xsl:when test="$class_lc = 'conformance class'">5</xsl:when>
-						<xsl:when test="$class_lc = 'abstract test'">6</xsl:when>
-						<xsl:when test="$class_lc = 'requirement test'">7</xsl:when>
-						<xsl:when test="$class_lc = 'recommendation test'">8</xsl:when>
-						<xsl:when test="$class_lc = 'permission test'">9</xsl:when>
-						<xsl:otherwise>9999</xsl:otherwise>
-					</xsl:choose>
-				</xsl:attribute>
-				<xsl:attribute name="num">
-					<xsl:value-of select="$num"/>
-				</xsl:attribute>
-				<title>
-					<xsl:copy-of select="$title"/>
-				</title>
-				<bookmark>
-					<xsl:value-of select="$bookmark"/>
-				</bookmark>
-			</recommendation>
-		</xsl:for-each>
+		<xsl:if test="//mn:metanorma/mn:metanorma-extension/mn:toc[@type='recommendation']/mn:title">
+			<xsl:for-each select="//mn:table[.//mn:p[@class = 'RecommendationTitle']]">
+				<xsl:variable name="table_id" select="@id"/>
+				<recommendation alt-text="{.//mn:p[@class = 'RecommendationTitle'][1]}">
+					<xsl:copy-of select="@id"/>
+					<xsl:variable name="title">
+						<xsl:apply-templates select=".//mn:p[@class = 'RecommendationTitle'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name/node()"/>
+						<xsl:if test=".//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/node()">
+							<xsl:text>: </xsl:text>
+							<xsl:variable name="recommendationLabel">
+								<tt><xsl:copy-of select=".//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name/node()"/></tt>
+							</xsl:variable>
+							<xsl:apply-templates select="xalan:nodeset($recommendationLabel)/node()"/>
+						</xsl:if>
+					</xsl:variable>
+					<xsl:variable name="bookmark">
+						<xsl:value-of select="normalize-space(.//mn:p[@class = 'RecommendationTitle'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name)"/>
+						<xsl:if test=".//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/node()">
+							<xsl:text>: </xsl:text>
+							<xsl:value-of select="normalize-space(.//mn:p[@class = 'RecommendationLabel'][ancestor::mn:table[1][@id= $table_id]]/mn:fmt-name)"/>
+						</xsl:if>
+					</xsl:variable>
+					<xsl:variable name="regex_str" select="'^([^0-9]+) (\d+).*'"/>
+					<xsl:variable name="class" select="java:replaceAll(java:java.lang.String.new($bookmark), $regex_str, '$1')"/>
+					<xsl:variable name="num" select="java:replaceAll(java:java.lang.String.new($bookmark), $regex_str, '$2')"/>
+					<xsl:variable name="class_lc" select="java:toLowerCase(java:java.lang.String.new($class))"/>
+					<!-- <xsl:attribute name="class_str">
+						<xsl:value-of select="$class"/>
+					</xsl:attribute> -->
+					<xsl:attribute name="class">
+						<xsl:choose>
+							<xsl:when test="$class_lc = 'requirements class'">1</xsl:when>
+							<xsl:when test="$class_lc = 'requirement'">2</xsl:when>
+							<xsl:when test="$class_lc = 'recommendation'">3</xsl:when>
+							<xsl:when test="$class_lc = 'permission'">4</xsl:when>
+							<xsl:when test="$class_lc = 'conformance class'">5</xsl:when>
+							<xsl:when test="$class_lc = 'abstract test'">6</xsl:when>
+							<xsl:when test="$class_lc = 'requirement test'">7</xsl:when>
+							<xsl:when test="$class_lc = 'recommendation test'">8</xsl:when>
+							<xsl:when test="$class_lc = 'permission test'">9</xsl:when>
+							<xsl:otherwise>9999</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<xsl:attribute name="num">
+						<xsl:value-of select="$num"/>
+					</xsl:attribute>
+					<title>
+						<xsl:copy-of select="$title"/>
+					</title>
+					<bookmark>
+						<xsl:value-of select="$bookmark"/>
+					</bookmark>
+				</recommendation>
+			</xsl:for-each>
+		</xsl:if>
 	</xsl:variable>
-	<xsl:variable name="toc_recommendations">
+	<xsl:variable name="toc_recommendations__">
 		<xsl:for-each select="xalan:nodeset($toc_recommendations_)/*">
 			<xsl:sort select="@class" data-type="number"/>
 			<xsl:sort select="@num" data-type="number"/>
 			<xsl:copy-of select="."/>
 		</xsl:for-each>
 	</xsl:variable>
+	<xsl:variable name="toc_recommendations" select="xalan:nodeset($toc_recommendations__)"/>
 
 	<xsl:variable name="contents_">
 		<mnx:contents>
@@ -226,9 +229,9 @@
 			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 			<xsl:apply-templates select="//mn:indexsect" mode="contents"/>
 
-			<xsl:call-template name="processTablesFigures_Contents">
-				<xsl:with-param name="always">true</xsl:with-param>
-			</xsl:call-template>
+			<xsl:call-template name="processTablesFigures_Contents"/>
+			<!-- 	<xsl:with-param name="always">true</xsl:with-param>
+			</xsl:call-template> -->
 		</mnx:contents>
 	</xsl:variable>
 	<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
@@ -298,7 +301,7 @@
 				<xsl:call-template name="addBookmarks">
 					<xsl:with-param name="contents" select="$contents"/>
 					<xsl:with-param name="contents_addon">
-						<xsl:if test="$contents//mnx:tables/mnx:table or $contents//mnx:figures/mnx:figure or //mn:table[.//mn:p[@class = 'RecommendationTitle']]">
+						<xsl:if test="$contents//mnx:tables/mnx:table or $contents//mnx:figures/mnx:figure or $toc_recommendations/*[normalize-space(@id) != '']">
 						<fo:bookmark internal-destination="empty_bookmark">
 							<fo:bookmark-title>—————</fo:bookmark-title>
 						</fo:bookmark>
@@ -336,12 +339,12 @@
 						</fo:bookmark>
 					</xsl:if>
 
-					<xsl:if test="//mn:table[.//mn:p[@class = 'RecommendationTitle']]">
+					<xsl:if test="$toc_recommendations/*[normalize-space(@id) != '']">
 						<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
 							<fo:bookmark-title>
 								<xsl:value-of select="$title-list-recommendations"/>
 							</fo:bookmark-title>
-							<xsl:for-each select="xalan:nodeset($toc_recommendations)/*">
+							<xsl:for-each select="$toc_recommendations/*[normalize-space(@id) != '']">
 								<fo:bookmark internal-destination="{@id}">
 									<fo:bookmark-title><xsl:value-of select="bookmark"/></fo:bookmark-title>
 								</fo:bookmark>
@@ -353,6 +356,8 @@
 
 				<xsl:call-template name="cover-page"/>
 
+				<xsl:call-template name="inner-cover-page"/>
+
 				<!-- Copyright, Content, Foreword, etc. pages -->
 				<fo:page-sequence master-reference="preface" initial-page-number="2" format="i" force-page-count="no-force">
 					<xsl:call-template name="insertFootnoteSeparator"/>
@@ -527,6 +532,8 @@
 
 			</xsl:for-each>
 
+			<xsl:call-template name="back-page"/>
+
 		</fo:root>
 
 	</xsl:template>
@@ -781,6 +788,12 @@
 		</fo:page-sequence>
 	</xsl:template> <!-- END: cover-page -->
 
+	<xsl:template name="inner-cover-page">
+	</xsl:template>
+
+	<xsl:template name="back-page">
+	</xsl:template>
+
 	<xsl:template name="processPrefaceAndMainSectionsOGC_items">
 		<xsl:variable name="updated_xml_step_move_pagebreak">
 
@@ -870,7 +883,8 @@
 
 			<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
 
-				<fo:block-container line-height="130%">
+				<fo:block-container xsl:use-attribute-sets="toc-style">
+					<xsl:call-template name="refine_toc-style"/>
 					<fo:block role="TOC">
 						<xsl:for-each select="$contents//mnx:item[@display = 'true' and normalize-space(@id) != '']">
 
@@ -966,12 +980,12 @@
 				</xsl:if>
 
 				<!-- List of Recommendations -->
-				<xsl:if test="//mn:table[.//mn:p[@class = 'RecommendationTitle']]">
+				<xsl:if test="$toc_recommendations/*[normalize-space(@id) != '']">
 					<xsl:call-template name="insertListOf_Title">
 						<xsl:with-param name="title" select="$title-list-recommendations"/>
 					</xsl:call-template>
 					<fo:block-container line-height="130%" role="TOC">
-						<xsl:for-each select="xalan:nodeset($toc_recommendations)/*[normalize-space(@id) != '']">
+						<xsl:for-each select="$toc_recommendations/*[normalize-space(@id) != '']">
 							<fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
 								<fo:basic-link internal-destination="{@id}">
 									<xsl:call-template name="setAltText">
@@ -1263,11 +1277,9 @@
 	</xsl:template>
 
 	<xsl:template match="mn:legal-statement//mn:fmt-title" priority="2">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
 		<!-- inline title -->
-		<fo:inline font-weight="bold" role="H{$level}">
+		<fo:inline xsl:use-attribute-sets="legal-statement-title-style">
+			<xsl:call-template name="refine_legal-statement-title-style"/>
 			<xsl:apply-templates/><xsl:text>: </xsl:text>
 		</fo:inline>
 	</xsl:template>
@@ -1279,7 +1291,8 @@
 	</xsl:template>
 
 	<xsl:template match="mn:legal-statement//mn:p" priority="2">
-		<fo:inline>
+		<fo:inline xsl:use-attribute-sets="legal-statement-p-style">
+			<xsl:call-template name="refine_legal-statement-p-style"/>
 			<xsl:apply-templates/>
 		</fo:inline>
 		<xsl:if test="following-sibling::mn:p">
@@ -1435,11 +1448,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element-name}">
-			<xsl:if test="@id">
-				<xsl:attribute name="id">
-					<xsl:value-of select="@id"/>
-				</xsl:attribute>
-			</xsl:if>
+			<xsl:copy-of select="@id"/>
 
 			<xsl:call-template name="setBlockAttributes"/>
 
@@ -1493,21 +1502,8 @@
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
 				<fo:list-block xsl:use-attribute-sets="list-style">
-					<xsl:if test="self::mn:ul">
-						<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="$ul_indent"/>mm</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="ancestor::mn:table">
-						<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
-					</xsl:if>
-					<xsl:if test="ancestor::mn:ul | ancestor::mn:ol">
-						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-						<xsl:if test="ancestor::mn:table[not(@class)]">
-							<xsl:attribute name="space-after">1mm</xsl:attribute>
-						</xsl:if>
-					</xsl:if>
-					<xsl:if test="following-sibling::*[1][self::mn:ul or self::mn:ol]">
-						<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-					</xsl:if>
+					<xsl:call-template name="refine_list-style"/>
+
 					<xsl:apply-templates>
 						<xsl:with-param name="indent" select="$indent + $ul_indent"/>
 					</xsl:apply-templates>
@@ -1529,10 +1525,8 @@
 	</xsl:template>
 
 	<xsl:template match="mn:term/mn:fmt-name" priority="2">
-		<xsl:variable name="levelTerm">
-			<xsl:call-template name="getLevelTermName"/>
-		</xsl:variable>
-		<fo:block space-before="36pt" margin-bottom="10pt" keep-with-next="always" role="H{$levelTerm}">
+		<fo:block xsl:use-attribute-sets="term-name-style">
+			<xsl:call-template name="refine_term-name-style"/>
 			<fo:list-block color="{$color_text_title}" keep-with-next="always" provisional-distance-between-starts="{string-length()*3.25}mm">
 				<fo:list-item>
 					<fo:list-item-label end-indent="label-end()">
@@ -1553,7 +1547,7 @@
 
 	<!-- first preferred displays on the same line as term/name -->
 	<xsl:template match="mn:fmt-preferred[not(preceding-sibling::mn:fmt-preferred)]" mode="term_name" priority="2">
-		<fo:inline font-size="18pt" padding-right="3mm"><xsl:call-template name="refine_preferred-term-style"/><xsl:apply-templates/></fo:inline>
+		<fo:inline xsl:use-attribute-sets="preferred-term-style"><xsl:call-template name="refine_preferred-term-style"/><xsl:apply-templates/></fo:inline>
 		<fo:inline padding-right="2mm"> </fo:inline>
 	</xsl:template>
 
@@ -2177,6 +2171,7 @@
 	<xsl:variable name="en_dash">–</xsl:variable>
 	<xsl:variable name="em_dash">—</xsl:variable>
 	<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
+	<xsl:variable name="nonbreak_space_em_dash"> —</xsl:variable>
 	<xsl:variable name="cr">&#13;</xsl:variable>
 	<xsl:variable name="lf">
 </xsl:variable>
@@ -2720,6 +2715,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -2734,10 +2730,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -3564,9 +3560,14 @@
 
 	<xsl:attribute-set name="legal-statement-title-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set> <!-- legal-statement-title-style -->
 
 	<xsl:template name="refine_legal-statement-title-style">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
 	</xsl:template>
 
 	<xsl:attribute-set name="legal-statement-p-style">
@@ -3593,7 +3594,6 @@
 	</xsl:attribute-set> <!-- feedback-statement-title-style -->
 
 	<xsl:template name="refine_feedback-statement-title-style">
-
 	</xsl:template>
 
 	<xsl:attribute-set name="feedback-statement-p-style">
@@ -3874,6 +3874,12 @@
 		</xsl:if>
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -5319,9 +5325,23 @@
 	<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 name="font-weight">normal</xsl:attribute>
+		<xsl:attribute name="space-before">36pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set> <!-- term-name-style -->
 
 	<xsl:template name="refine_term-name-style">
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<xsl:attribute name="role">H<xsl:value-of select="$levelTerm"/></xsl:attribute>
+	</xsl:template>
+
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
 	</xsl:template>
 
 	<xsl:attribute-set name="preferred-block-style">
@@ -5333,6 +5353,8 @@
 	<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 name="font-size">18pt</xsl:attribute>
+		<xsl:attribute name="padding-right">3mm</xsl:attribute>
 	</xsl:attribute-set> <!-- preferred-term-style -->
 
 	<xsl:template name="refine_preferred-term-style">
@@ -5958,6 +5980,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -6425,7 +6453,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -9487,16 +9515,23 @@
 	</xsl:attribute-set> <!-- quote-style -->
 
 	<xsl:template name="refine_quote-style">
-	</xsl:template>
+	</xsl:template> <!-- refine_quote-style -->
 
 	<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-set>
+	</xsl:attribute-set> <!-- quote-source-style -->
 
 	<xsl:template name="refine_quote-source-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="source-style">
+	</xsl:attribute-set> <!-- source-style -->
+
+	<xsl:template name="refine_source-style">
+
+	</xsl:template> <!-- refine_source-style -->
+
 	<!-- ====== -->
 	<!-- quote -->
 	<!-- source -->
@@ -9544,7 +9579,9 @@
 		</xsl:if>
 		<xsl:choose>
 			<xsl:when test="not(parent::quote)">
-				<fo:block>
+				<fo:block xsl:use-attribute-sets="source-style">
+					<xsl:call-template name="refine_source-style"/>
+
 					<xsl:call-template name="insert_basic_link">
 						<xsl:with-param name="element">
 							<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -9591,6 +9628,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="color"><xsl:value-of select="$color_text_title"/></xsl:attribute>
@@ -11244,6 +11287,22 @@
 	</xsl:attribute-set> <!-- list-style -->
 
 	<xsl:template name="refine_list-style">
+		<xsl:variable name="ul_indent">6</xsl:variable>
+		<xsl:if test="self::mn:ul">
+			<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="$ul_indent"/>mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:table">
+			<xsl:attribute name="provisional-distance-between-starts">5mm</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:ul | ancestor::mn:ol">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			<xsl:if test="ancestor::mn:table[not(@class)]">
+				<xsl:attribute name="space-after">1mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if>
+		<xsl:if test="following-sibling::*[1][self::mn:ul or self::mn:ol]">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+		</xsl:if>
 	</xsl:template> <!-- refine_list-style -->
 
 	<xsl:attribute-set name="list-name-style">
@@ -11642,7 +11701,7 @@
 
 	<xsl:template name="refine_fn-reference-style">
 		<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
-		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+		<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
 	</xsl:template> <!-- refine_fn-reference-style -->
 
 	<xsl:attribute-set name="fn-style">
@@ -11653,6 +11712,7 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="fn-num-style">
+		<xsl:attribute name="role">Reference</xsl:attribute>
 		<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>
@@ -11729,33 +11789,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
-
-				<xsl:variable name="fn_styles">
-					<xsl:choose>
-						<xsl:when test="ancestor::mn:bibitem">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
-								<xsl:call-template name="refine_bibitem-note-fn-style"/>
-							</fn_styles>
-						</xsl:when>
-						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style">
-								<xsl:call-template name="refine_fn-num-style"/>
-							</fn_styles>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
-					<xsl:copy-of select="."/>
-				</xsl:for-each>
+				<xsl:call-template name="refine_fn-num-style"/>
 
 				<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
 				<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
 					<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
 				</xsl:if> -->
 
-				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">,</xsl:if>
+				<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
 
 				<xsl:call-template name="insert_basic_link">
 					<xsl:with-param name="element">
@@ -12071,30 +12114,6 @@
 	<xsl:template name="refine_bibitem-non-normative-list-body-style">
 	</xsl:template>
 
-	<!-- footnote reference number for bibitem, in the text  -->
-	<xsl:attribute-set name="bibitem-note-fn-style">
-		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-		<xsl:attribute name="font-size">65%</xsl:attribute>
-		<xsl:attribute name="vertical-align">super</xsl:attribute>
-	</xsl:attribute-set> <!-- bibitem-note-fn-style -->
-
-	<xsl:template name="refine_bibitem-note-fn-style">
-	</xsl:template>
-
-	<!-- footnote number on the page bottom -->
-	<xsl:attribute-set name="bibitem-note-fn-number-style">
-		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
-		<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 -->
-	<xsl:attribute-set name="bibitem-note-fn-body-style">
-		<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-set> <!-- bibitem-note-fn-body-style -->
-
 	<xsl:attribute-set name="references-non-normative-style">
 		<xsl:attribute name="line-height">120%</xsl:attribute>
 	</xsl:attribute-set> <!-- references-non-normative-style -->
@@ -12175,7 +12194,7 @@
 
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
-					<fo:block role="SKIP">
+					<fo:block role="SKIP" id="__internal_layout__bibitem_{@id}_{generate-id()}">
 						<fo:inline role="SKIP">
 							<xsl:apply-templates select="mn:biblio-tag">
 								<xsl:with-param name="biblio_tag_part">first</xsl:with-param>
@@ -12828,6 +12847,7 @@
 	<!-- =================== -->
 
 	<xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">130%</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-style">
@@ -14423,10 +14443,28 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+		<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
+		<!-- <xsl:if test="$namespace = 'rsd'">
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel">
+					<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:if test="$level &gt;= 4">
+				<xsl:attribute name="margin-left">13mm</xsl:attribute>
+			</xsl:if>
+		</xsl:if> -->
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -14554,6 +14592,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>