metanorma-ogc 2.8.4 → 2.8.6

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

@@ -27,8 +27,8 @@
 
 	<xsl:variable name="layoutVersion_">
 		<xsl:choose>
-			<xsl:when test="$document_scheme = '' or $document_scheme = 'current'">2022</xsl:when>
-			<xsl:otherwise>default</xsl:otherwise>
+			<xsl:when test="$document_scheme = '' or $document_scheme = '2022'">2022</xsl:when>
+			<xsl:otherwise>2018</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable>
 	<xsl:variable name="layoutVersion" select="normalize-space($layoutVersion_)"/>
@@ -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">
 
@@ -967,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">
@@ -1624,6 +1637,17 @@
 	</xsl:template>
 
 	<xsl:template name="insertHeaderFooter">
+		<xsl:param name="color" select="$color_text_title"/>
+		<xsl:call-template name="insertHeader"/>
+		<xsl:call-template name="insertFooter">
+			<xsl:with-param name="color" select="$color"/>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template name="insertHeader">
+	</xsl:template>
+
+	<xsl:template name="insertFooter">
 		<xsl:param name="color" select="$color_text_title"/>
 		<fo:static-content flow-name="footer" role="artifact">
 			<fo:block-container font-size="8pt" color="{$color}" padding-top="6mm">
@@ -3581,7 +3605,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">
@@ -9503,16 +9526,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 -->
@@ -9560,7 +9590,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}">
@@ -11680,7 +11712,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">
@@ -11691,6 +11723,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>
@@ -11767,33 +11800,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<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>
-
-				<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">
@@ -12109,30 +12125,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 -->
@@ -14467,6 +14459,17 @@
 	</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 -->

data/lib/isodoc/ogc/ogc.white-paper.xsl

@@ -148,6 +148,8 @@
 
 				<xsl:call-template name="cover-page"/>
 
+				<xsl:call-template name="inner-cover-page"/>
+
 				<xsl:variable name="updated_xml">
 					<xsl:call-template name="updateXML"/>
 					<!-- <xsl:copy-of select="."/> -->
@@ -177,6 +179,8 @@
 									<xsl:call-template name="getPageSequenceOrientation"/>
 								</xsl:attribute>
 
+								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+
 								<xsl:call-template name="insertHeaderFooter"/>
 								<fo:flow flow-name="xsl-region-body">
 
@@ -214,6 +218,8 @@
 									<xsl:attribute name="initial-page-number">1</xsl:attribute>
 								</xsl:if>
 
+								<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+
 								<xsl:call-template name="insertHeaderFooter"/>
 
 								<fo:flow flow-name="xsl-region-body">
@@ -232,6 +238,8 @@
 					</xsl:for-each>
 				</xsl:for-each>
 
+				<xsl:call-template name="back-page"/>
+
 			</fo:root>
 
 	</xsl:template>
@@ -239,7 +247,11 @@
 	<xsl:template name="cover-page">
 		<!-- Cover Page -->
 		<fo:page-sequence master-reference="document" force-page-count="no-force">
+
+			<xsl:call-template name="insertFootnoteSeparatorCommon"/>
+
 			<xsl:call-template name="insertHeaderFooter"/>
+
 			<fo:flow flow-name="xsl-region-body">
 
 				<fo:block-container margin-left="-12mm" margin-right="-9mm">
@@ -314,7 +326,13 @@
 			</fo:flow>
 		</fo:page-sequence>
 		<!-- End Cover Page -->
-		</xsl:template> <!-- END: cover-page -->
+	</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">
@@ -707,15 +725,19 @@
 	</xsl:template>
 
 	<xsl:template name="insertHeaderFooter">
+		<xsl:call-template name="insertHeader"/>
+		<xsl:call-template name="insertFooter"/>
+	</xsl:template>
 
-		<xsl:call-template name="insertFootnoteSeparatorCommon"/>
-
+	<xsl:template name="insertHeader">
 		<fo:static-content flow-name="header" role="artifact">
 			<fo:block-container height="16.5mm" background-color="{$color}">
 				<fo:block> </fo:block>
 			</fo:block-container>
 		</fo:static-content>
+	</xsl:template>
 
+	<xsl:template name="insertFooter">
 		<fo:static-content flow-name="footer" role="artifact">
 			<fo:block-container height="100%" display-align="after">
 				<fo:block-container height="23.5mm" background-color="{$color}" color="rgb(231, 230, 230)" display-align="after">
@@ -743,7 +765,6 @@
 				</fo:block-container>
 			</fo:block-container>
 		</fo:static-content>
-
 	</xsl:template>
 
 	<xsl:template name="insertLogo">
@@ -2413,7 +2434,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">
@@ -8297,16 +8317,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 -->
@@ -8354,7 +8381,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}">
@@ -10455,7 +10484,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">
@@ -10466,6 +10495,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>
@@ -10541,33 +10571,16 @@
 		<xsl:variable name="ref_id" select="@target"/>
 
 		<xsl:variable name="footnote_inline">
-			<fo:inline role="Reference">
+			<fo:inline xsl:use-attribute-sets="fn-num-style">
 
-				<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>
-
-				<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">
@@ -10880,30 +10893,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 -->
@@ -13235,6 +13224,17 @@
 	</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 -->

data/lib/isodoc/ogc/presentation_sections.rb

@@ -139,7 +139,7 @@ module IsoDoc
       end
 
       def insert_submitting_orgs(docxml)
-        orgs = docxml.xpath(ns(submittingorgs_path))
+        orgs = docxml.xpath(submittingorgs_path)
           .each_with_object([]) { |org, m| m << org.text }
         orgs.empty? and return
         if a = submit_orgs_append_pt(docxml)