RubyGems - metanorma-itu - Versions diffs - 2.0.2 → 2.0.5 - Mend

metanorma-itu 2.0.2 → 2.0.5

Files changed (25) hide show

checksums.yaml +4 -4
data/lib/isodoc/itu/html/itu.css +8 -2
data/lib/isodoc/itu/html/itu.scss +7 -1
data/lib/isodoc/itu/html/word_itu_titlepage_sp.html +4 -3
data/lib/isodoc/itu/html/wordstyle.css +28 -8
data/lib/isodoc/itu/html/wordstyle.scss +27 -8
data/lib/isodoc/itu/itu.implementers-guide.xsl +1189 -357
data/lib/isodoc/itu/itu.in-force.xsl +1189 -357
data/lib/isodoc/itu/itu.recommendation-annex.xsl +1189 -357
data/lib/isodoc/itu/itu.recommendation-supplement.xsl +1189 -357
data/lib/isodoc/itu/itu.recommendation.xsl +1189 -357
data/lib/isodoc/itu/itu.resolution.xsl +1189 -357
data/lib/isodoc/itu/itu.service-publication.xsl +1189 -357
data/lib/isodoc/itu/itu.technical-paper.xsl +1189 -357
data/lib/isodoc/itu/itu.technical-report.xsl +1189 -357
data/lib/isodoc/itu/metadata.rb +25 -24
data/lib/isodoc/itu/presentation_xml_convert.rb +13 -0
data/lib/isodoc/itu/ref.rb +28 -18
data/lib/isodoc/itu/word_convert.rb +22 -17
data/lib/isodoc/itu/xref_section.rb +12 -6
data/lib/metanorma/itu/basicdoc.rng +5 -3
data/lib/metanorma/itu/biblio.rng +5 -3
data/lib/metanorma/itu/isodoc.rng +73 -3
data/lib/metanorma/itu/version.rb +1 -1
metadata +2 -2

data/lib/isodoc/itu/itu.recommendation-annex.xsl CHANGED Viewed

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
-	<xsl:param name="svg_images"/>
-	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
-	<xsl:variable name="images" select="document($svg_images)"/>
-	<xsl:param name="basepath"/>
@@ -15,11 +10,6 @@
 	<xsl:variable name="debug">false</xsl:variable>
-	<xsl:variable name="marginLeftRight1" select="20"/>
-	<xsl:variable name="marginLeftRight2" select="20"/>
-	<xsl:variable name="marginTop" select="20"/>
-	<xsl:variable name="marginBottom" select="20"/>
 	<!-- Rec. ITU-T G.650.1 (03/2018) -->
 	<xsl:variable name="footerprefix" select="'Rec. '"/>
 	<xsl:variable name="docname">
@@ -46,7 +36,7 @@
 		<item level="1" id="Foreword" display="true">Foreword</item>
 		<item id="term-script" display="false">3.2</item>
 	-->
-	<xsl:variable name="contents">
+	<xsl:variable name="contents_">
 		<contents>
 			<!-- <xsl:apply-templates select="/itu:itu-standard/itu:preface/node()" mode="contents"/> -->
 			<xsl:apply-templates select="/itu:itu-standard/itu:sections/itu:clause[@type='scope']" mode="contents"/> <!-- @id = 'scope' -->
@@ -63,12 +53,12 @@
 			<xsl:apply-templates select="//itu:table" mode="contents"/>
+			<xsl:call-template name="processTablesFigures_Contents">
+				<xsl:with-param name="always" select="$doctype = 'technical-report' or $doctype = 'technical-paper'"/>
+			</xsl:call-template>
 		</contents>
 	</xsl:variable>
-	<xsl:variable name="lang">
-		<xsl:call-template name="getLang"/>
-	</xsl:variable>
+	<xsl:variable name="contents" select="xalan:nodeset($contents_)"/>
 	<xsl:variable name="doctypeTitle">
 		<xsl:choose>
@@ -987,11 +977,11 @@
 					<xsl:if test="$debug = 'true'">
 						<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
 							DEBUG
-							contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
+							contents=<xsl:copy-of select="$contents"/>
 						<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
 					</xsl:if>
-					<xsl:if test="xalan:nodeset($contents)//item[@display = 'true'] and $doctype != 'resolution' and $doctype != 'service-publication'">
+					<xsl:if test="$contents//item[@display = 'true'] and $doctype != 'resolution' and $doctype != 'service-publication'">
 						<fo:block break-after="page"/>
 							<fo:block-container>
 								<fo:block role="TOC">
@@ -1006,7 +996,7 @@
 									</xsl:call-template>
 								</fo:block>
-								<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']">
+								<xsl:for-each select="$contents//item[@display = 'true']">
 									<fo:block role="TOCI">
 										<xsl:if test="@level = 1">
 											<xsl:attribute name="margin-top">6pt</xsl:attribute>
@@ -1059,72 +1049,42 @@
 									</fo:block>
 								</xsl:for-each>
-							<xsl:if test="$doctype = 'technical-report' or $doctype = 'technical-paper'">
-								<xsl:if test="//itu:table[@id and itu:name]">
-									<xsl:variable name="title-list-tables">
-										<xsl:call-template name="getTitle">
-											<xsl:with-param name="name" select="'title-list-tables'"/>
-										</xsl:call-template>
-									</xsl:variable>
-									<fo:block space-before="36pt" text-align="center" font-weight="bold" keep-with-next="always">
-										<xsl:value-of select="$title-list-tables"/>
-									</fo:block>
+								<!-- List of Tables -->
+								<xsl:if test="$contents//tables/table">
+									<xsl:call-template name="insertListOf_Title">
+										<xsl:with-param name="title" select="$title-list-tables"/>
+									</xsl:call-template>
 									<fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">Page.sg</xsl:with-param>
 										</xsl:call-template>
 									</fo:block>
 									<fo:block-container>
-										<xsl:for-each select="//itu:table[@id and itu:name]">
-											<fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
-												<fo:basic-link internal-destination="{@id}" fox:alt-text="{itu:name}">
-													<xsl:apply-templates select="itu:name" mode="contents"/>
-													<fo:inline keep-together.within-line="always">
-														<fo:leader leader-pattern="dots"/>
-														<fo:page-number-citation ref-id="{@id}"/>
-													</fo:inline>
-												</fo:basic-link>
-											</fo:block>
+										<xsl:for-each select="$contents//tables/table">
+											<xsl:call-template name="insertListOf_Item"/>
 										</xsl:for-each>
-									</fo:block-container>
+									</fo:block-container>
 								</xsl:if>
-								<xsl:if test="//itu:figure[@id and itu:name]">
-									<xsl:variable name="title-list-figures">
-										<xsl:call-template name="getTitle">
-											<xsl:with-param name="name" select="'title-list-figures'"/>
-										</xsl:call-template>
-									</xsl:variable>
-									<fo:block space-before="36pt" text-align="center" font-weight="bold" keep-with-next="always">
-										<xsl:value-of select="$title-list-figures"/>
-									</fo:block>
+								<!-- List of Figures -->
+								<xsl:if test="$contents//figures/figure">
+									<xsl:call-template name="insertListOf_Title">
+										<xsl:with-param name="title" select="$title-list-figures"/>
+									</xsl:call-template>
 									<fo:block margin-top="6pt" text-align="end" font-weight="bold" keep-with-next="always">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">Page.sg</xsl:with-param>
 										</xsl:call-template>
 									</fo:block>
 									<fo:block-container>
-										<xsl:for-each select="//itu:figure[@id and itu:name]">
-											<fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
-												<fo:basic-link internal-destination="{@id}" fox:alt-text="{itu:name}">
-													<xsl:apply-templates select="itu:name" mode="contents"/>
-													<fo:inline keep-together.within-line="always">
-														<fo:leader leader-pattern="dots"/>
-														<fo:page-number-citation ref-id="{@id}"/>
-													</fo:inline>
-												</fo:basic-link>
-											</fo:block>
+										<xsl:for-each select="$contents//figures/figure">
+											<xsl:call-template name="insertListOf_Item"/>
 										</xsl:for-each>
-									</fo:block-container>
+									</fo:block-container>
 								</xsl:if>
-							</xsl:if>
-						</fo:block>
+							</fo:block>
 						</fo:block-container>
 					</xsl:if>
@@ -1222,6 +1182,28 @@
 		</fo:root>
 	</xsl:template>
+	<xsl:template name="insertListOf_Title">
+		<xsl:param name="title"/>
+		<fo:block space-before="36pt" text-align="center" font-weight="bold" keep-with-next="always">
+			<xsl:value-of select="$title"/>
+		</fo:block>
+	</xsl:template>
+	<xsl:template name="insertListOf_Item">
+		<fo:block text-align-last="justify" margin-top="6pt" role="TOCI">
+			<fo:basic-link internal-destination="{@id}">
+				<xsl:call-template name="setAltText">
+					<xsl:with-param name="value" select="@alt-text"/>
+				</xsl:call-template>
+				<xsl:apply-templates select="." mode="contents"/>
+				<fo:inline keep-together.within-line="always">
+					<fo:leader leader-pattern="dots"/>
+					<fo:page-number-citation ref-id="{@id}"/>
+				</fo:inline>
+			</fo:basic-link>
+		</fo:block>
+	</xsl:template>
 	<xsl:template match="node()">
 		<xsl:apply-templates/>
 	</xsl:template>
@@ -1296,46 +1278,6 @@
 	<xsl:template match="itu:references" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 	</xsl:template>
