metanorma-bipm 2.2.5 → 2.2.7

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

@@ -32,7 +32,7 @@
 	<xsl:variable name="doc_first">
 		<xsl:if test="*[local-name()='metanorma-collection']">
 			<xsl:variable name="doc_first_step1">
-				<xsl:apply-templates select="(/*[local-name()='metanorma-collection']//*[contains(local-name(), '-standard')])[1]" mode="flatxml_step1">
+				<xsl:apply-templates select="(/*[local-name()='metanorma-collection']//*[local-name() = 'bipm-standard'])[1]" mode="flatxml_step1">
 					<xsl:with-param name="num" select="'first'"/>
 				</xsl:apply-templates>
 			</xsl:variable>
@@ -44,7 +44,7 @@
 	</xsl:variable>
 	<xsl:variable name="docs_slave">
 		<xsl:if test="*[local-name()='metanorma-collection']">
-			<xsl:for-each select="(/*[local-name()='metanorma-collection']//*[contains(local-name(), '-standard')])[position() &gt; 1]">
+			<xsl:for-each select="(/*[local-name()='metanorma-collection']//*[local-name() = 'bipm-standard'])[position() &gt; 1]">
 				<xsl:variable name="doc_first_step1">
 					<xsl:apply-templates select="." mode="flatxml_step1">
 					<xsl:with-param name="num" select="'slave'"/>
@@ -63,7 +63,7 @@
 	<xsl:variable name="docs_count">
 		<xsl:choose>
 			<xsl:when test="/*[local-name()='metanorma-collection']">
-				<xsl:value-of select="count(/*[local-name()='metanorma-collection']//*[contains(local-name(), '-standard')])"/>
+				<xsl:value-of select="count(/*[local-name()='metanorma-collection']//*[local-name() = 'bipm-standard'])"/>
 			</xsl:when>
 			<xsl:otherwise>1</xsl:otherwise>
 		</xsl:choose>
@@ -88,7 +88,7 @@
 	-->
 	<xsl:variable name="contents_">
 
-		<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+		<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 			<xsl:variable name="lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
 			<xsl:variable name="current_document">
 				<xsl:copy-of select="."/>
@@ -332,12 +332,12 @@
 				<fo:flow flow-name="xsl-region-body" line-height="115%">
 
 					<!-- Copyright -->
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<xsl:apply-templates select="./*[local-name()='boilerplate']/*"/>
 						<fo:block break-after="page"/>
 					</xsl:for-each>
 
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<xsl:variable name="current_document">
 							<xsl:copy-of select="."/>
 						</xsl:variable>
@@ -417,23 +417,23 @@
 
 					<!-- Foreword, Introduction -->
 					<!-- <xsl:call-template name="processPrefaceSectionsDefault"/> -->
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<fo:block break-after="page"/>
 						<xsl:apply-templates select="./*[local-name()='preface']/*[local-name()='abstract']"/>
 					</xsl:for-each>
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<fo:block break-after="page"/>
 						<xsl:apply-templates select="./*[local-name()='preface']/*[local-name()='foreword']"/>
 					</xsl:for-each>
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<fo:block break-after="page"/>
 						<xsl:apply-templates select="./*[local-name()='preface']/*[local-name()='introduction']"/>
 					</xsl:for-each>
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<fo:block break-after="page"/>
 						<xsl:apply-templates select="./*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements' and local-name() != 'note' and local-name() != 'admonition']"/>
 					</xsl:for-each>
-					<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+					<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 						<fo:block break-after="page"/>
 						<xsl:apply-templates select="./*[local-name()='preface']/*[local-name()='acknowledgements']"/>
 					</xsl:for-each>
