metanorma-bipm 2.6.1 → 2.6.3

data/lib/isodoc/bipm/bipm.guide.xsl

@@ -617,6 +617,8 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'clause']/*[local-name() = 'fmt-footnote-container']" priority="3" mode="update_xml_pres"/>
+
 	<!-- ================================= -->
 	<!-- Flattening xml for fit notes at page sides (margins) -->
 	<!-- ================================= -->
@@ -714,6 +716,8 @@
 			<xsl:if test="local-name() = 'title' and @depth = 3 and       ../bipm:clause/bipm:title/@depth = 4 and count(following-sibling::*[1][local-name() = 'note']) &gt; 0">
 				<!-- then move here footnotes from clause level 4 -->
 				<xsl:for-each select="../bipm:clause//bipm:fn[ancestor::bipm:quote or not(ancestor::bipm:table)]">
+					<!-- <debug><xsl:for-each select="ancestor::*"><xsl:value-of select="local-name()"/>@<xsl:value-of select="@id"/><xsl:text>/</xsl:text></xsl:for-each>
+					</debug> -->
 					<xsl:call-template name="fn_to_note_side"/>
 				</xsl:for-each>
 			</xsl:if>
@@ -798,41 +802,17 @@
 	<xsl:template match="bipm:fn" mode="fn_to_xref">
 		<xsl:element name="xref" namespace="https://www.metanorma.org/ns/standoc">
 
-			<xsl:attribute name="target">
-				<xsl:call-template name="fn_reference_to_xref_target"/>
-			</xsl:attribute>
-
-			<xsl:variable name="curr_clause_id" select="normalize-space(ancestor::bipm:clause[1]/@id)"/>
-			<xsl:variable name="curr_annex_id" select="normalize-space(ancestor::bipm:annex[1]/@id)"/>
-
-			<xsl:variable name="number">
-				<xsl:choose>
-					<xsl:when test="$curr_clause_id != ''">
-						<xsl:number count="bipm:fn[ancestor::bipm:clause[1]/@id = $curr_clause_id][ancestor::bipm:quote or not(ancestor::bipm:table)]" level="any"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="bipm:fn[ancestor::bipm:annex[1]/@id = $curr_annex_id]"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+			<xsl:copy-of select="@target"/>
 
 			<xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/standoc">
-				<xsl:value-of select="concat('(',$number,')')"/>
+				<!-- <xsl:value-of select="concat('(',$number,')')"/> -->
+			<!-- https://github.com/metanorma/isodoc/issues/658#issuecomment-2726450824 -->
+			<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()" mode="flatxml"/>
 			</xsl:element>
 
 		</xsl:element>
 	</xsl:template>
 
-	<xsl:template name="fn_reference_to_xref_target">
-		<xsl:variable name="lang" select="ancestor::bipm:metanorma/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-			<xsl:variable name="gen_id" select="generate-id()"/>
-			<xsl:variable name="curr_clause_id" select="ancestor::bipm:clause[1]/@id"/>
-			<xsl:variable name="number">
-				<xsl:number count="bipm:fn[ancestor::bipm:clause[1]/@id = $curr_clause_id][ancestor::bipm:quote or not(ancestor::bipm:table)]" level="any"/>
-			</xsl:variable>
-		<xsl:value-of select="concat($lang, '_footnote_', @reference, '_', $number, '_', $gen_id)"/>
-	</xsl:template>
-
 	<xsl:template match="bipm:preface/bipm:clause[not(@type = 'toc')][position() &gt; 1]" mode="flatxml">
 		<xsl:copy-of select="."/>
 	</xsl:template>
@@ -933,29 +913,20 @@
 		<xsl:element name="note_side" namespace="https://www.metanorma.org/ns/standoc">
 
 			<xsl:attribute name="id">
-				<xsl:call-template name="fn_reference_to_xref_target"/>
+				<xsl:value-of select="@target"/>
 			</xsl:attribute>
 
-			<xsl:variable name="curr_clause_id" select="normalize-space(ancestor::bipm:clause[1]/@id)"/>
-			<xsl:variable name="curr_annex_id" select="normalize-space(ancestor::bipm:annex[1]/@id)"/>
-
-			<xsl:variable name="number">
-				<xsl:choose>
-					<xsl:when test="$curr_clause_id != ''">
-						<xsl:number count="bipm:fn[ancestor::bipm:clause[1]/@id = $curr_clause_id][ancestor::bipm:quote or not(ancestor::bipm:table)]" level="any"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="bipm:fn[ancestor::bipm:annex[1]/@id = $curr_annex_id]"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
+			<xsl:variable name="curr_id" select="@target"/>
 
 			<xsl:element name="sup_fn" namespace="https://www.metanorma.org/ns/standoc">
-				<xsl:value-of select="concat('(',$number,')')"/>
+				<!-- <xsl:value-of select="concat('(',$number,')')"/> -->
+			<!-- https://github.com/metanorma/isodoc/issues/658#issuecomment-2726450824 -->
+			<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()" mode="flatxml"/>
 			</xsl:element>
 			<xsl:text> </xsl:text>
 
-			<xsl:apply-templates mode="flatxml"/>
+			<!-- <xsl:apply-templates mode="flatxml"/> -->
+			<xsl:apply-templates select="$footnotes/*[local-name() = 'fmt-fn-body'][@id = $curr_id]/node()" mode="flatxml"/>
 		</xsl:element>
 	</xsl:template>
 
@@ -984,6 +955,10 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fn']/*[local-name() = 'fmt-fn-label']/*[local-name() = 'sup']" priority="5" mode="flatxml">
+		<xsl:apply-templates mode="flatxml"/>
+	</xsl:template>
+
 	<!-- ================================= -->
 	<!-- END: Flattening xml for fit notes at page sides (margins) -->
 	<!-- ================================= -->
@@ -2800,6 +2775,9 @@
 		<xsl:apply-templates select="."/>
 	</xsl:template>
 
+	<!-- note_side/fmt-fn-label in text -->
+	<xsl:template match="*[local-name() = 'note_side']//*[local-name() = 'fmt-fn-label']"/>
+
 	<xsl:template match="*[local-name() = 'note_side']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
@@ -3140,12 +3118,28 @@
 		<xsl:value-of select="."/>
 	</xsl:template>
 
+	<!-- <xsl:template match="*[local-name() = 'sup_fn']/*[local-name() = 'sup']"> -->
 	<xsl:template match="*[local-name() = 'sup_fn']">
 		<fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-fn-body']//*[local-name() = 'sup_fn']">
+		<fo:inline xsl:use-attribute-sets="table-fmt-fn-label-style">
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
+	<!-- see <xsl:template match="*[local-name()='fn']"> -->
+	<xsl:template match="*[local-name() = 'fn']/*[local-name() = 'fmt-fn-label']/*[local-name() = 'sup']" priority="5">
+		<xsl:apply-templates/>
+	</xsl:template>
+	<!-- For: <fo:inline font-style="normal">(</fo:inline>a<fo:inline font-style="normal">)</fo:inline> -->
+	<xsl:template match="*[local-name() = 'fmt-fn-label']//*[local-name() = 'span'][@class = 'fmt-label-delim']" priority="5">
+		<fo:inline font-style="normal"><xsl:apply-templates/></fo:inline>
+	</xsl:template>
+
 	<!-- DEBUG -->
 	<!-- <xsl:template match="mathml:math" priority="10"/> -->
 
@@ -3391,13 +3385,27 @@
 
 	<xsl:template match="*[local-name() = 'xref']" mode="toc_table_width" priority="2">
 		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<!-- New format - one tab <xref target="cgpm9th1948r6">&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
 		<xsl:for-each select="*[local-name() = 'tab']">
 			<xsl:variable name="pos" select="position()"/>
 			<xsl:variable name="current_id" select="generate-id()"/>
+
+			<xsl:if test="$pos = 1">
+				<td>
+					<xsl:for-each select="preceding-sibling::node()">
+						<xsl:choose>
+							<xsl:when test="self::text()"><xsl:value-of select="translate(., ' ', ' ')"/></xsl:when>
+							<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+				</td>
+			</xsl:if>
+
 			<td>
 				<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
 					<xsl:choose>
-						<xsl:when test="$pos = 1 and self::text()"><xsl:value-of select="translate(., ' ', ' ')"/></xsl:when>
+						<!-- <xsl:when test="$pos = 1 and self::text()"><xsl:value-of select="translate(., ' ', '&#xa0;')"/></xsl:when> -->
+						<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
 						<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
 					</xsl:choose>
 				</xsl:for-each>
@@ -4834,15 +4842,19 @@
 	</xsl:template>
 
 	<xsl:attribute-set name="table-fn-number-style">
-		<xsl:attribute name="font-size">80%</xsl:attribute>
-		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+		<!-- <xsl:attribute name="padding-right">5mm</xsl:attribute> -->
 
 			<xsl:attribute name="font-style">italic</xsl:attribute>
-			<xsl:attribute name="padding-right">2.5mm</xsl:attribute>
+			<!-- <xsl:attribute name="padding-right">2.5mm</xsl:attribute> -->
 
 	</xsl:attribute-set> <!-- table-fn-number-style -->
 
-	<xsl:template name="refine_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>
 
@@ -4857,11 +4869,18 @@
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="figure-fn-number-style">
-		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+	</xsl:attribute-set> <!-- figure-fn-number-style -->
+
+	<xsl:attribute-set name="figure-fmt-fn-label-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
 		<xsl:attribute name="vertical-align">super</xsl:attribute>
 
-	</xsl:attribute-set>
+	</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>
@@ -6391,9 +6410,13 @@
 
 					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'][not(@type = 'units')] or ./*[local-name()='example'] or .//*[local-name()='fn'][local-name(..) != 'name'] or ./*[local-name()='source']"/>
 					<xsl:if test="$isNoteOrFnExist = 'true'">
-
-								<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
-
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'plateau'"></xsl:when>
+							<xsl:otherwise>
+								
+							</xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute><!-- set 0pt border, because there is a separete table below for footer -->
 					</xsl:if>
 
 					<xsl:choose>
@@ -6440,7 +6463,7 @@
 									<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 								</xsl:when>
 								<xsl:otherwise>
-									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'example') and not(local-name() = 'dl') and not(local-name() = 'source') and not(local-name() = 'p')          and not(local-name() = 'thead') and not(local-name() = 'tfoot') and not(local-name() = 'fmt-footnote-container')]"/> <!-- process all table' elements, except name, header, footer, note, source and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -6451,13 +6474,26 @@
 
 				<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>
 
-						<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
-							<xsl:call-template name="insertTableFooterInSeparateTable">
-								<xsl:with-param name="table_attributes" select="$table_attributes"/>
-								<xsl:with-param name="colwidths" select="$colwidths"/>
-								<xsl:with-param name="colgroup" select="$colgroup"/>
-							</xsl:call-template>
-						</xsl:for-each>
+				<!-- https://github.com/metanorma/metanorma-plateau/issues/171 -->
+
+				<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
+					<xsl:call-template name="insertTableFooterInSeparateTable">
+						<xsl:with-param name="table_attributes" select="$table_attributes"/>
+						<xsl:with-param name="colwidths" select="$colwidths"/>
+						<xsl:with-param name="colgroup" select="$colgroup"/>
+					</xsl:call-template>
+				</xsl:for-each>
+
+				<!-- https://github.com/metanorma/metanorma-plateau/issues/171
+				<xsl:if test="$namespace = 'plateau'">
+					<xsl:apply-templates select="*[not(local-name()='thead') and not(local-name()='tbody') and not(local-name()='tfoot') and not(local-name()='name')]" />
+					<xsl:for-each select="*[local-name()='tbody']"> - select context to tbody -
+						<xsl:variable name="table_fn_block">
+							<xsl:call-template name="table_fn_display" />
+						</xsl:variable>
+						<xsl:copy-of select="$table_fn_block"/>
+					</xsl:for-each>
+				</xsl:if> -->
 
 				<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
 					<fo:block keep-with-previous="always" line-height="0.1">
@@ -7265,6 +7301,8 @@
 			 <xsl:attribute name="min-height">5mm</xsl:attribute>
 			 </xsl:if>
 
+		<xsl:call-template name="setColors"/>
+
 	</xsl:template> <!-- setTableRowAttributes -->
 	<!-- ===================== -->
 	<!-- END Table's row processing -->
@@ -7316,6 +7354,7 @@
 			</xsl:attribute>
 		</xsl:if>
 		<xsl:call-template name="display-align"/>
+		<xsl:call-template name="setColors"/>
 	</xsl:template>
 
 	<xsl:template name="display-align">
@@ -7331,6 +7370,29 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setColors">
+		<xsl:variable name="styles__">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="concat(@style,';')"/>
+				<xsl:with-param name="sep" select="';'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="quot">"</xsl:variable>
+		<xsl:variable name="styles_">
+			<xsl:for-each select="xalan:nodeset($styles__)/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'">
+					<style name="{$key}"><xsl:value-of select="$value"/></style>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
+		<xsl:for-each select="$styles/style">
+			<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+		</xsl:for-each>
+	</xsl:template>
+
 	<!-- cell in table body, footer -->
 	<xsl:template match="*[local-name()='td']" name="td">
 		<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
@@ -7342,17 +7404,28 @@
 
 			<xsl:call-template name="refine_table-cell-style"/>
 
+			<xsl:call-template name="setTableCellAttributes"/>
+
 			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
 
-			<xsl:call-template name="setTableCellAttributes"/>
-
 			<xsl:if test="$isGenerateTableIF = 'true'">
 				<xsl:attribute name="border">1pt solid black</xsl:attribute> <!-- border is mandatory, to determine page width -->
 				<xsl:attribute name="text-align">left</xsl:attribute>
 			</xsl:if>
 
+			<xsl:if test="$isGenerateTableIF = 'false'">
+				<xsl:if test="@colspan and *[local-name() = 'note'][@type = 'units']">
+					<xsl:attribute name="text-align">right</xsl:attribute>
+					<xsl:attribute name="border">none</xsl:attribute>
+					<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
+					<xsl:attribute name="border-top">1pt solid white</xsl:attribute>
+					<xsl:attribute name="border-left">1pt solid white</xsl:attribute>
+					<xsl:attribute name="border-right">1pt solid white</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+
 			<fo:block role="SKIP">
 
 				<xsl:if test="$isGenerateTableIF = 'true'">
@@ -7380,7 +7453,8 @@
 		</fo:table-cell>
 	</xsl:template> <!-- td -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
+	<!-- 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">
 
 				<fo:block xsl:use-attribute-sets="table-note-style">
 					<xsl:copy-of select="@id"/>
@@ -7405,65 +7479,54 @@
 
 	</xsl:template> <!-- table/note -->
 
-	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name()='example']/*[local-name()='p']" priority="2">
+	<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">
 		<xsl:apply-templates/>
 	</xsl:template>
 
 	<!-- ===================== -->
 	<!-- Footnotes processing  -->
 	<!-- ===================== -->
+
+	<!-- document text (not figures, or tables) footnotes -->
+	<xsl:variable name="footnotes_">
+		<xsl:for-each select="//*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']"> <!-- commented *[local-name() = 'metanorma']/, because there are fn in figure or table name -->
+			<!-- <xsl:copy-of select="."/> -->
+			<xsl:variable name="update_xml_step1">
+				<xsl:apply-templates select="." mode="update_xml_step1"/>
+			</xsl:variable>
+			<xsl:apply-templates select="xalan:nodeset($update_xml_step1)" mode="update_xml_enclose_keep-together_within-line"/>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="footnotes" select="xalan:nodeset($footnotes_)"/>
+
 	<!--
 	<fn reference="1">
 			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
 		</fn>
 	-->
-	<!-- footnotes in text (title, bibliography, main body, table's, figure's names), not for tables, figures -->
+	<!-- footnotes in text (title, bibliography, main body), not for tables, figures and names --> <!-- table's, figure's names -->
+	<!-- fn in text -->
 	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" priority="2" name="fn">
 
-		<!-- list of footnotes to calculate actual footnotes number -->
+		<!-- list of unique footnotes -->
 		<xsl:variable name="p_fn_">
 			<xsl:call-template name="get_fn_list"/>
-			<!-- <xsl:choose>
-				<xsl:when test="$namespace = 'jis'">
-					<xsl:call-template name="get_fn_list_for_element"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="get_fn_list"/>
-				</xsl:otherwise>
-			</xsl:choose> -->
 		</xsl:variable>
 		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
 
 		<xsl:variable name="gen_id" select="generate-id(.)"/>
-		<xsl:variable name="lang" select="ancestor::*[local-name() = 'metanorma']/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
-		<xsl:variable name="reference_">
-			<xsl:value-of select="@reference"/>
-			<xsl:if test="normalize-space(@reference) = ''"><xsl:value-of select="$gen_id"/></xsl:if>
-		</xsl:variable>
-		<xsl:variable name="reference" select="normalize-space($reference_)"/>
+
 		<!-- fn sequence number in document -->
-		<xsl:variable name="current_fn_number">
-			<xsl:choose>
-				<xsl:when test="@current_fn_number"><xsl:value-of select="@current_fn_number"/></xsl:when> <!-- for BSI -->
-				<xsl:otherwise>
-					<xsl:value-of select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
+		<xsl:variable name="current_fn_number" select="@reference"/>
+
 		<xsl:variable name="current_fn_number_text">
 
 					<xsl:value-of select="$current_fn_number"/>
 
 		</xsl:variable>
 
-		<xsl:variable name="ref_id">
-			<xsl:choose>
-				<xsl:when test="normalize-space(@ref_id) != ''"><xsl:value-of select="@ref_id"/></xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="concat('footnote_', $lang, '_', $reference, '_', $current_fn_number)"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
+		<xsl:variable name="ref_id" select="@target"/>
+
 		<xsl:variable name="footnote_inline">
 			<fo:inline role="Reference">
 
@@ -7508,7 +7571,9 @@
 			<xsl:when test="normalize-space(@skip_footnote_body) = 'true'">
 				<xsl:copy-of select="$footnote_inline"/>
 			</xsl:when>
+			<!-- <xsl:when test="$footnotes//*[local-name() = 'fmt-fn-body'][@id = $ref_id] or normalize-space(@skip_footnote_body) = 'false'"> -->
 			<xsl:when test="$p_fn//fn[@gen_id = $gen_id] or normalize-space(@skip_footnote_body) = 'false'">
+
 				<fo:footnote xsl:use-attribute-sets="fn-style" role="SKIP">
 					<xsl:copy-of select="$footnote_inline"/>
 					<fo:footnote-body role="Note">
@@ -7525,7 +7590,10 @@
 									<xsl:value-of select="$current_fn_number_text"/>
 
 								</fo:inline>
-								<xsl:apply-templates/>
+								<!-- <xsl:apply-templates /> -->
+								<!-- <ref_id><xsl:value-of select="$ref_id"/></ref_id>
+								<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">
@@ -7579,81 +7647,138 @@
 		</xsl:choose>
 	</xsl:template>
 
-	<xsl:template name="get_fn_list_for_element">
-		<xsl:choose>
-			<xsl:when test="@current_fn_number"> <!-- footnote reference number calculated already -->
-				<fn gen_id="{generate-id(.)}">
-					<xsl:copy-of select="@*"/>
-					<xsl:copy-of select="node()"/>
-				</fn>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:for-each select="ancestor::*[local-name() = 'ul' or local-name() = 'ol'][1]">
-					<xsl:variable name="element_id" select="@id"/>
-					<xsl:for-each select=".//*[local-name() = 'fn'][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
-						<!-- copy unique fn -->
-						<fn gen_id="{generate-id(.)}">
-							<xsl:copy-of select="@*"/>
-							<xsl:copy-of select="node()"/>
-						</fn>
-					</xsl:for-each>
-				</xsl:for-each>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
 	<!-- ============================ -->
 	<!-- table's footnotes rendering -->
 	<!-- ============================ -->
-	<xsl:template name="table_fn_display">
-		<xsl:variable name="references">
 
+	<!-- table/fmt-footnote-container -->
+	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'fmt-footnote-container']"/>
+
+	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'tfoot']//*[local-name() = 'fmt-footnote-container']">
+		<xsl:for-each select=".">
+			<xsl:call-template name="table_fn_display"/>
+		</xsl:for-each>
+	</xsl:template>
+
+	<xsl:template name="table_fn_display">
+		<!-- <xsl:variable name="references">
+			<xsl:if test="$namespace = 'bsi'">
+				<xsl:for-each select="..//*[local-name()='fn'][local-name(..) = 'name']">
+					<xsl:call-template name="create_fn" />
+				</xsl:for-each>
+			</xsl:if>
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
-				<xsl:call-template name="create_fn"/>
+				<xsl:call-template name="create_fn" />
 			</xsl:for-each>
-		</xsl:variable>
-
-		<xsl:for-each select="xalan:nodeset($references)//fn">
+		</xsl:variable> -->
+		<!-- <xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
-			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
+			<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:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
-								<xsl:call-template name="refine_table-fn-number-style"/>
-
-									<fo:inline font-style="normal">(</fo:inline>
-
-								<xsl:value-of select="@reference"/>
-
-									<fo:inline font-style="normal">)</fo:inline>
 
-								<!-- commented https://github.com/metanorma/isodoc/issues/614 -->
-								<!-- <xsl:if test="$namespace = 'itu'">
-									<xsl:text>)</xsl:text>
-								</xsl:if> -->
+							<xsl:apply-templates select=".//*[local-name() = 'fmt-fn-label']">
+								<xsl:with-param name="process">true</xsl:with-param>
+							</xsl:apply-templates>
 
-							</fo:inline>
 							<fo:inline xsl:use-attribute-sets="table-fn-body-style">
-								<xsl:copy-of select="./node()"/>
+								<!-- <xsl:copy-of select="./node()"/> -->
+								<xsl:apply-templates/>
 							</fo:inline>
 
 						</fo:block>
 
-			</xsl:if>
+			<!-- </xsl:if> -->
 		</xsl:for-each>
 	</xsl:template> <!-- table_fn_display -->
 
+	<!-- fmt-fn-body/fmt-fn-label in text -->
+	<xsl:template match="*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']"/>
+
+	<!-- table//fmt-fn-body//fmt-fn-label -->
+	<xsl:template match="*[local-name() = 'table']//*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']"> <!-- *[local-name() = 'fmt-footnote-container']/ -->
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:inline xsl:use-attribute-sets="table-fn-number-style" role="SKIP">
+
+				<!-- tab is padding-right -->
+				<xsl:apply-templates select=".//*[local-name() = 'tab']">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
+
+				<!-- <xsl:if test="$namespace = 'bipm'">
+					<fo:inline font-style="normal">(</fo:inline>
+				</xsl:if> -->
+
+				<!-- <xsl:if test="$namespace = 'plateau'">
+					<xsl:text>※</xsl:text>
+				</xsl:if> -->
+
+				<!-- <xsl:value-of select="@reference"/> -->
+				<!-- <xsl:value-of select="normalize-space()"/> -->
+				<xsl:apply-templates/>
+
+				<!-- <xsl:if test="$namespace = 'bipm'">
+					<fo:inline font-style="normal">)</fo:inline>
+				</xsl:if> -->
+
+				<!-- commented https://github.com/metanorma/isodoc/issues/614 -->
+				<!-- <xsl:if test="$namespace = 'itu'">
+					<xsl:text>)</xsl:text>
+				</xsl:if> -->
+
+				<!-- <xsl:if test="$namespace = 'plateau'">
+					<xsl:text>：</xsl:text>
+				</xsl:if> -->
+
+			</fo:inline>
+		</xsl:if>
+	</xsl:template> <!--  fmt-fn-body//fmt-fn-label -->
+
+	<xsl:template match="*[local-name() = 'table']//*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']//*[local-name() = 'tab']" priority="5">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:attribute name="padding-right">5mm</xsl:attribute>
+
+				<xsl:attribute name="padding-right">2.5mm</xsl:attribute>
+
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'table']//*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']//*[local-name() = 'sup']" priority="5">
+		<fo:inline xsl:use-attribute-sets="table-fmt-fn-label-style" role="SKIP">
+			<xsl:call-template name="refine_table-fmt-fn-label-style"/>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
+
+	<!-- <xsl:template match="*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']//*[local-name() = 'tab']"/> -->
+	<!-- 
 	<xsl:template name="create_fn">
 		<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-			<xsl:if test="ancestor::*[local-name()='table'][1]/@id"> <!-- for footnotes in tables -->
+			<xsl:if test="ancestor::*[local-name()='table'][1]/@id">  - for footnotes in tables -
 				<xsl:attribute name="id">
 					<xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/>
 				</xsl:attribute>
 			</xsl:if>
-
-			<xsl:apply-templates/>
+			<xsl:if test="$namespace = 'itu'">
+				<xsl:if test="ancestor::*[local-name()='preface']">
+					<xsl:attribute name="preface">true</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+			<xsl:if test="$namespace = 'ogc' or $namespace = 'ogc-white-paper'">
+				<xsl:attribute name="id">
+					<xsl:value-of select="@reference"/>
+					<xsl:text>_</xsl:text>
+					<xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates />
 		</fn>
-	</xsl:template>
+	</xsl:template> -->
 
 	<!-- footnotes for table's name rendering -->
 	<xsl:template name="table_name_fn_display">
@@ -7672,123 +7797,171 @@
 	<!-- ============================ -->
 	<!-- figure's footnotes rendering -->
 	<!-- ============================ -->
-	<xsl:template name="fn_display_figure"> <!-- figure_fn_display -->
 
-		<!-- current figure id -->
-		<xsl:variable name="figure_id_">
-			<xsl:value-of select="@id"/>
-			<xsl:if test="not(@id)"><xsl:value-of select="generate-id()"/></xsl:if>
-		</xsl:variable>
-		<xsl:variable name="figure_id" select="normalize-space($figure_id_)"/>
+	<!-- figure/fmt-footnote-container -->
+	<xsl:template match="*[local-name() = 'figure']//*[local-name() = 'fmt-footnote-container']"/>
+
+	<!-- TO DO: remove, now the figure fn in figure/dl/... https://github.com/metanorma/isodoc/issues/658 -->
+	<xsl:template name="figure_fn_display">
 
-		<!-- all footnotes relates to the current figure -->
 		<xsl:variable name="references">
-			<xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])][ancestor::*[local-name() = 'figure'][1][@id = $figure_id]]">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					<xsl:apply-templates/>
-				</fn>
+			<xsl:for-each select="./*[local-name() = 'fmt-footnote-container']/*[local-name() = 'fmt-fn-body']">
+				<xsl:variable name="curr_id" select="@id"/>
+				<!-- <curr_id><xsl:value-of select="$curr_id"/></curr_id>
+				<curr><xsl:copy-of select="."/></curr>
+				<ancestor><xsl:copy-of select="ancestor::*[local-name() = 'figure'][.//*[local-name() = 'name'][.//*[local-name() = 'fn']]]"/></ancestor> -->
+				<xsl:choose>
+					<!-- skip figure/name/fn -->
+					<xsl:when test="ancestor::*[local-name() = 'figure'][.//*[local-name() = 'name'][.//*[local-name() = 'fn'][@target = $curr_id]]]"><!-- skip --></xsl:when>
+					<xsl:otherwise>
+						<xsl:element name="figure" namespace="{$namespace_full}">
+							<xsl:element name="fmt-footnote-container" namespace="{$namespace_full}">
+								<xsl:copy-of select="."/>
+							</xsl:element>
+						</xsl:element>
+					</xsl:otherwise>
+				</xsl:choose>
 			</xsl:for-each>
 		</xsl:variable>
+		<!-- <references><xsl:copy-of select="$references"/></references> -->
 
-		<xsl:if test="xalan:nodeset($references)//fn">
+		<xsl:if test="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
 
 			<xsl:variable name="key_iso">
 
 			</xsl:variable>
 
 			<fo:block>
+				<!-- current hierarchy is 'figure' element -->
+				<xsl:variable name="following_dl_colwidths">
+					<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
+						<xsl:variable name="simple-table">
+							<!-- <xsl:variable name="doc_ns">
+								<xsl:if test="$namespace = 'bipm'">bipm</xsl:if>
+							</xsl:variable>
+							<xsl:variable name="ns">
+								<xsl:choose>
+									<xsl:when test="normalize-space($doc_ns)  != ''">
+										<xsl:value-of select="normalize-space($doc_ns)"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="substring-before(name(/*), '-')"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable> -->
 
-						<!-- current hierarchy is 'figure' element -->
-						<xsl:variable name="following_dl_colwidths">
-							<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
-								<xsl:variable name="simple-table">
-									<!-- <xsl:variable name="doc_ns">
-										<xsl:if test="$namespace = 'bipm'">bipm</xsl:if>
-									</xsl:variable>
-									<xsl:variable name="ns">
-										<xsl:choose>
-											<xsl:when test="normalize-space($doc_ns)  != ''">
-												<xsl:value-of select="normalize-space($doc_ns)"/>
-											</xsl:when>
-											<xsl:otherwise>
-												<xsl:value-of select="substring-before(name(/*), '-')"/>
-											</xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable> -->
+							<xsl:for-each select="*[local-name() = 'dl'][1]">
+								<tbody>
+									<xsl:apply-templates mode="dl"/>
+								</tbody>
+							</xsl:for-each>
+						</xsl:variable>
 
-									<xsl:for-each select="*[local-name() = 'dl'][1]">
-										<tbody>
-											<xsl:apply-templates mode="dl"/>
-										</tbody>
-									</xsl:for-each>
-								</xsl:variable>
+						<xsl:call-template name="calculate-column-widths">
+							<xsl:with-param name="cols-count" select="2"/>
+							<xsl:with-param name="table" select="$simple-table"/>
+						</xsl:call-template>
 
-								<xsl:call-template name="calculate-column-widths">
-									<xsl:with-param name="cols-count" select="2"/>
-									<xsl:with-param name="table" select="$simple-table"/>
-								</xsl:call-template>
+					</xsl:if>
+				</xsl:variable>
 
-							</xsl:if>
-						</xsl:variable>
+				<xsl:variable name="maxlength_dt">
+					<xsl:for-each select="*[local-name() = 'dl'][1]">
+						<xsl:call-template name="getMaxLength_dt"/>
+					</xsl:for-each>
+				</xsl:variable>
 
-						<xsl:variable name="maxlength_dt">
-							<xsl:for-each select="*[local-name() = 'dl'][1]">
-								<xsl:call-template name="getMaxLength_dt"/>
-							</xsl:for-each>
-						</xsl:variable>
+				<fo:table width="95%" table-layout="fixed">
+					<xsl:if test="normalize-space($key_iso) = 'true'">
+						<xsl:attribute name="font-size">10pt</xsl:attribute>
 
-						<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 -->
+						<xsl:when test="xalan:nodeset($following_dl_colwidths)//column">
+							<xsl:call-template name="setColumnWidth_dl">
+								<xsl:with-param name="colwidths" select="$following_dl_colwidths"/>
+								<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="5%"/>
+							<fo:table-column column-width="95%"/>
+						</xsl:otherwise>
+					</xsl:choose>
+					<fo:table-body>
+						<!-- <xsl:for-each select="xalan:nodeset($references)//fn"> -->
+						<xsl:for-each select="xalan:nodeset($references)//*[local-name() = 'fmt-fn-body']">
 
-							</xsl:if>
-							<xsl:choose>
-								<!-- if there 'dl', then set same columns width -->
-								<xsl:when test="xalan:nodeset($following_dl_colwidths)//column">
-									<xsl:call-template name="setColumnWidth_dl">
-										<xsl:with-param name="colwidths" select="$following_dl_colwidths"/>
-										<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
-									</xsl:call-template>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:table-column column-width="5%"/>
-									<fo:table-column column-width="95%"/>
-								</xsl:otherwise>
-							</xsl:choose>
-							<fo:table-body>
-								<xsl:for-each select="xalan:nodeset($references)//fn">
-									<xsl:variable name="reference" select="@reference"/>
-									<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
-										<fo:table-row>
-											<fo:table-cell>
-												<fo:block>
-													<fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style">
-														<xsl:value-of select="@reference"/>
+							<xsl:variable name="reference" select="@reference"/>
+							<!-- <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> --> <!-- only unique reference puts in note-->
+								<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: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>
+										</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:if>
-													<xsl:copy-of select="./node()"/>
-												</fo:block>
-											</fo:table-cell>
-										</fo:table-row>
-									</xsl:if>
-								</xsl:for-each>
-							</fo:table-body>
-						</fo:table>
+											</xsl:if>
 
+											<!-- <xsl:copy-of select="./node()"/> -->
+											<xsl:apply-templates/>
+										</fo:block>
+									</fo:table-cell>
+								</fo:table-row>
+							<!-- </xsl:if> -->
+						</xsl:for-each>
+					</fo:table-body>
+				</fo:table>
 			</fo:block>
 		</xsl:if>
-	</xsl:template> <!-- fn_display_figure -->
+	</xsl:template> <!-- figure_fn_display -->
+
+	<xsl:template match="*[local-name() = 'figure']//*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']"> <!-- *[local-name() = 'fmt-footnote-container']/ -->
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<fo:inline xsl:use-attribute-sets="figure-fn-number-style" role="SKIP">
+				<xsl:attribute name="padding-right">0mm</xsl:attribute>
+
+				<!-- tab is padding-right -->
+				<xsl:apply-templates select=".//*[local-name() = 'tab']">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
+
+				<xsl:apply-templates/>
+
+			</fo:inline>
+		</xsl:if>
+	</xsl:template> <!--  figure//fmt-fn-body//fmt-fn-label -->
+
+	<xsl:template match="*[local-name() = 'figure']//*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']//*[local-name() = 'tab']" priority="5">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'figure']//*[local-name() = 'fmt-fn-body']//*[local-name() = 'fmt-fn-label']//*[local-name() = 'sup']" priority="5">
+		<fo:inline xsl:use-attribute-sets="figure-fmt-fn-label-style" role="SKIP">
+			<xsl:call-template name="refine_figure-fmt-fn-label-style"/>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template>
 
 	<!-- added for https://github.com/metanorma/isodoc/issues/607 -->
 	<!-- figure's footnote label -->
+	<!-- 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">
 
@@ -7797,7 +7970,7 @@
 			<xsl:attribute name="font-size">10pt</xsl:attribute>
 
 		</xsl:if>
-		<fo:inline xsl:use-attribute-sets="figure-fn-number-style"> <!-- id="{@id}"  -->
+		<fo:inline xsl:use-attribute-sets="figure-fn-number-style figure-fmt-fn-label-style"> <!-- id="{@id}"  -->
 			<!-- <xsl:value-of select="@reference"/> -->
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -7807,42 +7980,68 @@
 	<!-- END: figure's footnotes rendering -->
 	<!-- ============================ -->
 
-	<!-- fn reference in the text rendering (for instance, 'some text 1) some text' ) -->
+	<!-- fn reference in the table rendering (for instance, 'some text 1) some text' ) -->
+	<!-- fn --> <!-- in table --> <!-- for figure see <xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/> -->
 	<xsl:template match="*[local-name()='fn']">
 		<fo:inline xsl:use-attribute-sets="fn-reference-style">
 
 			<xsl:call-template name="refine_fn-reference-style"/>
 
-			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="footnote {@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
-				<xsl:if test="ancestor::*[local-name()='table'][1]/@id"> <!-- for footnotes in tables -->
-					<xsl:attribute name="internal-destination">
+			<!-- <fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="footnote {@reference}"> --> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
+			<fo:basic-link internal-destination="{@target}" fox:alt-text="footnote {@reference}">
+				<!-- <xsl:if test="ancestor::*[local-name()='table'][1]/@id"> --> <!-- for footnotes in tables -->
+				<!-- 	<xsl:attribute name="internal-destination">
 						<xsl:value-of select="concat(@reference, '_', ancestor::*[local-name()='table'][1]/@id)"/>
 					</xsl:attribute>
 				</xsl:if>
+				<xsl:if test="$namespace = 'ogc' or $namespace = 'ogc-white-paper'">
+					<xsl:attribute name="internal-destination">
+						<xsl:value-of select="@reference"/><xsl:text>_</xsl:text>
+						<xsl:value-of select="ancestor::*[local-name()='table'][1]/@id"/>
+					</xsl:attribute>
+				</xsl:if> -->
+				<!-- <xsl:if test="$namespace = 'plateau'">
+					<xsl:text>※</xsl:text>
+				</xsl:if> -->
+				<!-- <xsl:value-of select="@reference"/> -->
 
-					<fo:inline font-style="normal"> (</fo:inline>
-
-				<xsl:value-of select="@reference"/>
-
-					<fo:inline font-style="normal">)</fo:inline>
+						<fo:inline font-style="normal"> </fo:inline>
+						<!-- Example: <fmt-fn-label><sup><span class="fmt-label-delim">(</span>a<span class="fmt-label-delim">)</span></sup></fmt-fn-label> -->
+						<!-- to <fo:inline font-style="normal">(</fo:inline> ... -->
+						<xsl:apply-templates select="*[local-name() = 'fmt-fn-label']/node()"/>
 
+				<!-- <xsl:if test="$namespace = 'bsi'">
+					<xsl:text>)</xsl:text>
+				</xsl:if> -->
 				<!-- commented, https://github.com/metanorma/isodoc/issues/614 -->
 				<!-- <xsl:if test="$namespace = 'jis'">
 					<fo:inline font-weight="normal">)</fo:inline>
 				</xsl:if> -->
 			</fo:basic-link>
 		</fo:inline>
-	</xsl:template>
+	</xsl:template> <!-- fn -->
 
+	<!-- fn/text() -->
 	<xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
 		<fo:inline role="SKIP"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
-	<xsl:template match="*[local-name()='fn']//*[local-name()='p']">
+	<!-- fn//p fmt-fn-body//p -->
+	<xsl:template match="*[local-name()='fn']//*[local-name()='p'] | *[local-name() = 'fmt-fn-body']//*[local-name()='p']">
 		<fo:inline role="P">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
+
+	<xsl:template name="insertFootnoteSeparatorCommon">
+		<xsl:param name="leader_length">30%</xsl:param>
+		<fo:static-content flow-name="xsl-footnote-separator">
+			<fo:block>
+				<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
+			</fo:block>
+		</fo:static-content>
+	</xsl:template>
+
 	<!-- ===================== -->
 	<!-- END Footnotes processing  -->
 	<!-- ===================== -->
@@ -8120,11 +8319,11 @@
 										<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>
 
@@ -8158,6 +8357,14 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<xsl:template match="@*|node()" mode="dt_clean">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="dt_clean"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'asciimath']" mode="dt_clean"/>
+
 	<!-- caption for figure key and another caption, https://github.com/metanorma/isodoc/issues/607 -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'p'][@keep-with-next = 'true' and *[local-name() = 'strong']]" priority="3">
 		<fo:block text-align="left" margin-bottom="12pt" keep-with-next="always">
@@ -8187,10 +8394,12 @@
 	<!-- ignore 'p' with 'where' in formula, before 'dl' -->
 	<xsl:template match="*[local-name() = 'formula']/*[local-name() = 'p' and @keep-with-next = 'true' and following-sibling::*[1][local-name() = 'dl']]"/>
 
+	<!-- dl/name -->
 	<xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
 			<fo:block xsl:use-attribute-sets="dl-name-style">
+
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -8204,6 +8413,10 @@
 		<!-- <colwidths><xsl:copy-of select="$colwidths"/></colwidths> -->
 
 		<xsl:choose>
+			<!-- <xsl:when test="@class = 'formula_dl' and local-name(..) = 'figure'">
+				<fo:table-column column-width="10%"/>
+				<fo:table-column column-width="90%"/>
+			</xsl:when> -->
 			<xsl:when test="xalan:nodeset($colwidths)/autolayout">
 				<xsl:call-template name="insertTableColumnWidth">
 					<xsl:with-param name="colwidths" select="$colwidths"/>
@@ -8997,7 +9210,7 @@
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'table']"><xsl:apply-templates/></xsl:when>
 			<xsl:when test="following-sibling::*[2][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']">
-				<fo:inline keep-with-next.within-line="always"><xsl:apply-templates/></fo:inline>
+				<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:apply-templates/></fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:apply-templates/>
@@ -9005,7 +9218,7 @@
 		</xsl:choose>
 	</xsl:template>
 	<xsl:template match="text()[not(ancestor::*[local-name() = 'table']) and preceding-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear'] and   following-sibling::*[1][local-name() = 'span'][@class = 'stdpublisher' or @class = 'stddocNumber' or @class = 'stddocPartNumber' or @class = 'stdyear']]" priority="2">
-		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
+		<fo:inline keep-with-next.within-line="always" role="SKIP"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
@@ -10070,24 +10283,26 @@
 			<xsl:apply-templates select="." mode="mathml"/>
 		</xsl:variable>
 
-		<fo:instream-foreign-object fox:alt-text="Math">
+		<fo:instream-foreign-object fox:alt-text="Math" fox:actual-text="Math">
 
 			<xsl:call-template name="refine_mathml_insteam_object_style"/>
 
-			<!-- put MathML in Actual Text -->
-			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
-			<xsl:attribute name="fox:actual-text">
-				<xsl:value-of select="$mathml_content"/>
-			</xsl:attribute>
-
-			<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
-			<xsl:if test="normalize-space($asciimath_text_) != ''">
-			<!-- put Mathin Alternate Text -->
-				<xsl:attribute name="fox:alt-text">
-					<xsl:value-of select="$asciimath_text_"/>
+			<xsl:if test="$isGenerateTableIF = 'false'">
+				<!-- put MathML in Actual Text -->
+				<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
+				<xsl:attribute name="fox:actual-text">
+					<xsl:value-of select="$mathml_content"/>
 				</xsl:attribute>
+
+				<!-- <xsl:if test="$add_math_as_text = 'true'"> -->
+				<xsl:if test="normalize-space($asciimath_text_) != ''">
+				<!-- put Mathin Alternate Text -->
+					<xsl:attribute name="fox:alt-text">
+						<xsl:value-of select="$asciimath_text_"/>
+					</xsl:attribute>
+				</xsl:if>
+				<!-- </xsl:if> -->
 			</xsl:if>
-			<!-- </xsl:if> -->
 
 			<xsl:copy-of select="xalan:nodeset($mathml)"/>
 
@@ -10357,6 +10572,27 @@
 					<xsl:variable name="target__" select="substring-after($target_, concat('_', $inputxml_filename_prefix, '_attachments', '/'))"/>
 					<xsl:value-of select="concat('url(embedded-file:', $target__, ')')"/>
 				</xsl:when> -->
+
+				<!-- <xsl:when test="not(starts-with(@target, 'http:') or starts-with(@target, 'https') or starts-with(@target, 'www') or starts-with(@target, 'mailto') or starts-with(@target, 'ftp'))">
+					<xsl:variable name="target_" select="translate(@target, '\', '/')"/>
+					<xsl:variable name="filename">
+						<xsl:call-template name="substring-after-last">
+							<xsl:with-param name="value" select="$target_"/>
+							<xsl:with-param name="delimiter" select="'/'"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:variable name="target_filepath" select="concat($inputxml_basepath, @target)"/>
+					<xsl:variable name="file_exists" select="normalize-space(java:exists(java:java.io.File.new($target_filepath)))"/>
+					<xsl:choose>
+						<xsl:when test="$file_exists = 'true'">
+							<xsl:value-of select="concat('url(embedded-file:', $filename, ')')"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="normalize-space(@target)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:when> -->
+
 				<xsl:otherwise>
 					<xsl:value-of select="normalize-space(@target)"/>
 				</xsl:otherwise>
@@ -10668,7 +10904,7 @@
 				<xsl:attribute name="text-align">justify</xsl:attribute>
 			</xsl:if>
 
-	</xsl:template>
+	</xsl:template> <!-- refine_note_block_style -->
 
 	<xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
@@ -10874,10 +11110,21 @@
 	</xsl:template>
 
 	<xsl:template name="showFigureKey">
-		<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
-			<xsl:call-template name="note"/>
+		<xsl:for-each select="*[(local-name() = 'note' and not(@type = 'units')) or local-name() = 'example']">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'note'">
+					<xsl:call-template name="note"/>
+				</xsl:when>
+				<xsl:when test="local-name() = 'example'">
+					<xsl:call-template name="example"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:for-each>
-		<xsl:call-template name="fn_display_figure"/>
+		<!-- TO DO: remove, now the figure fn in figure/dl/... https://github.com/metanorma/isodoc/issues/658 -->
+		<xsl:call-template name="figure_fn_display"/>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
@@ -11771,10 +12018,10 @@
 							<xsl:when test="@type = 'section-title'">
 								<xsl:value-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/preceding-sibling::node()"/>
 								<xsl:text>: </xsl:text>
-								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name = 'fmt-xref-label')]"/>
+								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name() = 'fmt-xref-label')]"/>
 							</xsl:when>
 							<xsl:otherwise>
-								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name = 'fmt-xref-label')]"/>
+								<xsl:copy-of select="*[local-name() = 'span'][@class = 'fmt-caption-delim'][1]/following-sibling::node()[not(local-name() = 'fmt-xref-label')]"/>
 							</xsl:otherwise>
 						</xsl:choose>
 					</xsl:when>
@@ -11839,6 +12086,8 @@
 	<xsl:template match="*[local-name() = 'origin']" mode="contents"/>
 	<xsl:template match="*[local-name() = 'erefstack ']" mode="contents"/>
 
+	<xsl:template match="*[local-name() = 'requirement'] |             *[local-name() = 'recommendation'] |              *[local-name() = 'permission']" mode="contents" priority="3"/>
+
 	<xsl:template match="*[local-name() = 'stem']" mode="bookmarks"/>
 	<xsl:template match="*[local-name() = 'fmt-stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
@@ -11860,6 +12109,8 @@
 	<xsl:template match="*[local-name() = 'origin']" mode="bookmarks"/>
 	<xsl:template match="*[local-name() = 'erefstack ']" mode="bookmarks"/>
 
+	<xsl:template match="*[local-name() = 'requirement'] |             *[local-name() = 'recommendation'] |              *[local-name() = 'permission']" mode="bookmarks" priority="3"/>
+
 	<!-- Bookmarks -->
 	<xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -12119,9 +12370,15 @@
 		</xsl:if>
 	</xsl:template>
 
+	<!-- figure/fn -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
-	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/>
+	<!-- figure/note -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
+	<!-- figure/example -->
+	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
 
+	<!-- figure/note[@type = 'units'] -->
+	<!-- image/note[@type = 'units'] -->
 	<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note'][@type = 'units'] |         *[local-name() = 'image']/*[local-name() = 'note'][@type = 'units']" priority="2">
 		<fo:block text-align="right" keep-with-next="always">
 			<xsl:apply-templates/>
@@ -12242,6 +12499,7 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<!-- fn -->
 	<xsl:template match="*[local-name() = 'fn']" mode="contents"/>
 	<xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/>
 
@@ -13137,7 +13395,7 @@
 	     text line 1
 			 text line 2
 	-->
-	<xsl:template match="*[local-name() = 'example']">
+	<xsl:template match="*[local-name() = 'example']" name="example">
 
 				<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style" role="SKIP">
 
@@ -13243,6 +13501,7 @@
 
 	</xsl:template>
 
+	<!-- example/name -->
 	<xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
 		<xsl:param name="fo_element">block</xsl:param>
 
@@ -13268,7 +13527,8 @@
 
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
+	<!-- 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/>
@@ -13745,21 +14005,32 @@
 	<!-- ========== -->
 
 	<xsl:variable name="reviews_">
-		<xsl:for-each select="//*[local-name() = 'review'][@from]">
+		<xsl:for-each select="//*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])][@from]">
 			<xsl:copy>
 				<xsl:copy-of select="@from"/>
 				<xsl:copy-of select="@id"/>
 			</xsl:copy>
 		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'fmt-review-start'][@source]">
+			<xsl:copy>
+				<xsl:copy-of select="@source"/>
+				<xsl:copy-of select="@id"/>
+			</xsl:copy>
+		</xsl:for-each>
 	</xsl:variable>
 	<xsl:variable name="reviews" select="xalan:nodeset($reviews_)"/>
 
 	<xsl:template name="addReviewHelper">
-		<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
-		<xsl:variable name="curr_id" select="@id"/>
-		<xsl:variable name="review_id" select="normalize-space($reviews//*[local-name() = 'review'][@from = $curr_id]/@id)"/>
-		<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
-			<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+			<!-- if there is review with from="...", then add small helper block for Annot tag adding, see 'review' template -->
+			<xsl:variable name="curr_id" select="@id"/>
+			<!-- <xsl:variable name="review_id" select="normalize-space(/@id)"/> -->
+			<xsl:for-each select="$reviews//*[local-name() = 'review'][@from = $curr_id]"> <!-- $reviews//*[local-name() = 'fmt-review-start'][@source = $curr_id] -->
+				<xsl:variable name="review_id" select="normalize-space(@id)"/>
+				<xsl:if test="$review_id != ''"> <!-- i.e. if review found -->
+					<fo:block keep-with-next="always" line-height="0.1" id="{$review_id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$review_id}" fox:alt-text="Annot___{$review_id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+				</xsl:if>
+			</xsl:for-each>
 		</xsl:if>
 		<!-- <fo:block>
 			<curr_id><xsl:value-of select="$curr_id"/></curr_id>
@@ -13898,14 +14169,61 @@
 
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'review']"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
+	<!-- document text (not figures, or tables) footnotes -->
+	<xsl:variable name="reviews_container_">
+		<xsl:for-each select="//*[local-name() = 'review-container']/*[local-name() = 'fmt-review-body']">
+			<xsl:variable name="update_xml_step1">
+				<xsl:apply-templates select="." mode="update_xml_step1"/>
+			</xsl:variable>
+			<xsl:apply-templates select="xalan:nodeset($update_xml_step1)" mode="update_xml_enclose_keep-together_within-line"/>
+		</xsl:for-each>
+	</xsl:variable>
+	<xsl:variable name="reviews_container" select="xalan:nodeset($reviews_container_)"/>
+
+	<xsl:template match="*[local-name() = 'review-container']"/>
+
+	<!-- for old Presentation XML (before https://github.com/metanorma/isodoc/issues/670) -->
+	<xsl:template match="*[local-name() = 'review'][not(parent::*[local-name() = 'review-container'])]">  <!-- 'review' will be processed in mn2pdf/review.xsl -->
+		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
+		<xsl:if test="$isGenerateTableIF = 'false'">
+		<xsl:choose>
+			<!-- if there isn't the attribute '@from', then -->
+			<xsl:when test="$id_from = ''">
+				<fo:block id="{@id}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
+			<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+			</xsl:when>
+		</xsl:choose>
+		</xsl:if>
+	</xsl:template>
+
+	<!-- for new Presentation XML (https://github.com/metanorma/isodoc/issues/670) -->
+	<xsl:template match="*[local-name() = 'fmt-review-start']" name="fmt-review-start"> <!-- 'review' will be processed in mn2pdf/review.xsl -->
 		<!-- comment 2019-11-29 -->
 		<!-- <fo:block font-weight="bold">Review:</fo:block>
 		<xsl:apply-templates /> -->
 
-		<xsl:variable name="id_from" select="normalize-space(current()/@from)"/>
+		<xsl:variable name="id_from" select="normalize-space(current()/@source)"/>
 
-		<xsl:if test="1 = 1">
+		<xsl:variable name="source" select="normalize-space(@source)"/>
+
+		<xsl:if test="$isGenerateTableIF = 'false'">
+		<!-- <xsl:variable name="id_from" select="normalize-space(current()/@from)"/> -->
+
+		<!-- <xsl:if test="@source = @end"> -->
+		<!-- following-sibling::node()[1][local-name() = 'bookmark'][@id = $source] and
+				following-sibling::node()[2][local-name() = 'fmt-review-end'][@source = $source] -->
+			<!-- <fo:block id="{$source}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$source}" fox:alt-text="Annot___{$source}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block> -->
+			<fo:block id="{@id}" font-size="1pt" role="SKIP" keep-with-next="always" line-height="0.1"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@id}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+		<!-- </xsl:if> -->
+		</xsl:if>
+
+		<xsl:if test="1 = 2">
 		<xsl:choose>
 			<!-- if there isn't the attribute '@from', then -->
 			<xsl:when test="$id_from = ''">
@@ -13913,10 +14231,10 @@
 			</xsl:when>
 			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
 			<xsl:when test="ancestor::*[local-name() = 'metanorma'] and not(ancestor::*[local-name() = 'metanorma']//*[@id = $id_from])">
-				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+				<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
 			</xsl:when>
 			<xsl:when test="not(/*[@id = $id_from]) and not(/*//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