-	<xsl:template name="getListItemFormat">
-		<xsl:variable name="level">
-			<xsl:variable name="numtmp">
-				<xsl:number level="multiple" count="itu:ol"/>
-			</xsl:variable>
-			<!-- level example: 1.1
-				calculate counts of '.' in numtmp value - level of nested lists
-			-->
-			<xsl:value-of select="string-length($numtmp) - string-length(translate($numtmp, '.', '')) + 1"/>
-		</xsl:variable>
-		<xsl:choose>
-			<xsl:when test="local-name(..) = 'ul' and itu:ul and local-name(../../..) != 'ul'">•</xsl:when> <!-- dash &#x2014; -->
-			<xsl:when test="local-name(..) = 'ul'">–</xsl:when> <!-- dash &#x2014; -->
-			<xsl:otherwise>
-				<!-- for Ordered Lists -->
-				<xsl:choose>
-					<xsl:when test="../@type = 'arabic'">
-						<xsl:number format="a)" lang="en"/>
-					</xsl:when>
-					<xsl:when test="../@class = 'steps'">
-						<xsl:number format="1)"/>
-					</xsl:when>
-					<xsl:when test="$level = 1">
-						<xsl:number format="a)" lang="en"/>
-					</xsl:when>
-					<xsl:when test="$level = 2">
-						<xsl:number format="i)"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- <xsl:number format="1.)"/> -->
-						<!-- https://github.com/metanorma/mn-native-pdf/issues/156 -->
-						<xsl:number format="1)"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
 	<!-- ============================= -->
@@ -1622,7 +1564,7 @@
 	</xsl:template>
-	<xsl:template match="itu:preferred">
+	<xsl:template match="itu:preferred" priority="2">
 		<!-- DEBUG need -->
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
@@ -1768,7 +1710,7 @@
 	<xsl:template match="itu:docidentifier"/>
-	<xsl:template match="itu:ul | itu:ol | itu:sections/itu:ul | itu:sections/itu:ol" mode="ul_ol">
+	<xsl:template match="itu:ul | itu:ol | itu:sections/itu:ul | itu:sections/itu:ol" mode="list" priority="2">
 		<xsl:if test="preceding-sibling::*[1][local-name() = 'title'] and $doctype != 'service-publication'">
 			<fo:block padding-top="-8pt" font-size="1pt"> </fo:block>
 		</xsl:if>
@@ -1804,7 +1746,7 @@
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="itu:li">
+	<xsl:template match="itu:li" priority="2">
 		<xsl:choose>
 			<xsl:when test="$doctype = 'service-publication'">
 				<fo:block id="{@id}">
@@ -1838,24 +1780,15 @@
 								<xsl:attribute name="{$attribute-margin}">18mm</xsl:attribute>
 							</xsl:if>
 							<xsl:if test="local-name(..) = 'ul'">
-								<xsl:attribute name="{$attribute-margin}">7mm</xsl:attribute><!-- 15mm -->
+								<xsl:attribute name="{$attribute-margin}">7mm</xsl:attribute>
 								<xsl:if test="ancestor::itu:table">
 									<xsl:attribute name="{$attribute-margin}">4.5mm</xsl:attribute>
 								</xsl:if>
-								<!-- <xsl:if test="count(ancestor::itu:ol) + count(ancestor::itu:ul) &gt; 1">
-									<xsl:attribute name="margin-left">7mm</xsl:attribute>
-								</xsl:if> -->
 							</xsl:if>
-							<!-- <xsl:if test="$doctype = 'service-publication'">
-								<xsl:attribute name="margin-left">0mm</xsl:attribute>
-								<xsl:attribute name="margin-right">0mm</xsl:attribute>
-							</xsl:if> -->
 							<fo:block-container margin-left="0mm" margin-right="0mm">
 								<fo:block>
-									<!-- <xsl:if test="$doctype = 'service-publication'">
-										<xsl:attribute name="start-indent">7mm</xsl:attribute>
-										<xsl:attribute name="text-indent">7mm</xsl:attribute>
-									</xsl:if> -->
 									<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
 									<xsl:apply-templates select="./itu:note"/>
 								</fo:block>
@@ -1921,27 +1854,7 @@
 		<xsl:apply-templates />
 	</xsl:template> -->
-	<xsl:template match="itu:formula/itu:stem">
-		<fo:table table-layout="fixed" width="100%">
-			<fo:table-column column-width="95%"/>
-			<fo:table-column column-width="5%"/>
-			<fo:table-body>
-				<fo:table-row>
-					<fo:table-cell display-align="center">
-						<fo:block text-align="center" margin-left="0mm">
-							<xsl:apply-templates/>
-						</fo:block>
-					</fo:table-cell>
-					<fo:table-cell display-align="center">
-						<fo:block text-align="right" margin-left="0mm">
-							<xsl:apply-templates select="../itu:name" mode="formula_number"/>
-						</fo:block>
-					</fo:table-cell>
-				</fo:table-row>
-			</fo:table-body>
-		</fo:table>
-	</xsl:template>
 	<xsl:template name="insertHeaderFooter">
@@ -2147,11 +2060,21 @@
 		</xsl:if>
 	</xsl:template>
-<xsl:variable name="pageWidth_">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
+		<xsl:call-template name="getLang"/>
+	</xsl:variable><xsl:variable name="pageWidth_">
 		210
 	</xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
 		297
-	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
+	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="marginLeftRight1_">
+		20
+	</xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
+		20
+	</xsl:variable><xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/><xsl:variable name="marginTop_">
+		20
+	</xsl:variable><xsl:variable name="marginTop" select="normalize-space($marginTop_)"/><xsl:variable name="marginBottom_">
+		20
+	</xsl:variable><xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/><xsl:variable name="titles_">
 		<title-edition lang="en">
@@ -2163,6 +2086,10 @@
 			<xsl:text>Édition </xsl:text>
 		</title-edition>
+		<title-edition lang="ru">
+			<xsl:text>Издание </xsl:text>
+		</title-edition>
 		<!-- These titles of Table of contents renders different than determined in localized-strings -->
 		<title-toc lang="en">
@@ -2177,7 +2104,7 @@
 					<xsl:text>Contents</xsl:text>
 		</title-toc>
 		<title-descriptors lang="en">Descriptors</title-descriptors>
 		<title-part lang="en">
@@ -2189,7 +2116,11 @@
-		</title-part>
+		</title-part>
+		<title-part lang="ru">
+		</title-part>
 		<title-part lang="zh">第 # 部分:</title-part>
 		<title-subpart lang="en">Sub-part #</title-subpart>
@@ -2205,13 +2136,38 @@
 		<title-summary lang="en">Summary</title-summary>
+		<title-continued lang="ru">(продолжение)</title-continued>
 		<title-continued lang="en">(continued)</title-continued>
 		<title-continued lang="fr">(continué)</title-continued>
-	</xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="bibdata">
+	</xsl:variable><xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="title-list-tables">
+		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
+		<xsl:value-of select="$toc_table_title"/>
+		<xsl:if test="normalize-space($toc_table_title) = ''">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-list-tables'"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:variable><xsl:variable name="title-list-figures">
+		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
+		<xsl:value-of select="$toc_figure_title"/>
+		<xsl:if test="normalize-space($toc_figure_title) = ''">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-list-figures'"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:variable><xsl:variable name="title-list-recommendations">
+		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
+		<xsl:value-of select="$toc_requirement_title"/>
+		<xsl:if test="normalize-space($toc_requirement_title) = ''">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-list-recommendations'"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:variable><xsl:variable name="bibdata">
 		<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']"/>
 		<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'localized-strings']"/>
-	</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
+	</xsl:variable><xsl:variable name="linebreak">&#8232;</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:variable name="non_breaking_hyphen">‑</xsl:variable><xsl:variable name="thin_space"> </xsl:variable><xsl:variable name="zero_width_space"></xsl:variable><xsl:variable name="en_dash">–</xsl:variable><xsl:template name="getTitle">
 		<xsl:param name="name"/>
 		<xsl:param name="lang"/>
 		<xsl:variable name="lang_">
@@ -2234,7 +2190,7 @@
 				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:attribute-set name="root-style">
@@ -2398,13 +2354,14 @@
 	</xsl:attribute-set><xsl:attribute-set name="example-name-style">
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -2769,7 +2726,8 @@
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">
-		<xsl:attribute name="role">BlockQuote</xsl:attribute>
+		<xsl:attribute name="margin-left">12mm</xsl:attribute>
+		<xsl:attribute name="margin-right">12mm</xsl:attribute>
@@ -2777,15 +2735,11 @@
 			<xsl:attribute name="margin-top">6pt</xsl:attribute>
-			<xsl:attribute name="margin-left">12mm</xsl:attribute>
-			<xsl:attribute name="margin-right">12mm</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="quote-source-style">
+		<xsl:attribute name="text-align">right</xsl:attribute>
-			<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="termsource-style">
@@ -2805,6 +2759,9 @@
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
+	</xsl:attribute-set><xsl:attribute-set name="term-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="figure-style">
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
@@ -2835,9 +2792,39 @@
 	</xsl:attribute-set><xsl:attribute-set name="formula-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="formula-stem-block-style">
+		<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
+		<xsl:attribute name="text-align">right</xsl:attribute>
+			<xsl:attribute name="margin-left">0mm</xsl:attribute>
-			<xsl:attribute name="margin-top">6pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="image-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2876,6 +2863,18 @@
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="preferred-block-style">
+	</xsl:attribute-set><xsl:attribute-set name="preferred-term-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="domain-style">
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
@@ -2892,13 +2891,19 @@
 	</xsl:attribute-set><xsl:variable name="color-added-text">
 		<xsl:text>rgb(0, 255, 0)</xsl:text>
 	</xsl:variable><xsl:attribute-set name="add-style">