@@ -456,7 +456,7 @@
 						<!-- Show title -->
 						<!-- Example: Evaluation of measurement data — An introduction to the `Guide to the expression of uncertainty in measurement' and related documents -->
 
-						<xsl:for-each select="//*[contains(local-name(), '-standard')]">
+						<xsl:for-each select="//*[local-name() = 'bipm-standard']">
 							<fo:block font-size="20pt" font-weight="bold" margin-bottom="20pt" space-before="36pt" line-height="1.1">
 								<xsl:variable name="curr_lang" select="*[local-name()='bibdata']/*[local-name()='language'][@current = 'true']"/>
 
@@ -492,7 +492,7 @@
 					<!-- Clause(s) -->
 					<fo:block>
 						<xsl:choose>
-							<xsl:when test="count(//*[contains(local-name(), '-standard')]) = 1 ">
+							<xsl:when test="count(//*[local-name() = 'bipm-standard']) = 1 ">
 								<xsl:call-template name="processMainSectionsDefault"/>
 							</xsl:when>
 							<xsl:otherwise>
@@ -1376,7 +1376,7 @@
 		</xsl:copy>
 	</xsl:template>
 
-	<xsl:template match="*[contains(local-name(), '-standard')]" mode="flatxml_step1">
+	<xsl:template match="*[local-name() = 'bipm-standard']" mode="flatxml_step1">
 		<xsl:param name="num"/>
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="flatxml_step1"/>
@@ -2280,21 +2280,21 @@
 
 	<xsl:attribute-set name="table-header-cell-style">
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
-		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
+			<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 			<xsl:attribute name="padding-top">1mm</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
 
 	<xsl:attribute-set name="table-cell-style">
 		<xsl:attribute name="display-align">center</xsl:attribute>
-		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 		<xsl:attribute name="padding-left">1mm</xsl:attribute>
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 
+			<xsl:attribute name="border">solid black 1pt</xsl:attribute>
 			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-cell-style -->
@@ -2504,6 +2504,7 @@
 	<xsl:attribute-set name="term-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+
 	</xsl:attribute-set>
 
 	<xsl:attribute-set name="figure-block-style">
@@ -3047,7 +3048,7 @@
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
 
-		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true') and not(*[local-name()='references'][@normative='true'])][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]][count(.//*[local-name() = 'bibitem'][not(@hidden) = 'true']) &gt; 0]">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
@@ -3453,7 +3454,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() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely -->
+									<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note') and not(local-name() = 'dl')          and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer, note and dl which render separaterely -->
 								</xsl:otherwise>
 							</xsl:choose>
 
@@ -3971,7 +3972,7 @@
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
+		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ../*[local-name()='dl'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 
 		<xsl:variable name="isNoteOrFnExistShowAfterTable">
 
@@ -3990,6 +3991,10 @@
 				</xsl:choose>
 			</xsl:variable>
 
+			<xsl:variable name="table_fn_block">
+				<xsl:call-template name="table_fn_display"/>
+			</xsl:variable>
+
 			<xsl:variable name="tableWithNotesAndFootnotes">
 
 				<fo:table keep-with-previous="always">
@@ -4035,13 +4040,28 @@
 
 								<!-- except gb and bsi  -->
 
+										<xsl:apply-templates select="../*[local-name()='dl']"/>
 										<xsl:apply-templates select="../*[local-name()='note']"/>
 
+								<xsl:variable name="isDisplayRowSeparator">
+
+								</xsl:variable>
+
 								<!-- horizontal row separator -->
+								<xsl:if test="normalize-space($isDisplayRowSeparator) = 'true'">
+									<xsl:if test="../*[local-name()='note'] and normalize-space($table_fn_block) != ''">
+										<fo:block-container border-top="0.5pt solid black" padding-left="1mm" padding-right="1mm">
+
+											<xsl:call-template name="setBordersTableArray"/>
+											<fo:block font-size="1pt"> </fo:block>
+										</fo:block-container>
+									</xsl:if>
+								</xsl:if>
 
 								<!-- fn processing -->
 
-										<xsl:call-template name="table_fn_display"/>
+										<!-- <xsl:call-template name="table_fn_display" /> -->
+										<xsl:copy-of select="$table_fn_block"/>
 
 								<!-- for PAS display Notes after footnotes -->
 
@@ -4187,7 +4207,7 @@
 	<!-- ===================== -->
 	<!-- Table's row processing -->
 	<!-- ===================== -->
-	<!-- row in table header (thead) -->
+	<!-- row in table header (thead) thead/tr -->
 	<xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
 		<fo:table-row xsl:use-attribute-sets="table-header-row-style">
 
@@ -4210,7 +4230,29 @@
 		</fo:table-row>
 	</xsl:template>
 
-	<!-- row in table footer (tfoot) -->
+	<xsl:template name="setBorderUnderRow">
+		<xsl:variable name="border_under_row_" select="normalize-space(ancestor::*[local-name() = 'table'][1]/@border-under-row)"/>
+		<xsl:choose>
+			<xsl:when test="$border_under_row_ != ''">
+				<xsl:variable name="table_id" select="ancestor::*[local-name() = 'table'][1]/@id"/>
+				<xsl:variable name="row_num_"><xsl:number level="any" count="*[local-name() = 'table'][@id = $table_id]//*[local-name() = 'tr']"/></xsl:variable>
+				<xsl:variable name="row_num" select="number($row_num_) - 1"/> <!-- because values in border-under-row start with 0 -->
+				<xsl:variable name="border_under_row">
+					<xsl:call-template name="split">
+						<xsl:with-param name="pText" select="$border_under_row_"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:if test="xalan:nodeset($border_under_row)/item[. = normalize-space($row_num)]">
+					<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
+				</xsl:if>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:attribute name="border-bottom"><xsl:value-of select="$table-border"/></xsl:attribute>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<!-- row in table footer (tfoot), tfoot/tr -->
 	<xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
 		<fo:table-row xsl:use-attribute-sets="table-footer-row-style">
 
@@ -4545,8 +4587,16 @@
 	<!-- figure's footnotes rendering -->
 	<xsl:template name="fn_display_figure">
 
+		<!-- 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_)"/>
+
+		<!-- all footnotes relates to the current figure -->
 		<xsl:variable name="references">
-			<xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
+			<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>
@@ -4559,91 +4609,93 @@
 				true
 			</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>
+			<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> -->
+
+									<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: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="ns">
+
+						<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>
-								<xsl:when test="normalize-space($doc_ns)  != ''">
-									<xsl:value-of select="normalize-space($doc_ns)"/>
+								<!-- 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>
-									<xsl:value-of select="substring-before(name(/*), '-')"/>
+									<fo:table-column column-width="5%"/>
+									<fo:table-column column-width="95%"/>
 								</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: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: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-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"/>
+													</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'">
 
-			<fo:block>
-				<fo:table width="95%" table-layout="fixed">
-					<xsl:if test="normalize-space($key_iso) = 'true'">
-						<xsl:attribute name="font-size">10pt</xsl:attribute>
+																<xsl:attribute name="margin-bottom">0</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="15%"/>
-							<fo:table-column column-width="85%"/>
-						</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"/>
-											</fo:inline>
-										</fo:block>
-									</fo:table-cell>
-									<fo:table-cell>
-										<fo:block xsl:use-attribute-sets="figure-fn-body-style">
-											<xsl:if test="normalize-space($key_iso) = 'true'">
-
-														<xsl:attribute name="margin-bottom">0</xsl:attribute>
+													</xsl: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()"/>
-										</fo:block>
-									</fo:table-cell>
-								</fo:table-row>
-							</xsl:if>
-						</xsl:for-each>
-					</fo:table-body>
-				</fo:table>
 			</fo:block>
 		</xsl:if>
 
@@ -4688,6 +4740,8 @@
 		<!-- <dl><xsl:copy-of select="."/></dl> -->
 		<fo:block-container>
 
+			<xsl:call-template name="setBlockSpanAll"/>
+
 					<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
 						<xsl:attribute name="margin-left">0mm</xsl:attribute>
 					</xsl:if>
@@ -4728,12 +4782,14 @@
 
 										<xsl:attribute name="margin-bottom">0</xsl:attribute>
 
-									<xsl:variable name="title-where">
+									<!-- <xsl:variable name="title-where">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">where</xsl:with-param>
 										</xsl:call-template>
 									</xsl:variable>
-									<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
+									<xsl:value-of select="$title-where"/> -->
+									<xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
+									<xsl:text> </xsl:text>
 									<xsl:apply-templates select="*[local-name()='dt']/*"/>
 									<xsl:text/>
 									<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
@@ -4745,12 +4801,14 @@
 
 								<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 
-							<xsl:variable name="title-where">
+							<!-- <xsl:variable name="title-where">
 								<xsl:call-template name="getLocalizedString">
 									<xsl:with-param name="key">where</xsl:with-param>
 								</xsl:call-template>
 							</xsl:variable>
-							<xsl:value-of select="$title-where"/>
+							<xsl:value-of select="$title-where"/><xsl:if test="$namespace = 'bsi' or $namespace = 'itu'">:</xsl:if> -->
+							<!-- preceding 'p' with word 'where' -->
+							<xsl:apply-templates select="preceding-sibling::*[1][local-name() = 'p' and @keep-with-next = 'true']/node()"/>
 						</fo:block>
 					</xsl:when>  <!-- END: a few components -->
 					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')"> <!-- definition list in a figure -->
@@ -4941,6 +4999,9 @@
 
 	</xsl:template> <!-- END: dl -->
 
+	<!-- 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']]"/>
+
 	<xsl:template match="*[local-name() = 'dl']/*[local-name() = 'name']">
 		<xsl:param name="process">false</xsl:param>
 		<xsl:if test="$process = 'true'">
@@ -5768,20 +5829,34 @@
 
 	<xsl:template name="add-zero-spaces-java">
 		<xsl:param name="text" select="."/>
-		<!-- add zero-width space (#x200B) after characters: dash, dot, equal, underscore, em dash, thin space, arrow right   -->
-		<xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|=|_|—| |→)','$1​')"/>
+
+		<!-- add zero-width space (#x200B) after dot with next non-digit -->
+		<xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(\.)([^\d\s])','$1​$2')"/>
+		<!-- add zero-width space (#x200B) after characters: dash, equal, underscore, em dash, thin space, arrow right, ;   -->
+		<xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1),'(-|=|_|—| |→|;)','$1​')"/>
 		<!-- add zero-width space (#x200B) after characters: colon, if there aren't digits after -->
-		<xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1),'(:)(\D)','$1​$2')"/>
+		<xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2),'(:)(\D)','$1​$2')"/>
 		<!-- add zero-width space (#x200B) after characters: 'great than' -->
-		<xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
+		<xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
 		<!-- add zero-width space (#x200B) before characters: 'less than' -->
-		<xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
+		<xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
 		<!-- add zero-width space (#x200B) before character: { -->
-		<xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
+		<xsl:variable name="text6" select="java:replaceAll(java:java.lang.String.new($text5), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
 		<!-- add zero-width space (#x200B) after character: , -->
-		<xsl:variable name="text6" select="java:replaceAll(java:java.lang.String.new($text5), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
+		<xsl:variable name="text7" select="java:replaceAll(java:java.lang.String.new($text6), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
+		<!-- add zero-width space (#x200B) after character: '/' -->
+		<xsl:variable name="text8" select="java:replaceAll(java:java.lang.String.new($text7), '(\u002f)(?!\u002f)', '$1​')"/><!-- negative lookahead: '/' not followed by '/' -->
 
-		<xsl:value-of select="$text6"/>
+		<xsl:variable name="text9">
+			<xsl:choose>
+				<xsl:when test="$isGenerateTableIF = 'true'">
+					<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text8), '([\u3000-\u9FFF])', '$1​')"/> <!-- 3000 - CJK Symbols and Punctuation ... 9FFF CJK Unified Ideographs-->
+				</xsl:when>
+				<xsl:otherwise><xsl:value-of select="$text8"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+
+		<xsl:value-of select="$text9"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -5789,8 +5864,8 @@
 
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
 		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
-		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
+		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, comma, slash, @  -->
+		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
 		<!-- remove zero-width space at the end -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
 	</xsl:template>
@@ -6145,9 +6220,28 @@
 		</xsl:variable>
 		<xsl:copy-of select="$newRow"/>
 
-		<xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
-				<xsl:with-param name="previousRow" select="$newRow"/>
-		</xsl:apply-templates>
+		<!-- optimize to prevent StackOverflowError, just copy next 'tr' -->
+		<xsl:variable name="currrow_num" select="count(preceding-sibling::tr) + 1"/>
+		<xsl:variable name="nextrow_without_rowspan_" select="count(following-sibling::tr[*[@rowspan and @rowspan != 1]][1]/preceding-sibling::tr) + 1"/>
+		<xsl:variable name="nextrow_without_rowspan" select="$nextrow_without_rowspan_ - $currrow_num"/>
+		<xsl:choose>
+			<xsl:when test="not(xalan:nodeset($newRow)/*/*[@rowspan and @rowspan != 1]) and $nextrow_without_rowspan &lt;= 0">
+				<xsl:copy-of select="following-sibling::tr"/>
+			</xsl:when>
+			<!-- <xsl:when test="xalan:nodeset($newRow)/*[not(@rowspan) or (@rowspan = 1)] and $nextrow_without_rowspan &gt; 0">
+				<xsl:copy-of select="following-sibling::tr[position() &lt;= $nextrow_without_rowspan]"/>
+				
+				<xsl:copy-of select="following-sibling::tr[$nextrow_without_rowspan + 1]"/>
+				<xsl:apply-templates select="following-sibling::tr[$nextrow_without_rowspan + 2]" mode="simple-table-rowspan">
+						<xsl:with-param name="previousRow" select="following-sibling::tr[$nextrow_without_rowspan + 1]"/>
+				</xsl:apply-templates>
+			</xsl:when> -->
+			<xsl:otherwise>
+				<xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
+						<xsl:with-param name="previousRow" select="$newRow"/>
+				</xsl:apply-templates>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 	<!-- End mode simple-table-rowspan  -->
 
@@ -6310,6 +6404,27 @@
 		</xsl:call-template>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'link'][normalize-space() = '']" mode="td_text_with_formatting">
+		<xsl:variable name="link">
+			<link_updated>
+				<xsl:variable name="target_text">
+					<xsl:choose>
+						<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
+							<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="normalize-space(@target)"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:value-of select="$target_text"/>
+			</link_updated>
+		</xsl:variable>
+		<xsl:for-each select="xalan:nodeset($link)/*">
+			<xsl:apply-templates mode="td_text_with_formatting"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:template name="getFormattingTags">
 		<tags>
 			<xsl:if test="ancestor::*[local-name() = 'strong']"><tag>strong</tag></xsl:if>
@@ -6658,7 +6773,7 @@
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
 
-			<xsl:if test="starts-with(normalize-space(@target), 'mailto:')">
+			<xsl:if test="starts-with(normalize-space(@target), 'mailto:') and not(ancestor::*[local-name() = 'td'])">
 				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 			</xsl:if>
 
@@ -6713,13 +6828,17 @@
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'callout']">
-		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
+		<xsl:choose>
+			<xsl:when test="normalize-space(@target) = ''">&lt;<xsl:apply-templates/>&gt;</xsl:when>
+			<xsl:otherwise><fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'annotation']">
 		<xsl:variable name="annotation-id" select="@id"/>
 		<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
 		<fo:block id="{$annotation-id}" white-space="nowrap">
+
 			<fo:inline>
 				<xsl:apply-templates>
 					<xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
@@ -6824,6 +6943,10 @@
 	<!-- ====== -->
 	<!-- ====== -->
 
+	<xsl:template name="setBlockSpanAll">
+		<xsl:if test="@columns = 1 or     (local-name() = 'p' and *[@columns = 1])"><xsl:attribute name="span">all</xsl:attribute></xsl:if>
+	</xsl:template>
+
 	<!-- ====== -->
 	<!-- note      -->
 	<!-- termnote -->
@@ -6833,6 +6956,8 @@
 
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
 
+			<xsl:call-template name="setBlockSpanAll"/>
+
 			<fo:block-container margin-left="0mm" margin-right="0mm">
 
 						<fo:block>
@@ -6883,6 +7008,8 @@
 	<xsl:template match="*[local-name() = 'termnote']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
 
+			<xsl:call-template name="setBlockSpanAll"/>
+
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 
 				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
@@ -7015,10 +7142,10 @@
 			<fo:block xsl:use-attribute-sets="figure-style">
 				<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note' and @type = 'units')]"/>
 			</fo:block>
-			<xsl:call-template name="fn_display_figure"/>
 			<xsl:for-each select="*[local-name() = 'note'][not(@type = 'units')]">
 				<xsl:call-template name="note"/>
 			</xsl:for-each>
+			<xsl:call-template name="fn_display_figure"/>
 
 					<xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
 
@@ -7081,7 +7208,13 @@
 										</xsl:choose>
 									</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $width_effective, $height_effective)"/>
+									<xsl:variable name="image_width_effective">
+
+												<xsl:value-of select="$width_effective"/>
+
+									</xsl:variable>
+
+									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
 									<xsl:if test="number($scale) &lt; 100">
 
 												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
@@ -7668,6 +7801,13 @@
 					<xsl:when test="$contents_nodes/doc">
 						<xsl:choose>
 							<xsl:when test="count($contents_nodes/doc) &gt; 1">
+
+								<xsl:if test="$contents_nodes/collection">
+									<fo:bookmark internal-destination="{$contents/collection/@firstpage_id}">
+										<fo:bookmark-title>collection.pdf</fo:bookmark-title>
+									</fo:bookmark>
+								</xsl:if>
+
 								<xsl:for-each select="$contents_nodes/doc">
 									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
@@ -8780,6 +8920,9 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
+
+			<xsl:call-template name="setBlockSpanAll"/>
+
 			<xsl:apply-templates select="*[local-name()='name']"/>
 			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
@@ -8831,6 +8974,8 @@
 
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="example-style">
 
+			<xsl:call-template name="setBlockSpanAll"/>
+
 			<xsl:variable name="fo_element">
 				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl'] or *[not(local-name() = 'name')][1][local-name() = 'sourcecode']">block</xsl:if>
 				inline
@@ -8858,6 +9003,35 @@
 						</fo:block-container>
 					</xsl:when> <!-- end block -->
 
+					<xsl:when test="contains(normalize-space($fo_element), 'list')">
+
+						<xsl:variable name="provisional_distance_between_starts">
+							7
+						</xsl:variable>
+						<xsl:variable name="indent">
+							0
+						</xsl:variable>
+
+						<fo:list-block provisional-distance-between-starts="{$provisional_distance_between_starts}mm">
+							<fo:list-item>
+								<fo:list-item-label start-indent="{$indent}mm" end-indent="label-end()">
+									<fo:block>
+										<xsl:apply-templates select="*[local-name()='name']">
+											<xsl:with-param name="fo_element">block</xsl:with-param>
+										</xsl:apply-templates>
+									</fo:block>
+								</fo:list-item-label>
+								<fo:list-item-body start-indent="body-start()">
+									<fo:block>
+										<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+											<xsl:with-param name="fo_element" select="$fo_element"/>
+										</xsl:apply-templates>
+									</fo:block>
+								</fo:list-item-body>
+							</fo:list-item>
+						</fo:list-block>
+					</xsl:when> <!-- end list -->
+
 					<xsl:otherwise> <!-- inline -->
 
 						<!-- display 'EXAMPLE' and first element in the same line -->
@@ -8938,6 +9112,11 @@
 					</fo:block>
 				</fo:block-container>
 			</xsl:when>
+			<xsl:when test="starts-with(normalize-space($element), 'list')">
+				<fo:block xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
 			<xsl:otherwise>
 				<fo:inline xsl:use-attribute-sets="example-p-style">
 					<xsl:apply-templates/>
@@ -9055,6 +9234,9 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'quote']">
 		<fo:block-container margin-left="0mm">
+
+			<xsl:call-template name="setBlockSpanAll"/>
+
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:if test="not(ancestor::*[local-name() = 'table'])">
 					<xsl:attribute name="margin-left">5mm</xsl:attribute>
@@ -9352,6 +9534,8 @@
 		<fo:block>
 			<xsl:call-template name="setId"/>
 
+			<xsl:call-template name="setBlockSpanAll"/>
+
 				<xsl:if test="@inline-header='true'">
 					<xsl:attribute name="text-align">justify</xsl:attribute>
 				</xsl:if>
@@ -9370,6 +9554,8 @@
 		<fo:block break-after="page"/>
 		<fo:block id="{@id}">
 
+			<xsl:call-template name="setBlockSpanAll"/>
+
 		</fo:block>
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -9408,6 +9594,8 @@
 				<label level="2">−</label><!-- minus sign -->
 				<label level="3" font-size="75%">o</label> <!-- white circle -->
 
+				<label>－</label> <!-- full-width hyphen minus -->
+
 	</xsl:variable>
 	<xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/>
 
@@ -9560,6 +9748,44 @@
 
 		<fo:list-block xsl:use-attribute-sets="list-style">
 
+			<xsl:variable name="provisional_distance_between_starts_">
+				<attributes xsl:use-attribute-sets="list-style">
+
+				</attributes>
+			</xsl:variable>
+			<xsl:variable name="provisional_distance_between_starts" select="normalize-space(xalan:nodeset($provisional_distance_between_starts_)/attributes/@provisional-distance-between-starts)"/>
+			<xsl:if test="$provisional_distance_between_starts != ''">
+				<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="$provisional_distance_between_starts"/></xsl:attribute>
+			</xsl:if>
+			<xsl:variable name="provisional_distance_between_starts_value" select="substring-before($provisional_distance_between_starts, 'mm')"/>
+
+			<!-- increase provisional-distance-between-starts for long lists -->
+			<xsl:if test="local-name() = 'ol'">
+				<!-- Examples: xiii), xviii), xxviii) -->
+				<xsl:variable name="item_numbers">
+					<xsl:for-each select="*[local-name() = 'li']">
+						<item><xsl:call-template name="getListItemFormat"/></item>
+					</xsl:for-each>
+				</xsl:variable>
+
+				<xsl:variable name="max_length">
+					<xsl:for-each select="xalan:nodeset($item_numbers)/item">
+						<xsl:sort select="string-length(.)" data-type="number" order="descending"/>
+						<xsl:if test="position() = 1"><xsl:value-of select="string-length(.)"/></xsl:if>
+					</xsl:for-each>
+				</xsl:variable>
+
+				<!-- base width (provisional-distance-between-starts) for 4 chars -->
+				<xsl:variable name="addon" select="$max_length - 4"/>
+				<xsl:if test="$addon &gt; 0">
+					<xsl:attribute name="provisional-distance-between-starts"><xsl:value-of select="$provisional_distance_between_starts_value + $addon * 2"/>mm</xsl:attribute>
+				</xsl:if>
+				<!-- DEBUG -->
+				<!-- <xsl:copy-of select="$item_numbers"/>
+				<max_length><xsl:value-of select="$max_length"/></max_length>
+				<addon><xsl:value-of select="$addon"/></addon> -->
+			</xsl:if>
+
 			<xsl:if test="*[local-name() = 'name']">
 				<xsl:attribute name="margin-top">0pt</xsl:attribute>
 			</xsl:if>
@@ -10288,6 +10514,8 @@
 
 				<fo:block xsl:use-attribute-sets="admonition-style">
 
+					<xsl:call-template name="setBlockSpanAll"/>
+
 					<xsl:if test="@type = 'editorial'">
 						<xsl:attribute name="color">green</xsl:attribute>
 						<xsl:attribute name="font-weight">normal</xsl:attribute>
@@ -10471,6 +10699,16 @@
 			<xsl:apply-templates mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
+
+	<!-- remove semantic xml -->
+	<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'metanorma']/*[local-name() = 'source']" mode="update_xml_step1"/>
+
+	<!-- remove image/emf -->
+	<xsl:template match="*[local-name() = 'image']/*[local-name() = 'emf']" mode="update_xml_step1"/>
+
+	<xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_step1">
+		<xsl:copy-of select="."/>
+	</xsl:template>
 	<!-- =========================================================================== -->
 	<!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
 	<!-- =========================================================================== -->
@@ -10492,7 +10730,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     ancestor::*[local-name() = 'svg'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
@@ -10522,7 +10760,7 @@
 		<!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) -->
 		<!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> -->
 		<!-- add &lt; and &gt; to \S -->
-		<xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;]</xsl:variable>
+		<xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;\u3000-\u9FFF]</xsl:variable>
 		<xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable>
 		<xsl:variable name="text3">
 			<text><xsl:for-each select="xalan:nodeset($text2)/text/node()">
@@ -10544,7 +10782,8 @@
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'td' or local-name() = 'th']">
 				<!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b  in table's cell ONLY -->
-				<xsl:variable name="regex_dots_units">((\b((\S{1,3}\.\S+)|(\S+\.\S{1,3}))\b)|(\.\S{1,3})\b)</xsl:variable>
+				<xsl:variable name="non_white_space">[^\s\u3000-\u9FFF]</xsl:variable>
+				<xsl:variable name="regex_dots_units">((\b((<xsl:value-of select="$non_white_space"/>{1,3}\.<xsl:value-of select="$non_white_space"/>+)|(<xsl:value-of select="$non_white_space"/>+\.<xsl:value-of select="$non_white_space"/>{1,3}))\b)|(\.<xsl:value-of select="$non_white_space"/>{1,3})\b)</xsl:variable>
 				<xsl:for-each select="xalan:nodeset($text3)/text/node()">
 					<xsl:choose>
 						<xsl:when test="self::text()">
@@ -10565,6 +10804,10 @@
 
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'stem'] | *[local-name() = 'image']" mode="update_xml_enclose_keep-together_within-line">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+
 	<xsl:template name="replace_text_tags">
 		<xsl:param name="tag_open"/>
 		<xsl:param name="tag_close"/>
@@ -10591,6 +10834,194 @@
 	<!-- END XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line'  -->
 	<!-- ===================================== -->
 
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+	<!-- Make linear XML (need for landscape orientation) -->
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+	<xsl:template match="@*|node()" mode="linear_xml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="linear_xml"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="processing-instruction()" mode="linear_xml">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+
+	<!-- From:
+		<clause>
+			<title>...</title>
+			<p>...</p>
+		</clause>
+		To:
+			<clause/>
+			<title>...</title>
+			<p>...</p>
+		-->
+	<xsl:template match="*[local-name() = 'foreword'] |            *[local-name() = 'foreword']//*[local-name() = 'clause'] |            *[local-name() = 'preface']//*[local-name() = 'clause'][not(@type = 'corrigenda') and not(@type = 'policy') and not(@type = 'related-refs')] |            *[local-name() = 'introduction'] |            *[local-name() = 'introduction']//*[local-name() = 'clause'] |            *[local-name() = 'sections']//*[local-name() = 'clause'] |             *[local-name() = 'annex'] |             *[local-name() = 'annex']//*[local-name() = 'clause'] |             *[local-name() = 'references'][not(@hidden = 'true')] |            *[local-name() = 'bibliography']/*[local-name() = 'clause'] |             *[local-name() = 'colophon'] |             *[local-name() = 'colophon']//*[local-name() = 'clause'] |             *[local-name()='sections']//*[local-name()='terms'] |             *[local-name()='sections']//*[local-name()='definitions'] |            *[local-name()='annex']//*[local-name()='definitions']" mode="linear_xml" name="clause_linear">
+
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="linear_xml"/>
+
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+
+			<xsl:if test="local-name() = 'foreword' or local-name() = 'introduction' or    local-name(..) = 'preface' or local-name(..) = 'sections' or     (local-name() = 'references' and parent::*[local-name() = 'bibliography']) or    (local-name() = 'clause' and parent::*[local-name() = 'bibliography']) or    local-name() = 'annex' or     local-name(..) = 'annex' or    local-name(..) = 'colophon'">
+				<xsl:attribute name="mainsection">true</xsl:attribute>
+			</xsl:if>
+		</xsl:copy>
+
+		<xsl:apply-templates mode="linear_xml"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'term']" mode="linear_xml" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="linear_xml"/>
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel"/>
+			</xsl:variable>
+			<xsl:attribute name="depth"><xsl:value-of select="$level"/></xsl:attribute>
+			<xsl:attribute name="ancestor">sections</xsl:attribute>
+			<xsl:apply-templates select="node()[not(local-name() = 'term')]" mode="linear_xml"/>
+		</xsl:copy>
+		<xsl:apply-templates select="*[local-name() = 'term']" mode="linear_xml"/>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'introduction']//*[local-name() = 'title'] |     *[local-name() = 'foreword']//*[local-name() = 'title'] |     *[local-name() = 'sections']//*[local-name() = 'title'] |     *[local-name() = 'annex']//*[local-name() = 'title'] |     *[local-name() = 'bibliography']/*[local-name() = 'clause']/*[local-name() = 'title'] |     *[local-name() = 'references']/*[local-name() = 'title'] |     *[local-name() = 'colophon']//*[local-name() = 'title']" mode="linear_xml" priority="2">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="linear_xml"/>
+
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+
+			<xsl:variable name="level">
+				<xsl:call-template name="getLevel"/>
+			</xsl:variable>
+			<xsl:attribute name="depth"><xsl:value-of select="$level"/></xsl:attribute>
+
+			<xsl:if test="parent::*[local-name() = 'annex']">
+				<xsl:attribute name="depth">1</xsl:attribute>
+			</xsl:if>
+
+			<xsl:if test="../@inline-header = 'true' and following-sibling::*[1][local-name() = 'p']">
+				<xsl:copy-of select="../@inline-header"/>
+			</xsl:if>
+
+			<xsl:attribute name="ancestor">
+				<xsl:choose>
+					<xsl:when test="ancestor::*[local-name() = 'foreword']">foreword</xsl:when>
+					<xsl:when test="ancestor::*[local-name() = 'introduction']">introduction</xsl:when>
+					<xsl:when test="ancestor::*[local-name() = 'sections']">sections</xsl:when>
+					<xsl:when test="ancestor::*[local-name() = 'annex']">annex</xsl:when>
+					<xsl:when test="ancestor::*[local-name() = 'bibliography']">bibliography</xsl:when>
+				</xsl:choose>
+			</xsl:attribute>
+
+			<xsl:apply-templates mode="linear_xml"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<!-- add @to = figure, table, clause -->
+	<!-- add @depth = from  -->
+	<xsl:template match="*[local-name() = 'xref']" mode="linear_xml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="linear_xml"/>
+			<xsl:variable name="target" select="@target"/>
+			<xsl:attribute name="to">
+				<xsl:value-of select="local-name(//*[@id = current()/@target][1])"/>
+			</xsl:attribute>
+			<xsl:attribute name="depth">
+				<xsl:value-of select="//*[@id = current()/@target][1]/*[local-name() = 'title']/@depth"/>
+			</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="linear_xml"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[not(ancestor::*[local-name() = 'sourcecode'])]/*[local-name() = 'p' or local-name() = 'strong' or local-name() = 'em']/text()" mode="linear_xml">
+		<xsl:choose>
+			<xsl:when test="contains(., $non_breaking_hyphen)">
+				<xsl:call-template name="replaceChar">
+					<xsl:with-param name="text" select="."/>
+					<xsl:with-param name="replace" select="$non_breaking_hyphen"/>
+					<xsl:with-param name="by" select="'-'"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="replaceChar">
+		<xsl:param name="text"/>
+		<xsl:param name="replace"/>
+		<xsl:param name="by"/>
+		<xsl:choose>
+			<xsl:when test="$text = '' or $replace = '' or not($replace)">
+				<xsl:value-of select="$text"/>
+			</xsl:when>
+			<xsl:when test="contains($text, $replace)">
+				<xsl:value-of select="substring-before($text,$replace)"/>
+				<xsl:element name="inlineChar" namespace="https://www.metanorma.org/ns/jis"><xsl:value-of select="$by"/></xsl:element>
+				<xsl:call-template name="replaceChar">
+						<xsl:with-param name="text" select="substring-after($text,$replace)"/>
+						<xsl:with-param name="replace" select="$replace"/>
+						<xsl:with-param name="by" select="$by"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$text"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'inlineChar']">
+		<fo:inline><xsl:value-of select="."/></fo:inline>
+	</xsl:template>
+
+	<!-- change @reference to actual value, and add skip_footnote_body="true" for repeatable (2nd, 3rd, ...) -->
+	<!--
+	<fn reference="1">
+			<p id="_8e5cf917-f75a-4a49-b0aa-1714cb6cf954">Formerly denoted as 15 % (m/m).</p>
+		</fn>
+	-->
+	<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"/>
+		</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::*[contains(local-name(), '-standard')]/*[local-name()='bibdata']//*[local-name()='language'][@current = 'true']"/>
+		<xsl:variable name="reference" select="@reference"/>
+		<!-- fn sequence number in document -->
+		<xsl:variable name="current_fn_number" select="count($p_fn//fn[@reference = $reference]/preceding-sibling::fn) + 1"/>
+
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="linear_xml"/>
+			<!-- put actual reference number -->
+			<xsl:attribute name="current_fn_number">
+				<xsl:value-of select="$current_fn_number"/>
+			</xsl:attribute>
+			<xsl:attribute name="skip_footnote_body"> <!-- false for repeatable footnote -->
+				<xsl:value-of select="not($p_fn//fn[@gen_id = $gen_id] and (1 = 1))"/>
+			</xsl:attribute>
+			<xsl:apply-templates select="node()" mode="linear_xml"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'p'][@type = 'section-title']" priority="3" mode="linear_xml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="linear_xml"/>
+			<xsl:if test="@depth = '1'">
+				<xsl:attribute name="mainsection">true</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates select="node()" mode="linear_xml"/>
+		</xsl:copy>
+	</xsl:template>
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+	<!-- END: Make linear XML (need for landscape orientation) -->
+	<!-- ===================================== -->
+	<!-- ===================================== -->
+
 	<!-- for correct rendering combining chars -->
 	<xsl:template match="*[local-name() = 'lang_none']">
 		<fo:inline xml:lang="none"><xsl:value-of select="."/></fo:inline>
@@ -11144,6 +11575,23 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template name="setBlockAttributes">
+		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:call-template name="setTextAlignment">
+			<xsl:with-param name="default" select="$text_align_default"/>
+		</xsl:call-template>
+
+		<!-- https://www.metanorma.org/author/topics/document-format/text/#avoiding-page-breaks -->
+		<!-- Example: keep-lines-together="true" -->
+		<xsl:if test="@keep-lines-together = 'true'">
+			<xsl:attribute name="keep-together.within-column">always</xsl:attribute>
+		</xsl:if>
+		<!-- Example: keep-with-next="true" -->
+		<xsl:if test="@keep-with-next =  'true'">
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<xsl:template name="number-to-words">
 		<xsl:param name="number"/>
 		<xsl:param name="first"/>