-				<fo:block id="{@from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{@from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
+				<fo:block id="{$id_from}" font-size="1pt" role="SKIP"><xsl:value-of select="$hair_space"/><fo:basic-link internal-destination="{$id_from}" fox:alt-text="Annot___{@id}" role="Annot"><xsl:value-of select="$hair_space"/></fo:basic-link></fo:block>
 			</xsl:when>
 		</xsl:choose>
 		</xsl:if>
@@ -13967,16 +14285,21 @@
 		<xsl:variable name="list_level">
 			<xsl:choose>
 				<xsl:when test="$list_level_ &lt;= 3"><xsl:value-of select="$list_level_"/></xsl:when>
-				<xsl:otherwise><xsl:value-of select="$list_level_ mod 3"/></xsl:otherwise>
+				<xsl:when test="$ul_labels/label[@level = 3]"><xsl:value-of select="$list_level_ mod 3"/></xsl:when>
+				<xsl:when test="$list_level_ mod 2 = 0">2</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$list_level_ mod 2"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$ul_labels/label[not(@level)]"> <!-- one label for all levels -->
 				<xsl:apply-templates select="$ul_labels/label[not(@level)]" mode="ul_labels"/>
 			</xsl:when>
-			<xsl:when test="$list_level mod 3 = 0">
+			<xsl:when test="$list_level mod 3 = 0 and $ul_labels/label[@level = 3]">
 				<xsl:apply-templates select="$ul_labels/label[@level = 3]" mode="ul_labels"/>
 			</xsl:when>