-		<xsl:attribute name="color">red</xsl:attribute>
-		<xsl:attribute name="text-decoration">underline</xsl:attribute>
-		<!-- <xsl:attribute name="color">black</xsl:attribute>
-		<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
-		<xsl:attribute name="padding-top">1mm</xsl:attribute>
-		<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
-	</xsl:attribute-set><xsl:variable name="color-deleted-text">
+				<xsl:attribute name="color">red</xsl:attribute>
+				<xsl:attribute name="text-decoration">underline</xsl:attribute>
+				<!-- <xsl:attribute name="color">black</xsl:attribute>
+				<xsl:attribute name="background-color"><xsl:value-of select="$color-added-text"/></xsl:attribute>
+				<xsl:attribute name="padding-top">1mm</xsl:attribute>
+				<xsl:attribute name="padding-bottom">0.5mm</xsl:attribute> -->
+	</xsl:attribute-set><xsl:variable name="add-style">
+			<add-style xsl:use-attribute-sets="add-style"/>
+		</xsl:variable><xsl:template name="append_add-style">
+		<xsl:copy-of select="xalan:nodeset($add-style)/add-style/@*"/>
+	</xsl:template><xsl:variable name="color-deleted-text">
 		<xsl:text>red</xsl:text>
 	</xsl:variable><xsl:attribute-set name="del-style">
 		<xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute>
@@ -2911,6 +2916,33 @@
 	</xsl:attribute-set><xsl:attribute-set name="list-style">
+	</xsl:attribute-set><xsl:attribute-set name="list-item-style">
+	</xsl:attribute-set><xsl:attribute-set name="list-item-label-style">
+	</xsl:attribute-set><xsl:attribute-set name="list-item-body-style">
 	</xsl:attribute-set><xsl:attribute-set name="toc-style">
 		<xsl:attribute name="line-height">135%</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="fn-reference-style">
@@ -3192,15 +3224,148 @@
+	</xsl:attribute-set><xsl:attribute-set name="hljs-doctag">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-keyword">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-keyword">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-template-tag">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-template-variable">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-type">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-variable_and_language_">
+		<xsl:attribute name="color">#d73a49</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-title">
+		<xsl:attribute name="color">#6f42c1</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class_">
+		<xsl:attribute name="color">#6f42c1</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-title_and_class__and_inherited__">
+		<xsl:attribute name="color">#6f42c1</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-title_and_function_">
+		<xsl:attribute name="color">#6f42c1</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-attr">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-attribute">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-literal">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-meta">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-number">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-operator">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-variable">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-selector-attr">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-selector-class">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-selector-id">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-regexp">
+		<xsl:attribute name="color">#032f62</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-string">
+		<xsl:attribute name="color">#032f62</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-meta_hljs-string">
+		<xsl:attribute name="color">#032f62</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-built_in">
+		<xsl:attribute name="color">#e36209</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-symbol">
+		<xsl:attribute name="color">#e36209</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-comment">
+		<xsl:attribute name="color">#6a737d</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-code">
+		<xsl:attribute name="color">#6a737d</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-formula">
+		<xsl:attribute name="color">#6a737d</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-name">
+		<xsl:attribute name="color">#22863a</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-quote">
+		<xsl:attribute name="color">#22863a</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-selector-tag">
+		<xsl:attribute name="color">#22863a</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-selector-pseudo">
+		<xsl:attribute name="color">#22863a</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-subst">
+		<xsl:attribute name="color">#24292e</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-section">
+		<xsl:attribute name="color">#005cc5</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-bullet">
+		<xsl:attribute name="color">#735c0f</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-emphasis">
+		<xsl:attribute name="color">#24292e</xsl:attribute>
+		<xsl:attribute name="font-style">italic</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-strong">
+		<xsl:attribute name="color">#24292e</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-addition">
+		<xsl:attribute name="color">#22863a</xsl:attribute>
+		<xsl:attribute name="background-color">#f0fff4</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-deletion">
+		<xsl:attribute name="color">#b31d28</xsl:attribute>
+		<xsl:attribute name="background-color">#ffeef0</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="hljs-char_and_escape_">
+	</xsl:attribute-set><xsl:attribute-set name="hljs-link">
+	</xsl:attribute-set><xsl:attribute-set name="hljs-params">
+	</xsl:attribute-set><xsl:attribute-set name="hljs-property">
+	</xsl:attribute-set><xsl:attribute-set name="hljs-punctuation">
+	</xsl:attribute-set><xsl:attribute-set name="hljs-tag">
+	</xsl:attribute-set><xsl:attribute-set name="indexsect-title-style">
+		<xsl:attribute name="role">H1</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="indexsect-clause-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
+		<xsl:variable name="nodes_preface_">
+			<xsl:for-each select="/*/*[local-name()='preface']/*">
+				<node id="{@id}"/>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
 		<xsl:for-each select="/*/*[local-name()='preface']/*">
 			<xsl:sort select="@displayorder" data-type="number"/>
+			<!-- process Section's title -->
+			<xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
+			<xsl:if test="$preceding-sibling_id != ''">
+				<xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="contents_no_displayorder"/>
+			</xsl:if>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
 	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+		<xsl:variable name="nodes_sections_">
+			<xsl:for-each select="/*/*[local-name()='sections']/*">
+				<node id="{@id}"/>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
 		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] |    /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
 			<xsl:sort select="@displayorder" data-type="number"/>
+			<!-- process Section's title -->
+			<xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
+			<xsl:if test="$preceding-sibling_id != ''">
+				<xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="contents_no_displayorder"/>
+			</xsl:if>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
@@ -3213,6 +3378,30 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
+	</xsl:template><xsl:template name="processTablesFigures_Contents">
+		<xsl:param name="always"/>
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+			<xsl:call-template name="processTables_Contents"/>
+		</xsl:if>
+		<xsl:if test="(//*[contains(local-name(), '-standard')]/*[local-name() = 'misc-container']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']) or normalize-space($always) = 'true'">
+			<xsl:call-template name="processFigures_Contents"/>
+		</xsl:if>
+	</xsl:template><xsl:template name="processTables_Contents">
+		<tables>
+			<xsl:for-each select="//*[local-name() = 'table'][@id and *[local-name() = 'name'] and normalize-space(@id) != '']">
+				<table id="{@id}" alt-text="{*[local-name() = 'name']}">
+					<xsl:copy-of select="*[local-name() = 'name']"/>
+				</table>
+			</xsl:for-each>
+		</tables>
+	</xsl:template><xsl:template name="processFigures_Contents">
+		<figures>
+			<xsl:for-each select="//*[local-name() = 'figure'][@id and *[local-name() = 'name'] and not(@unnumbered = 'true') and normalize-space(@id) != ''] | //*[@id and starts-with(*[local-name() = 'name'], 'Figure ') and normalize-space(@id) != '']">
+				<figure id="{@id}" alt-text="{*[local-name() = 'name']}">
+					<xsl:copy-of select="*[local-name() = 'name']"/>
+				</figure>
+			</xsl:for-each>
+		</figures>
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/*[local-name()='preface']/*">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -3287,9 +3476,12 @@
 	</xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='p']">
+		<xsl:param name="margin"/>
 				<!-- process in the template 'paragraph' -->
-				<xsl:call-template name="paragraph"/>
+				<xsl:call-template name="paragraph">
+					<xsl:with-param name="margin" select="$margin"/>
+				</xsl:call-template>
 	</xsl:template><xsl:template match="*[local-name()='feedback-statement']">
 		<fo:block xsl:use-attribute-sets="feedback-statement-style">
@@ -3301,9 +3493,12 @@
 				<xsl:call-template name="title"/>
 	</xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='p']">
+		<xsl:param name="margin"/>
 				<!-- process in the template 'paragraph' -->
-				<xsl:call-template name="paragraph"/>
+				<xsl:call-template name="paragraph">
+					<xsl:with-param name="margin" select="$margin"/>
+				</xsl:call-template>
 	</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
 		<!-- <xsl:call-template name="add-zero-spaces"/> -->
@@ -3346,7 +3541,7 @@
 					</xsl:call-template>
 				</xsl:if>
 			</xsl:variable>
-			<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
+			<!-- DEBUG colwidths=<xsl:copy-of select="$colwidths"/> -->
 			<xsl:variable name="margin-side">
@@ -3614,7 +3809,7 @@
 									<!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', '    ')"/> -->
 									<!-- 2009 thinspace -->
 									<!-- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', '    ')"/> -->
-									<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '', ' '))"/>
+									<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '', '  '))"/> <!-- replace zero-width-space and soft-hyphen to space -->
 								</xsl:call-template>
 							</xsl:variable>
 							<xsl:variable name="max_length">
@@ -3655,8 +3850,7 @@
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template match="text()" mode="td_text">
-		<xsl:variable name="zero-space"></xsl:variable>
-		<xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
+		<xsl:value-of select="translate(., $zero_width_space, ' ')"/><xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
 		<xsl:value-of select="*[local-name()='origin']/@citeas"/>
 	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
@@ -4047,37 +4241,7 @@
 		<!-- list of footnotes to calculate actual footnotes number -->
 		<xsl:variable name="p_fn_">
-			<xsl:choose>
-				<xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
-					<fn gen_id="{generate-id(.)}">
-						<xsl:copy-of select="@*"/>
-						<xsl:copy-of select="node()"/>
-					</fn>
-				</xsl:when>
-				<xsl:otherwise>
-					<!-- itetation for:
-					footnotes in bibdata/title
-					footnotes in bibliography
-					footnotes in document's body (except table's head/body/foot and figure text)
-					-->
-					<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
-						<fn gen_id="{generate-id(.)}">
-							<xsl:copy-of select="@*"/>
-							<xsl:copy-of select="node()"/>
-						</fn>
-					</xsl:for-each>
-					<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |        ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
-						<xsl:sort select="@displayorder" data-type="number"/>
-						<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |       .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][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:call-template name="get_fn_list"/>
 		</xsl:variable>
 		<xsl:variable name="p_fn" select="xalan:nodeset($p_fn_)"/>
@@ -4142,6 +4306,38 @@
 				<xsl:copy-of select="$footnote_inline"/>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="get_fn_list">
+		<xsl:choose>
+			<xsl:when test="@current_fn_number"> <!-- for BSI, footnote reference number calculated already -->
+				<fn gen_id="{generate-id(.)}">
+					<xsl:copy-of select="@*"/>
+					<xsl:copy-of select="node()"/>
+				</fn>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- itetation for:
+				footnotes in bibdata/title
+				footnotes in bibliography
+				footnotes in document's body (except table's head/body/foot and figure text)
+				-->
+				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']/*[local-name() = 'note'][@type='title-footnote']">
+					<fn gen_id="{generate-id(.)}">
+						<xsl:copy-of select="@*"/>
+						<xsl:copy-of select="node()"/>
+					</fn>
+				</xsl:for-each>
+				<xsl:for-each select="ancestor::*[contains(local-name(), '-standard')]/*[local-name()='preface']/* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='sections']/* |       ancestor::*[contains(local-name(), '-standard')]/*[local-name()='annex'] |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*">
+					<xsl:sort select="@displayorder" data-type="number"/>
+					<xsl:for-each select=".//*[local-name() = 'bibitem'][ancestor::*[local-name() = 'references']]/*[local-name() = 'note'] |      .//*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])][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><xsl:template name="table_fn_display">
 		<xsl:variable name="references">
@@ -4319,7 +4515,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='fn']/text()[normalize-space() != '']">
 		<fo:inline><xsl:value-of select="."/></fo:inline>
-	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
+	</xsl:template><xsl:template match="*[local-name()='fn']//*[local-name()='p']">
 		<fo:inline>
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -4698,20 +4894,44 @@
 		<fo:inline text-decoration="underline">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template match="*[local-name()='add']">
+	</xsl:template><xsl:template match="*[local-name()='add']" name="tag_add">
 		<xsl:param name="skip">true</xsl:param>
+		<xsl:param name="block">false</xsl:param>
+		<xsl:param name="type"/>
+		<xsl:param name="text-align"/>
 		<xsl:choose>
 			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
 				<xsl:choose>
-					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
+					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or      local-name(..) = 'formattedref' and not(preceding-sibling::node()))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
 					<xsl:otherwise>
-						<fo:inline>
+						<xsl:variable name="tag">
 							<xsl:call-template name="insertTag">
-								<xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
+								<xsl:with-param name="type">
+									<xsl:choose>
+										<xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
+										<xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
 								<xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
 								<xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
 							</xsl:call-template>
-						</fo:inline>
+						</xsl:variable>
+						<xsl:choose>
+							<xsl:when test="$block = 'false'">
+								<fo:inline>
+									<xsl:copy-of select="$tag"/>
+								</fo:inline>
+							</xsl:when>
+							<xsl:otherwise>
+								<fo:block> <!-- for around figures -->
+									<xsl:if test="$text-align != ''">
+										<xsl:attribute name="text-align"><xsl:value-of select="$text-align"/></xsl:attribute>
+									</xsl:if>
+									<xsl:copy-of select="$tag"/>
+								</fo:block>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
@@ -5070,17 +5290,21 @@
 		</xsl:apply-templates>
 	</xsl:template><xsl:template name="getLang">
 		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
-		<xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
 		<xsl:variable name="language">
 			<xsl:choose>
 				<xsl:when test="$language_current != ''">
 					<xsl:value-of select="$language_current"/>
 				</xsl:when>
-				<xsl:when test="$language_current_2 != ''">
-					<xsl:value-of select="$language_current_2"/>
-				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+					<xsl:variable name="language_current_2" select="normalize-space(xalan:nodeset($bibdata)//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
+					<xsl:choose>
+						<xsl:when test="$language_current_2 != ''">
+							<xsl:value-of select="$language_current_2"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+						</xsl:otherwise>
+					</xsl:choose>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -5283,6 +5507,9 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'xref']">
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+			<xsl:if test="parent::*[local-name() = 'add']">
+				<xsl:call-template name="append_add-style"/>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -5297,8 +5524,8 @@
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
-				<fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
-					<xsl:apply-templates/>
+				<fo:block id="{@id}">
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/> <!-- formula's number will be process in 'stem' template -->
 				</fo:block>
 			</fo:block-container>
 		</fo:block-container>
@@ -5310,23 +5537,56 @@
 		<fo:inline>
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
+	</xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"> <!-- show in 'stem' template -->
 		<xsl:if test="normalize-space() != ''">
 			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
+	</xsl:template><xsl:template match="*[local-name() = 'formula'][*[local-name() = 'name']]/*[local-name() = 'stem']">
+		<fo:block xsl:use-attribute-sets="formula-style">
+			<fo:table table-layout="fixed" width="100%">
+				<fo:table-column column-width="95%"/>
+				<fo:table-column column-width="5%"/>
+				<fo:table-body>
+					<fo:table-row>
+						<fo:table-cell display-align="center">
+							<fo:block xsl:use-attribute-sets="formula-stem-block-style">
+								<xsl:apply-templates/>
+							</fo:block>
+						</fo:table-cell>
+						<fo:table-cell display-align="center">
+							<fo:block xsl:use-attribute-sets="formula-stem-number-style">
+								<xsl:apply-templates select="../*[local-name() = 'name']"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'formula'][not(*[local-name() = 'name'])]/*[local-name() = 'stem']">
+		<fo:block xsl:use-attribute-sets="formula-style">
+			<fo:block xsl:use-attribute-sets="formula-stem-block-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
 			<fo:block-container margin-left="0mm">
@@ -5351,6 +5611,13 @@
+								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
+								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+									<xsl:call-template name="append_add-style"/>
+								</xsl:if>
 								<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
 								<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
 									<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
@@ -5389,6 +5656,12 @@
+				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
+				<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+					<xsl:call-template name="append_add-style"/>
+				</xsl:if>
 				<xsl:apply-templates select="*[local-name() = 'name']"/>
 			</fo:inline>
@@ -5442,6 +5715,7 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
@@ -5878,7 +6152,11 @@
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
-	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" priority="3" mode="contents"/><xsl:template match="*[local-name() = 'p'][@type = 'section-title' and not(@displayorder)]" mode="contents_no_displayorder">
+		<xsl:call-template name="contents_section-title"/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'section-title']" mode="contents_in_clause">
+		<xsl:call-template name="contents_section-title"/>
+	</xsl:template><xsl:template match="*[local-name() = 'clause']/*[local-name() = 'p'][@type = 'section-title' and (@depth != ../*[local-name() = 'title']/@depth or ../*[local-name() = 'title']/@depth = 1)]" priority="3" mode="contents"/><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" name="contents_section-title" mode="contents">
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel">
 				<xsl:with-param name="depth" select="@depth"/>
@@ -5947,13 +6225,14 @@
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
-		<xsl:if test="xalan:nodeset($contents)//item">
+		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
+		<xsl:if test="$contents_nodes//item">
 			<fo:bookmark-tree>
 				<xsl:choose>
-					<xsl:when test="xalan:nodeset($contents)/doc">
+					<xsl:when test="$contents_nodes/doc">
 						<xsl:choose>
-							<xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
-								<xsl:for-each select="xalan:nodeset($contents)/doc">
+							<xsl:when test="count($contents_nodes/doc) &gt; 1">
+								<xsl:for-each select="$contents_nodes/doc">
 									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
 										<xsl:if test="@bundle = 'true'">
 											<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
@@ -6004,7 +6283,7 @@
 								</xsl:for-each>
 							</xsl:when>
 							<xsl:otherwise>
-								<xsl:for-each select="xalan:nodeset($contents)/doc">
+								<xsl:for-each select="$contents_nodes/doc">
 									<xsl:apply-templates select="contents/item" mode="bookmark"/>
@@ -6022,25 +6301,36 @@
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:apply-templates select="xalan:nodeset($contents)/contents/item" mode="bookmark"/>
+						<xsl:apply-templates select="$contents_nodes/contents/item" mode="bookmark"/>
+						<xsl:call-template name="insertFigureBookmarks">
+							<xsl:with-param name="contents" select="$contents_nodes/contents"/>
+						</xsl:call-template>
+						<xsl:call-template name="insertTableBookmarks">
+							<xsl:with-param name="contents" select="$contents_nodes/contents"/>
+							<xsl:with-param name="lang" select="@lang"/>
+						</xsl:call-template>
 					</xsl:otherwise>
 				</xsl:choose>
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
 		<xsl:param name="contents"/>
-		<xsl:if test="xalan:nodeset($contents)/figure">
-			<fo:bookmark internal-destination="{xalan:nodeset($contents)/figure[1]/@id}" starting-state="hide">
+		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
+		<xsl:if test="$contents_nodes/figure">
+			<fo:bookmark internal-destination="{$contents_nodes/figure[1]/@id}" starting-state="hide">
 				<fo:bookmark-title>Figures</fo:bookmark-title>
-				<xsl:for-each select="xalan:nodeset($contents)/figure">
+				<xsl:for-each select="$contents_nodes/figure">
 					<fo:bookmark internal-destination="{@id}">
 						<fo:bookmark-title>
 							<xsl:value-of select="normalize-space(title)"/>
@@ -6049,18 +6339,40 @@
 				</xsl:for-each>
 			</fo:bookmark>
 		</xsl:if>
+				<xsl:if test="$contents_nodes//figures/figure">
+					<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
+						<xsl:variable name="bookmark-title">
+									<xsl:value-of select="$title-list-figures"/>
+						</xsl:variable>
+						<fo:bookmark-title><xsl:value-of select="normalize-space($bookmark-title)"/></fo:bookmark-title>
+						<xsl:for-each select="$contents_nodes//figures/figure">
+							<fo:bookmark internal-destination="{@id}">
+								<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
+							</fo:bookmark>
+						</xsl:for-each>
+					</fo:bookmark>
+				</xsl:if>
 	</xsl:template><xsl:template name="insertTableBookmarks">
 		<xsl:param name="contents"/>
 		<xsl:param name="lang"/>
-		<xsl:if test="xalan:nodeset($contents)/table">
-			<fo:bookmark internal-destination="{xalan:nodeset($contents)/table[1]/@id}" starting-state="hide">
+		<xsl:variable name="contents_nodes" select="xalan:nodeset($contents)"/>
+		<xsl:if test="$contents_nodes/table">
+			<fo:bookmark internal-destination="{$contents_nodes/table[1]/@id}" starting-state="hide">
 				<fo:bookmark-title>
 					<xsl:choose>
 						<xsl:when test="$lang = 'fr'">Tableaux</xsl:when>
 						<xsl:otherwise>Tables</xsl:otherwise>
 					</xsl:choose>
 				</fo:bookmark-title>
-				<xsl:for-each select="xalan:nodeset($contents)/table">
+				<xsl:for-each select="$contents_nodes/table">
 					<fo:bookmark internal-destination="{@id}">
 						<fo:bookmark-title>
 							<xsl:value-of select="normalize-space(title)"/>
@@ -6069,6 +6381,29 @@
 				</xsl:for-each>
 			</fo:bookmark>
 		</xsl:if>
+				<xsl:if test="$contents_nodes//tables/table">
+					<fo:bookmark internal-destination="empty_bookmark" starting-state="hide">
+						<xsl:variable name="bookmark-title">
+									<xsl:value-of select="$title-list-tables"/>
+						</xsl:variable>
+						<fo:bookmark-title><xsl:value-of select="$bookmark-title"/></fo:bookmark-title>
+						<xsl:for-each select="$contents_nodes//tables/table">
+							<fo:bookmark internal-destination="{@id}">
+								<fo:bookmark-title><xsl:value-of select="normalize-space(.)"/></fo:bookmark-title>
+							</fo:bookmark>
+						</xsl:for-each>
+					</fo:bookmark>
+				</xsl:if>
 	</xsl:template><xsl:template name="getLangVersion">
 		<xsl:param name="lang"/>
 		<xsl:param name="doctype" select="''"/>
@@ -6267,12 +6602,140 @@
 			</fo:block-container>
 		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
-		<xsl:variable name="text">
+		<xsl:choose>
+			<xsl:when test="normalize-space($syntax-highlight) = 'true' and normalize-space(../@lang) != ''"> <!-- condition for turn on of highlighting -->
+				<xsl:variable name="syntax" select="java:org.metanorma.fop.Util.syntaxHighlight(., ../@lang)"/>
+				<xsl:choose>
+					<xsl:when test="normalize-space($syntax) != ''"><!-- if there is highlighted result -->
+						<xsl:apply-templates select="xalan:nodeset($syntax)" mode="syntax_highlight"/> <!-- process span tags -->
+					</xsl:when>
+					<xsl:otherwise> <!-- if case of non-succesfull syntax highlight (for instance, unknown lang), process without highlighting -->
+						<xsl:call-template name="add_spaces_to_sourcecode"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="add_spaces_to_sourcecode">
+		<xsl:variable name="text_step1">
 			<xsl:call-template name="add-zero-spaces-equal"/>
 		</xsl:variable>
-		<xsl:call-template name="add-zero-spaces-java">
-			<xsl:with-param name="text" select="$text"/>
-		</xsl:call-template>
+		<xsl:variable name="text_step2">
+			<xsl:call-template name="add-zero-spaces-java">
+				<xsl:with-param name="text" select="$text_step1"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:value-of select="$text_step2"/>
+	</xsl:template><xsl:template match="*" mode="syntax_highlight">
+		<xsl:apply-templates mode="syntax_highlight"/>
+	</xsl:template><xsl:variable name="syntax_highlight_styles_">
+		<style class="hljs-addition" xsl:use-attribute-sets="hljs-addition"/>
+		<style class="hljs-attr" xsl:use-attribute-sets="hljs-attr"/>
+		<style class="hljs-attribute" xsl:use-attribute-sets="hljs-attribute"/>
+		<style class="hljs-built_in" xsl:use-attribute-sets="hljs-built_in"/>
+		<style class="hljs-bullet" xsl:use-attribute-sets="hljs-bullet"/>
+		<style class="hljs-char_and_escape_" xsl:use-attribute-sets="hljs-char_and_escape_"/>
+		<style class="hljs-code" xsl:use-attribute-sets="hljs-code"/>
+		<style class="hljs-comment" xsl:use-attribute-sets="hljs-comment"/>
+		<style class="hljs-deletion" xsl:use-attribute-sets="hljs-deletion"/>
+		<style class="hljs-doctag" xsl:use-attribute-sets="hljs-doctag"/>
+		<style class="hljs-emphasis" xsl:use-attribute-sets="hljs-emphasis"/>
+		<style class="hljs-formula" xsl:use-attribute-sets="hljs-formula"/>
+		<style class="hljs-keyword" xsl:use-attribute-sets="hljs-keyword"/>
+		<style class="hljs-link" xsl:use-attribute-sets="hljs-link"/>
+		<style class="hljs-literal" xsl:use-attribute-sets="hljs-literal"/>
+		<style class="hljs-meta" xsl:use-attribute-sets="hljs-meta"/>
+		<style class="hljs-meta_hljs-string" xsl:use-attribute-sets="hljs-meta_hljs-string"/>
+		<style class="hljs-meta_hljs-keyword" xsl:use-attribute-sets="hljs-meta_hljs-keyword"/>
+		<style class="hljs-name" xsl:use-attribute-sets="hljs-name"/>
+		<style class="hljs-number" xsl:use-attribute-sets="hljs-number"/>
+		<style class="hljs-operator" xsl:use-attribute-sets="hljs-operator"/>
+		<style class="hljs-params" xsl:use-attribute-sets="hljs-params"/>
+		<style class="hljs-property" xsl:use-attribute-sets="hljs-property"/>
+		<style class="hljs-punctuation" xsl:use-attribute-sets="hljs-punctuation"/>
+		<style class="hljs-quote" xsl:use-attribute-sets="hljs-quote"/>
+		<style class="hljs-regexp" xsl:use-attribute-sets="hljs-regexp"/>
+		<style class="hljs-section" xsl:use-attribute-sets="hljs-section"/>
+		<style class="hljs-selector-attr" xsl:use-attribute-sets="hljs-selector-attr"/>
+		<style class="hljs-selector-class" xsl:use-attribute-sets="hljs-selector-class"/>
+		<style class="hljs-selector-id" xsl:use-attribute-sets="hljs-selector-id"/>
+		<style class="hljs-selector-pseudo" xsl:use-attribute-sets="hljs-selector-pseudo"/>
+		<style class="hljs-selector-tag" xsl:use-attribute-sets="hljs-selector-tag"/>
+		<style class="hljs-string" xsl:use-attribute-sets="hljs-string"/>
+		<style class="hljs-strong" xsl:use-attribute-sets="hljs-strong"/>
+		<style class="hljs-subst" xsl:use-attribute-sets="hljs-subst"/>
+		<style class="hljs-symbol" xsl:use-attribute-sets="hljs-symbol"/>
+		<style class="hljs-tag" xsl:use-attribute-sets="hljs-tag"/>
+		<!-- <style class="hljs-tag_hljs-attr" xsl:use-attribute-sets="hljs-tag_hljs-attr"></style> -->
+		<!-- <style class="hljs-tag_hljs-name" xsl:use-attribute-sets="hljs-tag_hljs-name"></style> -->
+		<style class="hljs-template-tag" xsl:use-attribute-sets="hljs-template-tag"/>
+		<style class="hljs-template-variable" xsl:use-attribute-sets="hljs-template-variable"/>
+		<style class="hljs-title" xsl:use-attribute-sets="hljs-title"/>
+		<style class="hljs-title_and_class_" xsl:use-attribute-sets="hljs-title_and_class_"/>
+		<style class="hljs-title_and_class__and_inherited__" xsl:use-attribute-sets="hljs-title_and_class__and_inherited__"/>
+		<style class="hljs-title_and_function_" xsl:use-attribute-sets="hljs-title_and_function_"/>
+		<style class="hljs-type" xsl:use-attribute-sets="hljs-type"/>
+		<style class="hljs-variable" xsl:use-attribute-sets="hljs-variable"/>
+		<style class="hljs-variable_and_language_" xsl:use-attribute-sets="hljs-variable_and_language_"/>
+	</xsl:variable><xsl:variable name="syntax_highlight_styles" select="xalan:nodeset($syntax_highlight_styles_)"/><xsl:template match="span" mode="syntax_highlight" priority="2">
+		<!-- <fo:inline color="green" font-style="italic"><xsl:apply-templates mode="syntax_highlight"/></fo:inline> -->
+		<fo:inline>
+			<xsl:variable name="classes_">
+				<xsl:call-template name="split">
+					<xsl:with-param name="pText" select="@class"/>
+					<xsl:with-param name="sep" select="' '"/>
+				</xsl:call-template>
+				<!-- a few classes together (_and_ suffix) -->
+				<xsl:if test="contains(@class, 'hljs-char') and contains(@class, 'escape_')">
+					<item>hljs-char_and_escape_</item>
+				</xsl:if>
+				<xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_')">
+					<item>hljs-title_and_class_</item>
+				</xsl:if>
+				<xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'class_') and contains(@class, 'inherited__')">
+					<item>hljs-title_and_class__and_inherited__</item>
+				</xsl:if>
+				<xsl:if test="contains(@class, 'hljs-title') and contains(@class, 'function_')">
+					<item>hljs-title_and_function_</item>
+				</xsl:if>
+				<xsl:if test="contains(@class, 'hljs-variable') and contains(@class, 'language_')">
+					<item>hljs-variable_and_language_</item>
+				</xsl:if>
+				<!-- with parent classes (_ suffix) -->
+				<xsl:if test="contains(@class, 'hljs-keyword') and contains(ancestor::*/@class, 'hljs-meta')">
+					<item>hljs-meta_hljs-keyword</item>
+				</xsl:if>
+				<xsl:if test="contains(@class, 'hljs-string') and contains(ancestor::*/@class, 'hljs-meta')">
+					<item>hljs-meta_hljs-string</item>
+				</xsl:if>
+			</xsl:variable>
+			<xsl:variable name="classes" select="xalan:nodeset($classes_)"/>
+			<xsl:for-each select="$classes/item">
+				<xsl:variable name="class_name" select="."/>
+				<xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
+					<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
+				</xsl:for-each>
+			</xsl:for-each>
+			<!-- <xsl:variable name="class_name">
+				<xsl:choose>
+					<xsl:when test="@class = 'hljs-attr' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-attr</xsl:when>
+					<xsl:when test="@class = 'hljs-name' and ancestor::*/@class = 'hljs-tag'">hljs-tag_hljs-name</xsl:when>
+					<xsl:when test="@class = 'hljs-string' and ancestor::*/@class = 'hljs-meta'">hljs-meta_hljs-string</xsl:when>
+					<xsl:otherwise><xsl:value-of select="@class"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:for-each select="$syntax_highlight_styles/style[@class = $class_name]/@*[not(local-name() = 'class')]">
+				<xsl:attribute name="{local-name()}"><xsl:value-of select="."/></xsl:attribute>
+			</xsl:for-each> -->
+		<xsl:apply-templates mode="syntax_highlight"/></fo:inline>
+	</xsl:template><xsl:template match="text()" mode="syntax_highlight" priority="2">
+		<xsl:call-template name="add_spaces_to_sourcecode"/>
 	</xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="sourcecode-name-style">