+			<xsl:when test="$list_level mod 3 = 0">
+				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
+			</xsl:when>
 			<xsl:when test="$list_level mod 2 = 0">
 				<xsl:apply-templates select="$ul_labels/label[@level = 2]" mode="ul_labels"/>
 			</xsl:when>
@@ -14521,10 +14844,22 @@
 	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/>
 
 	<xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
-		<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
-		<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
-		<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
-		<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+		<xsl:variable name="bookmark_id" select="@id"/>
+		<xsl:choose>
+			<!-- Example:
+				<fmt-review-start id="_7ef81cf7-3f6c-4ed4-9c1f-1ba092052bbd" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" end="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/>
+				<bookmark id="_dda23915-8574-ef1e-29a1-822d465a5b97"/>
+				<fmt-review-end id="_f336a8d0-08a8-4b7f-a1aa-b04688ed40c1" source="_dda23915-8574-ef1e-29a1-822d465a5b97" target="_ecfb2210-3b1b-46a2-b63a-8b8505be6686" start="_dda23915-8574-ef1e-29a1-822d465a5b97" author="" date="2025-03-24T00:00:00Z"/> -->
+			<xsl:when test="1 = 2 and preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and        following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]">
+				<!-- skip here, see the template 'fmt-review-start' -->
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
+				<fo:inline id="{@id}" font-size="1pt"><xsl:if test="preceding-sibling::node()[local-name() = 'fmt-review-start'][@source = $bookmark_id] and        following-sibling::node()[local-name() = 'fmt-review-end'][@source = $bookmark_id]"><xsl:attribute name="line-height">0.1</xsl:attribute></xsl:if><xsl:value-of select="$hair_space"/></fo:inline>
+				<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
+				<xsl:if test="not(following-sibling::node()[normalize-space() != ''])"><fo:inline font-size="1pt"> </fo:inline></xsl:if>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
@@ -14904,8 +15239,33 @@
 
 	<xsl:template match="*[local-name() = 'toc']//*[local-name() = 'xref']" priority="3">
 		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<!-- New format: one tab <xref target="cgpm9th1948r6">&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<!-- <test><xsl:copy-of select="."/></test> -->