@@ -6597,6 +7060,8 @@
 				</xsl:otherwise>
 			</xsl:choose> -->
 		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
+		<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">
 			<xsl:value-of select="."/>
@@ -6643,11 +7108,14 @@
 			<fo:block-container margin-left="0mm">
-				<fo:block xsl:use-attribute-sets="quote-style">
+				<fo:block-container xsl:use-attribute-sets="quote-style">
-					<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
-				</fo:block>
+					<fo:block-container margin-left="0mm" margin-right="0mm">
+						<fo:block role="BlockQuote">
+							<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
+						</fo:block>
+					</fo:block-container>
+				</fo:block-container>
 				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
 						<!-- — ISO, ISO 7301:2011, Clause 1 -->
@@ -6668,26 +7136,11 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:variable name="bibitem_hidden_">
-		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
-			<xsl:copy-of select="."/>
-		</xsl:for-each>
-		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
-			<xsl:copy-of select="."/>
-		</xsl:for-each>
-	</xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
-		<xsl:variable name="bibitemid">
-			<xsl:choose>
-				<!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
-				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
-				<xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
-				<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
+	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
+		<xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/>
 		<xsl:choose>
-			<xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
+			<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
 				<fo:inline xsl:use-attribute-sets="eref-style">
 					<xsl:if test="@type = 'footnote'">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -6701,8 +7154,8 @@
 					<xsl:variable name="text" select="normalize-space()"/>
-					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+					<fo:basic-link fox:alt-text="{@citeas}">
 						<xsl:if test="normalize-space(@citeas) = ''">
 							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
 						</xsl:if>
@@ -6712,14 +7165,21 @@
 						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$external-destination != ''"> <!-- external hyperlink -->
+								<xsl:attribute name="external-destination"><xsl:value-of select="$external-destination"/></xsl:attribute>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:attribute name="internal-destination"><xsl:value-of select="@bibitemid"/></xsl:attribute>
+							</xsl:otherwise>
+						</xsl:choose>
 						<xsl:apply-templates/>
 					</fo:basic-link>
 				</fo:inline>
 			</xsl:when>
-			<xsl:otherwise>
+			<xsl:otherwise> <!-- if there is key('bibitems_hidden', $current_bibitemid) -->
 				<fo:inline><xsl:apply-templates/></fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -6795,6 +7255,31 @@
 				<xsl:with-param name="count" select="$count - 1"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'preferred']">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:variable name="font-size">
+			inherit
+		</xsl:variable>
+		<xsl:variable name="levelTerm">
+			<xsl:call-template name="getLevelTermName"/>
+		</xsl:variable>
+		<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
+			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
+				<fo:block xsl:use-attribute-sets="term-name-style">
+					<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
+				</fo:block>
+			</xsl:if>
+			<fo:block xsl:use-attribute-sets="preferred-term-style">
+				<xsl:call-template name="setStyle_preferred"/>
+				<xsl:apply-templates/>
+			</fo:block>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'domain']">
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
 		<xsl:text> </xsl:text>
@@ -6889,22 +7374,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template><xsl:variable name="ul_labels_">
+				<label level="1">–</label>
+				<label level="2">•</label>
+				<label level="3" font-size="75%">o</label> <!-- white circle -->
 	</xsl:variable><xsl:variable name="ul_labels" select="xalan:nodeset($ul_labels_)"/><xsl:template name="setULLabel">
 		<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
 		<xsl:variable name="list_level">
@@ -6930,6 +7403,91 @@
 	</xsl:template><xsl:template match="label" mode="ul_labels">
 		<xsl:copy-of select="@*[not(local-name() = 'level')]"/>
 		<xsl:value-of select="."/>
+	</xsl:template><xsl:template name="getListItemFormat">
+		<!-- Example: for BSI <?list-type loweralpha?> -->
+		<xsl:variable name="processing_instruction_type" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-type'))"/>
+		<xsl:choose>
+			<xsl:when test="local-name(..) = 'ul'">
+				<xsl:choose>
+					<xsl:when test="normalize-space($processing_instruction_type) = 'simple'"/>
+					<xsl:otherwise><xsl:call-template name="setULLabel"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise> <!-- for ordered lists 'ol' -->
+				<!-- Example: for BSI <?list-start 2?> -->
+				<xsl:variable name="processing_instruction_start" select="normalize-space(../preceding-sibling::*[1]/processing-instruction('list-start'))"/>
+				<xsl:variable name="start_value">
+					<xsl:choose>
+						<xsl:when test="normalize-space($processing_instruction_start) != ''">
+							<xsl:value-of select="number($processing_instruction_start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
+						</xsl:when>
+						<xsl:when test="normalize-space(../@start) != ''">
+							<xsl:value-of select="number(../@start) - 1"/><!-- if start="3" then start_value=2 + xsl:number(1) = 3 -->
+						</xsl:when>
+						<xsl:otherwise>0</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:variable name="curr_value"><xsl:number/></xsl:variable>
+				<xsl:variable name="type">
+					<xsl:choose>
+						<xsl:when test="normalize-space($processing_instruction_type) != ''"><xsl:value-of select="$processing_instruction_type"/></xsl:when>
+						<xsl:when test="normalize-space(../@type) != ''"><xsl:value-of select="../@type"/></xsl:when>
+						<xsl:otherwise> <!-- if no @type or @class = 'steps' -->
+							<xsl:variable name="list_level_" select="count(ancestor::*[local-name() = 'ul']) + count(ancestor::*[local-name() = 'ol'])"/>
+							<xsl:variable name="list_level">
+								<xsl:choose>
+									<xsl:when test="$list_level_ &lt;= 5"><xsl:value-of select="$list_level_"/></xsl:when>
+									<xsl:otherwise><xsl:value-of select="$list_level_ mod 5"/></xsl:otherwise>
+								</xsl:choose>
+							</xsl:variable>
+							<xsl:choose>
+								<xsl:when test="$list_level mod 5 = 0">roman_upper</xsl:when> <!-- level 5 -->
+								<xsl:when test="$list_level mod 4 = 0">alphabet_upper</xsl:when> <!-- level 4 -->
+								<xsl:when test="$list_level mod 3 = 0">roman</xsl:when> <!-- level 3 -->
+								<xsl:when test="$list_level mod 2 = 0 and ancestor::*/@class = 'steps'">alphabet</xsl:when> <!-- level 2 and @class = 'steps'-->
+								<xsl:when test="$list_level mod 2 = 0">arabic</xsl:when> <!-- level 2 -->
+								<xsl:otherwise> <!-- level 1 -->
+									<xsl:choose>
+										<xsl:when test="ancestor::*/@class = 'steps'">arabic</xsl:when>
+										<xsl:otherwise>alphabet</xsl:otherwise>
+									</xsl:choose>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:variable name="format">
+					<xsl:choose>
+						<xsl:when test="$type = 'arabic'">
+							1)
+						</xsl:when>
+						<xsl:when test="$type = 'alphabet'">
+							a)
+						</xsl:when>
+						<xsl:when test="$type = 'alphabet_upper'">
+							A.
+						</xsl:when>
+						<xsl:when test="$type = 'roman'">
+							i)
+						</xsl:when>
+						<xsl:when test="$type = 'roman_upper'">I.</xsl:when>
+						<xsl:otherwise>1.</xsl:otherwise> <!-- for any case, if $type has non-determined value, not using -->
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:number value="$start_value + $curr_value" format="{normalize-space($format)}" lang="en"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
 			<xsl:when test="parent::*[local-name() = 'note'] or parent::*[local-name() = 'termnote']">