+
 		<xsl:variable name="target" select="@target"/>
+
 		<xsl:for-each select="*[local-name() = 'tab']">
+
+			<xsl:if test="position() = 1">
+				<!-- first column (data before first `tab`) -->
+				<fo:table-cell>
+					<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
+						<xsl:call-template name="insert_basic_link">
+							<xsl:with-param name="element">
+								<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+									<xsl:for-each select="preceding-sibling::node()">
+										<xsl:choose>
+											<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+											<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+										</xsl:choose>
+									</xsl:for-each>
+								</fo:basic-link>
+							</xsl:with-param>
+						</xsl:call-template>
+					</fo:block>
+				</fo:table-cell>
+			</xsl:if>
+
 			<xsl:variable name="current_id" select="generate-id()"/>
 			<fo:table-cell>
 				<fo:block line-height-shift-adjustment="disregard-shifts" role="SKIP">
@@ -14956,11 +15316,25 @@
 
 	<xsl:template match="*[local-name() = 'xref']" mode="toc_table_width">
 		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<!-- New format - one tab <xref target="cgpm9th1948r6">&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
 		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:if test="position() = 1">
+				<td>
+					<xsl:for-each select="preceding-sibling::node()">
+						<xsl:choose>
+							<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+							<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+				</td>
+			</xsl:if>
 			<xsl:variable name="current_id" select="generate-id()"/>
 			<td>
 				<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
-					<xsl:copy-of select="."/>
+					<xsl:choose>
+						<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+						<xsl:otherwise><xsl:copy-of select="."/></xsl:otherwise>
+					</xsl:choose>
 				</xsl:for-each>
 			</td>
 		</xsl:for-each>
@@ -15831,6 +16205,9 @@
 	<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'svgmap']" mode="update_xml_pres"/>
 
+	<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'review-container']" mode="update_xml_pres"/>
+
 	<!-- END: update new Presentation XML -->
 
 	<!-- =========================================================================== -->
@@ -16354,6 +16731,7 @@
 			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
 		</fn>
 	-->
+	<!-- fn in text -->
 	<xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure')] and not(ancestor::*[local-name() = 'name']))]" mode="linear_xml" name="linear_xml_fn">
 		<xsl:variable name="p_fn_">
 			<xsl:call-template name="get_fn_list"/>