@@ -6945,18 +7503,71 @@
 					<fo:block-container margin-left="0mm">
 						<fo:block>
-							<xsl:apply-templates select="." mode="ul_ol"/>
+							<xsl:apply-templates select="." mode="list"/>
 						</fo:block>
 					</fo:block-container>
 				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block>
-					<xsl:apply-templates select="." mode="ul_ol"/>
+					<xsl:apply-templates select="." mode="list"/>
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
+	</xsl:template><xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="list" name="list">
+		<fo:list-block xsl:use-attribute-sets="list-style">
+			<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
+		</fo:list-block>
+		<!-- <xsl:for-each select="./iho:note">
+			<xsl:call-template name="note"/>
+		</xsl:for-each> -->
+		<xsl:apply-templates select="./*[local-name() = 'note']"/>
+	</xsl:template><xsl:template match="*[local-name()='li']">
+		<fo:list-item xsl:use-attribute-sets="list-item-style">
+			<xsl:copy-of select="@id"/>
+			<fo:list-item-label end-indent="label-end()">
+				<fo:block xsl:use-attribute-sets="list-item-label-style">
+					<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+					<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+						<xsl:call-template name="append_add-style"/>
+					</xsl:if>
+					<xsl:call-template name="getListItemFormat"/>
+				</fo:block>
+			</fo:list-item-label>
+			<fo:list-item-body start-indent="body-start()" xsl:use-attribute-sets="list-item-body-style">
+				<fo:block>
+					<xsl:apply-templates/>
+					<!-- <xsl:apply-templates select="node()[not(local-name() = 'note')]" />
+					<xsl:for-each select="./bsi:note">
+						<xsl:call-template name="note"/>
+					</xsl:for-each> -->
+				</fo:block>
+			</fo:list-item-body>
+		</fo:list-item>
+	</xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="bookmark_in_fn">
 		<xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
 			<bookmark><xsl:value-of select="@id"/></bookmark>
 		</xsl:for-each>
@@ -6978,7 +7589,7 @@
 		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
 		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
 		<xsl:if test="@to">
-			<xsl:value-of select="$dash"/>
+			<xsl:value-of select="$en_dash"/>
 			<xsl:copy>
 				<xsl:copy-of select="@*"/>
 				<xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
@@ -7003,7 +7614,7 @@
 		<xsl:param name="target"/>
 		<!-- <node></node> -->
 		<xsl:choose>
-			<xsl:when test="self::text()  and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
+			<xsl:when test="self::text()  and (normalize-space(.) = ',' or normalize-space(.) = $en_dash) and $remove = 'true'">
 				<!-- skip text (i.e. remove it) and process next element -->
 				<!-- [removed_<xsl:value-of select="."/>] -->
 				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
@@ -7087,12 +7698,22 @@
 		</xsl:variable>
 		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
 		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'title']" priority="4">
+		<fo:block xsl:use-attribute-sets="indexsect-title-style">
+			<!-- Index -->
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']/*[local-name() = 'title']" priority="4">
+		<!-- Letter A, B, C, ... -->
+		<fo:block xsl:use-attribute-sets="indexsect-clause-title-style">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
 		<xsl:apply-templates/>
 		<fo:block>
-		<xsl:if test="following-sibling::*[local-name() = 'clause']">
-			<fo:block> </fo:block>
-		</xsl:if>
+			<xsl:if test="following-sibling::*[local-name() = 'clause']">
+				<fo:block> </fo:block>
+			</xsl:if>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
 		<xsl:apply-templates/>
@@ -7102,6 +7723,9 @@
 			<xsl:apply-templates/>
 		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
+		<!-- to split by '_' and other chars -->
+		<xsl:call-template name="add-zero-spaces-java"/>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
 		<fo:inline id="{@id}" font-size="1pt"/>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
@@ -7316,23 +7940,45 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
+		<!-- list of footnotes to calculate actual footnotes number -->
+		<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']"/>
+		<!-- 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:value-of select="count($p_fn//fn[@gen_id = $gen_id]/preceding-sibling::fn) + 1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
 		<fo:footnote>
 			<xsl:variable name="number">
-						<xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
+						<xsl:value-of select="$current_fn_number"/>
 			</xsl:variable>
+			<xsl:variable name="current_fn_number_text">
+				<xsl:value-of select="$number"/>
+			</xsl:variable>
 			<fo:inline xsl:use-attribute-sets="bibitem-note-fn-style">
-				<fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
-					<xsl:value-of select="$number"/>
+				<fo:basic-link internal-destination="{$gen_id}" fox:alt-text="footnote {$number}">
+					<xsl:value-of select="$current_fn_number_text"/>
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block xsl:use-attribute-sets="bibitem-note-fn-body-style">
-					<fo:inline id="{generate-id()}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
-						<xsl:value-of select="$number"/>
+					<fo:inline id="{$gen_id}" xsl:use-attribute-sets="bibitem-note-fn-number-style">
+						<xsl:value-of select="$current_fn_number_text"/>
 					</fo:inline>
 					<xsl:apply-templates/>
 				</fo:block>
@@ -7458,7 +8104,7 @@
 				</fo:table-body>
 			</fo:table>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']" priority="2">
 		<fo:table-row min-height="5mm">
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -7578,6 +8224,78 @@
 					<xsl:apply-templates/>
 				</fo:block>
+	</xsl:template><xsl:template match="@*|node()" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'preface']" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:variable name="nodes_preface_">
+				<xsl:for-each select="*">
+					<node id="{@id}"/>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="nodes_preface" select="xalan:nodeset($nodes_preface_)"/>
+			<xsl:for-each select="*">
+				<xsl:sort select="@displayorder" data-type="number"/>
+				<!-- process Section's title -->
+				<xsl:variable name="preceding-sibling_id" select="$nodes_preface/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
+				<xsl:if test="$preceding-sibling_id != ''">
+					<xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
+				</xsl:if>
+				<xsl:choose>
+					<xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="." mode="update_xml_step1"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'sections']" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<xsl:variable name="nodes_sections_">
+				<xsl:for-each select="*">
+					<node id="{@id}"/>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="nodes_sections" select="xalan:nodeset($nodes_sections_)"/>
+			<!-- move section 'Normative references' inside 'sections' -->
+			<xsl:for-each select="* |      ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] |     ancestor::*[contains(local-name(), '-standard')]/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]">
+				<xsl:sort select="@displayorder" data-type="number"/>
+				<!-- process Section's title -->
+				<xsl:variable name="preceding-sibling_id" select="$nodes_sections/node[@id = current()/@id]/preceding-sibling::node[1]/@id"/>
+				<xsl:if test="$preceding-sibling_id != ''">
+					<xsl:apply-templates select="parent::*/*[@type = 'section-title' and @id = $preceding-sibling_id and not(@displayorder)]" mode="update_xml_step1"/>
+				</xsl:if>
+				<xsl:choose>
+					<xsl:when test="@type = 'section-title' and not(@displayorder)"><!-- skip, don't copy, because copied in above 'apply-templates' --></xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="." mode="update_xml_step1"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:for-each>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'bibliography']" mode="update_xml_step1">
+		<xsl:copy>
+			<xsl:copy-of select="@*"/>
+			<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
+			<xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
+				<xsl:sort select="@displayorder" data-type="number"/>
+				<xsl:apply-templates select="." mode="update_xml_step1"/>
+			</xsl:for-each>
+		</xsl:copy>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -7691,9 +8409,6 @@
 			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="addPDFUAmeta">
-		<xsl:variable name="lang">
-			<xsl:call-template name="getLang"/>
-		</xsl:variable>
 		<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
 				<pdf:dictionary type="normal" key="ViewerPreferences">
 					<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
@@ -7921,10 +8636,12 @@
 		<xsl:param name="key"/>
 		<xsl:param name="formatted">false</xsl:param>
 		<xsl:param name="lang"/>
+		<xsl:param name="returnEmptyIfNotFound">false</xsl:param>
 		<xsl:variable name="curr_lang">
 			<xsl:choose>
 				<xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
+				<xsl:when test="$returnEmptyIfNotFound = 'true'"/>
 				<xsl:otherwise>
 					<xsl:call-template name="getLang"/>
 				</xsl:otherwise>
@@ -7959,6 +8676,7 @@
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
+			<xsl:when test="$returnEmptyIfNotFound = 'true'"/>
 			<xsl:otherwise>
 				<xsl:variable name="key_">
 					<xsl:call-template name="capitalize">
@@ -8028,53 +8746,153 @@
 		<xsl:param name="first"/>
 		<xsl:if test="$number != ''">
 			<xsl:variable name="words">
-								<words>
-					<word cardinal="1">One-</word>
-					<word ordinal="1">First </word>
-					<word cardinal="2">Two-</word>
-					<word ordinal="2">Second </word>
-					<word cardinal="3">Three-</word>
-					<word ordinal="3">Third </word>
-					<word cardinal="4">Four-</word>
-					<word ordinal="4">Fourth </word>
-					<word cardinal="5">Five-</word>
-					<word ordinal="5">Fifth </word>
-					<word cardinal="6">Six-</word>
-					<word ordinal="6">Sixth </word>
-					<word cardinal="7">Seven-</word>
-					<word ordinal="7">Seventh </word>
-					<word cardinal="8">Eight-</word>
-					<word ordinal="8">Eighth </word>
-					<word cardinal="9">Nine-</word>
-					<word ordinal="9">Ninth </word>
-					<word ordinal="10">Tenth </word>
-					<word ordinal="11">Eleventh </word>
-					<word ordinal="12">Twelfth </word>
-					<word ordinal="13">Thirteenth </word>
-					<word ordinal="14">Fourteenth </word>
-					<word ordinal="15">Fifteenth </word>
-					<word ordinal="16">Sixteenth </word>
-					<word ordinal="17">Seventeenth </word>
-					<word ordinal="18">Eighteenth </word>
-					<word ordinal="19">Nineteenth </word>
-					<word cardinal="20">Twenty-</word>
-					<word ordinal="20">Twentieth </word>
-					<word cardinal="30">Thirty-</word>
-					<word ordinal="30">Thirtieth </word>
-					<word cardinal="40">Forty-</word>
-					<word ordinal="40">Fortieth </word>
-					<word cardinal="50">Fifty-</word>
-					<word ordinal="50">Fiftieth </word>
-					<word cardinal="60">Sixty-</word>
-					<word ordinal="60">Sixtieth </word>
-					<word cardinal="70">Seventy-</word>
-					<word ordinal="70">Seventieth </word>
-					<word cardinal="80">Eighty-</word>
-					<word ordinal="80">Eightieth </word>
-					<word cardinal="90">Ninety-</word>
-					<word ordinal="90">Ninetieth </word>
-					<word cardinal="100">Hundred-</word>
-					<word ordinal="100">Hundredth </word>
+				<words>
+					<xsl:choose>
+						<xsl:when test="$lang = 'fr'"> <!-- https://en.wiktionary.org/wiki/Appendix:French_numbers -->
+							<word cardinal="1">Une-</word>
+							<word ordinal="1">Première </word>
+							<word cardinal="2">Deux-</word>
+							<word ordinal="2">Seconde </word>
+							<word cardinal="3">Trois-</word>
+							<word ordinal="3">Tierce </word>
+							<word cardinal="4">Quatre-</word>
+							<word ordinal="4">Quatrième </word>
+							<word cardinal="5">Cinq-</word>
+							<word ordinal="5">Cinquième </word>
+							<word cardinal="6">Six-</word>
+							<word ordinal="6">Sixième </word>
+							<word cardinal="7">Sept-</word>
+							<word ordinal="7">Septième </word>
+							<word cardinal="8">Huit-</word>
+							<word ordinal="8">Huitième </word>
+							<word cardinal="9">Neuf-</word>
+							<word ordinal="9">Neuvième </word>
+							<word ordinal="10">Dixième </word>
+							<word ordinal="11">Onzième </word>
+							<word ordinal="12">Douzième </word>
+							<word ordinal="13">Treizième </word>
+							<word ordinal="14">Quatorzième </word>
+							<word ordinal="15">Quinzième </word>
+							<word ordinal="16">Seizième </word>
+							<word ordinal="17">Dix-septième </word>
+							<word ordinal="18">Dix-huitième </word>
+							<word ordinal="19">Dix-neuvième </word>
+							<word cardinal="20">Vingt-</word>
+							<word ordinal="20">Vingtième </word>
+							<word cardinal="30">Trente-</word>
+							<word ordinal="30">Trentième </word>
+							<word cardinal="40">Quarante-</word>
+							<word ordinal="40">Quarantième </word>
+							<word cardinal="50">Cinquante-</word>
+							<word ordinal="50">Cinquantième </word>
+							<word cardinal="60">Soixante-</word>
+							<word ordinal="60">Soixantième </word>
+							<word cardinal="70">Septante-</word>
+							<word ordinal="70">Septantième </word>
+							<word cardinal="80">Huitante-</word>
+							<word ordinal="80">Huitantième </word>
+							<word cardinal="90">Nonante-</word>
+							<word ordinal="90">Nonantième </word>
+							<word cardinal="100">Cent-</word>
+							<word ordinal="100">Centième </word>
+						</xsl:when>
+						<xsl:when test="$lang = 'ru'">
+							<word cardinal="1">Одна-</word>
+							<word ordinal="1">Первое </word>
+							<word cardinal="2">Две-</word>
+							<word ordinal="2">Второе </word>
+							<word cardinal="3">Три-</word>
+							<word ordinal="3">Третье </word>
+							<word cardinal="4">Четыре-</word>
+							<word ordinal="4">Четвертое </word>
+							<word cardinal="5">Пять-</word>
+							<word ordinal="5">Пятое </word>
+							<word cardinal="6">Шесть-</word>
+							<word ordinal="6">Шестое </word>
+							<word cardinal="7">Семь-</word>
+							<word ordinal="7">Седьмое </word>
+							<word cardinal="8">Восемь-</word>
+							<word ordinal="8">Восьмое </word>
+							<word cardinal="9">Девять-</word>
+							<word ordinal="9">Девятое </word>
+							<word ordinal="10">Десятое </word>
+							<word ordinal="11">Одиннадцатое </word>
+							<word ordinal="12">Двенадцатое </word>
+							<word ordinal="13">Тринадцатое </word>
+							<word ordinal="14">Четырнадцатое </word>
+							<word ordinal="15">Пятнадцатое </word>
+							<word ordinal="16">Шестнадцатое </word>
+							<word ordinal="17">Семнадцатое </word>
+							<word ordinal="18">Восемнадцатое </word>
+							<word ordinal="19">Девятнадцатое </word>
+							<word cardinal="20">Двадцать-</word>
+							<word ordinal="20">Двадцатое </word>
+							<word cardinal="30">Тридцать-</word>
+							<word ordinal="30">Тридцатое </word>
+							<word cardinal="40">Сорок-</word>
+							<word ordinal="40">Сороковое </word>
+							<word cardinal="50">Пятьдесят-</word>
+							<word ordinal="50">Пятидесятое </word>
+							<word cardinal="60">Шестьдесят-</word>
+							<word ordinal="60">Шестидесятое </word>
+							<word cardinal="70">Семьдесят-</word>
+							<word ordinal="70">Семидесятое </word>
+							<word cardinal="80">Восемьдесят-</word>
+							<word ordinal="80">Восьмидесятое </word>
+							<word cardinal="90">Девяносто-</word>
+							<word ordinal="90">Девяностое </word>
+							<word cardinal="100">Сто-</word>
+							<word ordinal="100">Сотое </word>
+						</xsl:when>
+						<xsl:otherwise> <!-- default english -->
+							<word cardinal="1">One-</word>
+							<word ordinal="1">First </word>
+							<word cardinal="2">Two-</word>
+							<word ordinal="2">Second </word>
+							<word cardinal="3">Three-</word>
+							<word ordinal="3">Third </word>
+							<word cardinal="4">Four-</word>
+							<word ordinal="4">Fourth </word>
+							<word cardinal="5">Five-</word>
+							<word ordinal="5">Fifth </word>
+							<word cardinal="6">Six-</word>
+							<word ordinal="6">Sixth </word>
+							<word cardinal="7">Seven-</word>
+							<word ordinal="7">Seventh </word>
+							<word cardinal="8">Eight-</word>
+							<word ordinal="8">Eighth </word>
+							<word cardinal="9">Nine-</word>
+							<word ordinal="9">Ninth </word>
+							<word ordinal="10">Tenth </word>
+							<word ordinal="11">Eleventh </word>
+							<word ordinal="12">Twelfth </word>
+							<word ordinal="13">Thirteenth </word>
+							<word ordinal="14">Fourteenth </word>
+							<word ordinal="15">Fifteenth </word>
+							<word ordinal="16">Sixteenth </word>
+							<word ordinal="17">Seventeenth </word>
+							<word ordinal="18">Eighteenth </word>
+							<word ordinal="19">Nineteenth </word>
+							<word cardinal="20">Twenty-</word>
+							<word ordinal="20">Twentieth </word>
+							<word cardinal="30">Thirty-</word>
+							<word ordinal="30">Thirtieth </word>
+							<word cardinal="40">Forty-</word>
+							<word ordinal="40">Fortieth </word>
+							<word cardinal="50">Fifty-</word>
+							<word ordinal="50">Fiftieth </word>
+							<word cardinal="60">Sixty-</word>
+							<word ordinal="60">Sixtieth </word>
+							<word cardinal="70">Seventy-</word>
+							<word ordinal="70">Seventieth </word>
+							<word cardinal="80">Eighty-</word>
+							<word ordinal="80">Eightieth </word>
+							<word cardinal="90">Ninety-</word>
+							<word ordinal="90">Ninetieth </word>
+							<word cardinal="100">Hundred-</word>
+							<word ordinal="100">Hundredth </word>
+						</xsl:otherwise>
+					</xsl:choose>
 				</words>
 			</xsl:variable>
@@ -8148,4 +8966,18 @@
 				<xsl:otherwise>_</xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
+	</xsl:template><xsl:template name="substring-after-last">
+		<xsl:param name="value"/>
+		<xsl:param name="delimiter"/>
+		<xsl:choose>
+			<xsl:when test="contains($value, $delimiter)">
+				<xsl:call-template name="substring-after-last">
+					<xsl:with-param name="value" select="substring-after($value, $delimiter)"/>
+					<xsl:with-param name="delimiter" select="$delimiter"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$value"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template></xsl:stylesheet>