RubyGems - metanorma-bipm - Versions diffs - 2.0.0.1 → 2.0.4 - Mend

metanorma-bipm 2.0.0.1 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

checksums.yaml +4 -4
data/lib/isodoc/bipm/base_convert.rb +9 -3
data/lib/isodoc/bipm/bipm.brochure.xsl +2279 -1659
data/lib/isodoc/bipm/bipm.guide.xsl +2279 -1659
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +2279 -1659
data/lib/isodoc/bipm/bipm.rapport.xsl +2279 -1659
data/lib/isodoc/bipm/html/htmlstyle.css +26 -19
data/lib/isodoc/bipm/html/htmlstyle.scss +8 -2
data/lib/isodoc/bipm/jcgm.standard.xsl +2068 -938
data/lib/isodoc/bipm/pdf_convert.rb +4 -4
data/lib/isodoc/bipm/xref.rb +4 -4
data/lib/metanorma/bipm/basicdoc.rng +5 -3
data/lib/metanorma/bipm/biblio.rng +7 -5
data/lib/metanorma/bipm/bipm.rng +1 -1
data/lib/metanorma/bipm/isodoc.rng +142 -4
data/lib/metanorma/bipm/version.rb +1 -1
data/metanorma-bipm.gemspec +2 -0
metadata +30 -2

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

@@ -2,14 +2,6 @@
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
-	<xsl:param name="svg_images"/>
-	<xsl:variable name="images" select="document($svg_images)"/>
-	<xsl:param name="basepath"/>
-	<!-- <item id="#">N_page</item> -->
-	<!-- param for second pass -->
-	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:param name="align-cross-elements"/>
@@ -85,14 +77,7 @@
 	<xsl:variable name="column_width" select="($page_width - $column_gap) div $docs_count"/>
 	<xsl:variable name="debug">false</xsl:variable>
-	<xsl:variable name="pageWidth" select="210"/>
-	<xsl:variable name="pageHeight" select="297"/>
-	<xsl:variable name="marginLeftRight1" select="25"/>
-	<xsl:variable name="marginLeftRight2" select="15"/>
-	<xsl:variable name="marginTop" select="29.5"/>
-	<xsl:variable name="marginBottom" select="23.5"/>
 	<xsl:variable name="all_rights_reserved">
 		<xsl:call-template name="getLocalizedString">
 			<xsl:with-param name="key">all_rights_reserved</xsl:with-param>
@@ -163,14 +148,9 @@
 			</xsl:for-each>
 		</xsl:for-each>
 	</xsl:variable>
-	<xsl:variable name="lang">
-		<xsl:call-template name="getLang"/>
-	</xsl:variable>
 	<xsl:template match="/">
 		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
 			<fo:layout-master-set>
@@ -558,9 +538,6 @@
 	<!-- ============================= -->
 	<!-- CONTENTS                                       -->
 	<!-- ============================= -->
-	<xsl:template match="node()" mode="contents">
-		<xsl:apply-templates mode="contents"/>
-	</xsl:template>
 	<!-- element with title -->
 	<xsl:template match="*[*[local-name()='title']]" mode="contents">
@@ -626,43 +603,6 @@
 	</xsl:template>
-	<xsl:template name="getListItemFormat">
-		<xsl:choose>
-			<xsl:when test="local-name(..) = 'ul'">
-				<xsl:call-template name="setULLabel"/>
-			</xsl:when>
-			<xsl:otherwise> <!-- for ordered lists -->
-				<xsl:variable name="start_value">
-					<xsl:choose>
-						<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="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>a)</xsl:otherwise>
-					</xsl:choose>
-				</xsl:variable>
-				<xsl:number value="$start_value + $curr_value" format="{$format}" lang="en"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
 	<xsl:template name="setListItemLabel">
 		<xsl:attribute name="label">
 			<xsl:call-template name="getListItemFormat"/>
@@ -678,7 +618,7 @@
-	<xsl:template match="*[local-name()='p']">
+	<xsl:template match="*[local-name()='p']" name="paragraph">
 		<xsl:param name="inline" select="'false'"/>
 		<xsl:variable name="previous-element" select="local-name(preceding-sibling::*[1])"/>
 		<xsl:variable name="element-name">
@@ -725,34 +665,6 @@
 		<xsl:apply-templates/>
 	</xsl:template>
-	<xsl:template match="*[local-name()='bibitem']">
-		<fo:block id="{@id}" margin-bottom="6pt">
-			<xsl:call-template name="processBibitem"/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="*[local-name()='bibitem']/*[local-name()='note']" priority="2">
-		<fo:footnote>
-			<xsl:variable name="number">
-				<xsl:number level="any" count="*[local-name()='bibitem']/*[local-name()='note']"/>
-			</xsl:variable>
-			<fo:inline font-size="8pt" keep-with-previous.within-line="always" baseline-shift="30%"> <!--85% vertical-align="super"-->
-				<fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
-					<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
-				</fo:basic-link>
-			</fo:inline>
-			<fo:footnote-body>
-				<fo:block font-size="10pt" margin-bottom="4pt" start-indent="0pt">
-					<fo:inline id="{generate-id()}" keep-with-next.within-line="always" alignment-baseline="hanging" padding-right="3mm"><!-- font-size="60%"  -->
-						<xsl:value-of select="$number"/><xsl:text>)</xsl:text>
-					</fo:inline>
-					<xsl:apply-templates/>
-				</fo:block>
-			</fo:footnote-body>
-		</fo:footnote>
-	</xsl:template>
 	<xsl:template match="jcgm:fn/jcgm:p">
@@ -762,34 +674,6 @@
 	</xsl:template>
-	<xsl:template match="*[local-name()='ul'] | *[local-name()='ol']" mode="ul_ol">
-		<fo:list-block provisional-distance-between-starts="7mm" margin-top="8pt"> <!-- margin-bottom="8pt" -->
-			<xsl:apply-templates/>
-		</fo:list-block>
-		<xsl:for-each select="./*[local-name()='note']">
-			<xsl:call-template name="note"/>
-		</xsl:for-each>
-	</xsl:template>
-	<xsl:template match="*[local-name()='ul']//*[local-name()='note'] |  *[local-name()='ol']//*[local-name()='note']" priority="2"/>
-	<xsl:template match="*[local-name()='li']">
-		<fo:list-item id="{@id}">
-			<fo:list-item-label end-indent="label-end()">
-				<fo:block>
-					<xsl:call-template name="getListItemFormat"/>
-				</fo:block>
-			</fo:list-item-label>
-			<fo:list-item-body start-indent="body-start()">
-				<fo:block>
-					<xsl:apply-templates/>
-					<xsl:apply-templates select=".//*[local-name()='note']" mode="process"/>
-				</fo:block>
-			</fo:list-item-body>
-		</fo:list-item>
-	</xsl:template>
 	<!-- for two-columns layout -->
@@ -806,42 +690,24 @@
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:apply-templates/>
-						<xsl:apply-templates select=".//*[local-name()='note']" mode="process"/>
+						<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
+						<xsl:apply-templates select=".//*[local-name()='note']"/>
 					</fo:block>
 				</fo:list-item-body>
 			</fo:list-item>
 		</fo:list-block>
 	</xsl:template>
-	<xsl:template match="*[local-name()='note']" mode="process">
-		<xsl:call-template name="note"/>
-	</xsl:template>
-	<xsl:template match="*[local-name()='preferred']">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<fo:block line-height="1.1" role="H{$level}">
-			<fo:block font-weight="bold" keep-with-next="always">
-				<xsl:apply-templates select="ancestor::*[local-name()='term'][1]/*[local-name()='name']" mode="presentation"/>
-			</fo:block>
-			<fo:block font-weight="bold" keep-with-next="always">
-				<xsl:call-template name="setStyle_preferred"/>
-				<xsl:apply-templates/>
-			</fo:block>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="*[local-name()='preferred'][not(parent::*[local-name()='term'])]">
+	<xsl:template match="*[local-name()='preferred'][not(parent::*[local-name()='term'])]" priority="2">
 		<xsl:variable name="levelTerm">
 			<xsl:call-template name="getLevelTermName"/>
 		</xsl:variable>
-		<fo:block line-height="1.1" role="H{$levelTerm}">
-			<fo:block font-weight="bold" keep-with-next="always">
+		<fo:block role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
+			<fo:block xsl:use-attribute-sets="term-name-style">
 				<xsl:apply-templates select="preceding-sibling::*[local-name()='term_name'][1]" mode="presentation"/>
 			</fo:block>
-			<fo:block font-weight="bold" keep-with-next="always">
+			<fo:block xsl:use-attribute-sets="preferred-term-style">
 				<xsl:call-template name="setStyle_preferred"/>
 				<xsl:apply-templates/>
 			</fo:block>
@@ -871,51 +737,6 @@
 		<fo:block widows="1" orphans="1"><xsl:apply-templates/></fo:block>
 	</xsl:template>
-	<xsl:template match="*[local-name()='references'][@normative='true']">
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="*[local-name()='references'][not(@normative='true')]">
-		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
-	<xsl:template match="*[local-name()='references'][not(@normative='true')]/*[local-name()='bibitem']">
-		<fo:list-block margin-bottom="6pt" provisional-distance-between-starts="12mm">
-			<fo:list-item>
-				<fo:list-item-label end-indent="label-end()">
-					<fo:block>
-						<fo:inline id="{@id}">
-							<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
-							<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
-								<xsl:number format="[1]"/>
-							</xsl:if>
-						</fo:inline>
-					</fo:block>
-				</fo:list-item-label>
-				<fo:list-item-body start-indent="body-start()">
-					<fo:block>
-						<xsl:call-template name="processBibitem"/>
-					</fo:block>
-				</fo:list-item-body>
-			</fo:list-item>
-		</fo:list-block>
-	</xsl:template>
-	<xsl:template match="*[local-name()='references']/*[local-name()='bibitem']/*[local-name()='title']">
-		<fo:inline font-style="italic">
-			<xsl:apply-templates/>
-		</fo:inline>
-	</xsl:template>
 	<xsl:template match="mathml:math" priority="2">
 		<fo:inline font-family="Cambria Math">
@@ -1015,20 +836,7 @@
 		</xsl:if>
 	</xsl:template>
-	<xsl:template match="*[local-name()='admonition']">
-		<fo:block margin-bottom="12pt" font-weight="bold"> <!-- text-align="center"  -->
-			<xsl:variable name="type">
-				<xsl:call-template name="getLocalizedString">
-					<xsl:with-param name="key">admonition.<xsl:value-of select="@type"/></xsl:with-param>
-				</xsl:call-template>
-			</xsl:variable>
-			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($type))"/>
-			<xsl:text> — </xsl:text>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
 	<xsl:template match="*[local-name()='td' or local-name()='th']/*[local-name()='formula']/*[local-name()='stem']" priority="2">
 		<fo:block>
 			<xsl:if test="ancestor::*[local-name()='td' or local-name()='th'][1][@align]">
@@ -1040,29 +848,6 @@
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="*[local-name()='formula']/*[local-name()='stem']">
-		<fo:block margin-top="6pt" margin-bottom="12pt">
-			<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="left" margin-left="25mm">
-								<xsl:apply-templates/>
-							</fo:block>
-						</fo:table-cell>
-						<fo:table-cell display-align="center">
-							<fo:block text-align="right">
-								<xsl:apply-templates select="../*[local-name()='name']" mode="presentation"/>
-							</fo:block>
-						</fo:table-cell>
-					</fo:table-row>
-				</fo:table-body>
-			</fo:table>
-		</fo:block>
-	</xsl:template>
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition" select="normalize-space(//*[local-name()='bibdata']/*[local-name()='edition'])"/>
@@ -1325,23 +1110,10 @@
 						<xsl:attribute name="baseline-shift">0%</xsl:attribute>
 						<xsl:attribute name="font-size">100%</xsl:attribute>
 					</xsl:if>
-					<xsl:choose>
-						<xsl:when test="$curr_lang = 'fr'">
-							<xsl:choose>
-								<xsl:when test=". = '1'">re</xsl:when>
-								<xsl:otherwise>e</xsl:otherwise>
-							</xsl:choose>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:choose>
-								<xsl:when test=". = '1'">st</xsl:when>
-								<xsl:when test=". = '2'">nd</xsl:when>
-								<xsl:when test=". = '3'">rd</xsl:when>
-								<xsl:otherwise>th</xsl:otherwise>
-							</xsl:choose>
-						</xsl:otherwise>
-					</xsl:choose>
+					<xsl:call-template name="number-to-ordinal">
+						<xsl:with-param name="number" select="."/>
+						<xsl:with-param name="curr_lang" select="$curr_lang"/>
+					</xsl:call-template>
 				</fo:inline>
 				<xsl:text> </xsl:text>
 				<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/>
@@ -1385,28 +1157,6 @@
 		</fo:page-sequence>
 	</xsl:template>
-	<!-- <xsl:template match="jcgm:clause[@type = 'index']/jcgm:title" priority="4"> -->
-	<xsl:template match="jcgm:indexsect/jcgm:title" priority="4">
-		<fo:block font-weight="bold" span="all" role="H1">
-			<!-- Index -->
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<!-- <xsl:template match="jcgm:clause[@type = 'index']/jcgm:clause/jcgm:title" priority="4"> -->
-	<xsl:template match="jcgm:indexsect/jcgm:clause/jcgm:title" priority="4">
-		<!-- Letter A, B, C, ... -->
-		<fo:block font-weight="bold" margin-left="25mm" keep-with-next="always">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<!-- <xsl:template match="jcgm:clause[@type = 'index']//jcgm:ul" priority="4"> -->
-	<xsl:template match="jcgm:indexsect//jcgm:ul" priority="4">
-		<xsl:apply-templates/>
-	</xsl:template>
 	<!-- =================== -->
 	<!-- End of Index processing -->
@@ -1757,7 +1507,7 @@
 	</term>
 	To:
 	<term/>
-	<name>...</name>
+	<term_name>...</term_name>
 	<preferred>...</preferred>
 	<definition>...</definition>
 	<termsource>...</termsource>
@@ -1960,7 +1710,21 @@
 			</fo:block-container>
 	</xsl:template>
-<xsl:variable name="titles_">
+<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: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="marginLeftRight1_">
+		25
+	</xsl:variable><xsl:variable name="marginLeftRight1" select="normalize-space($marginLeftRight1_)"/><xsl:variable name="marginLeftRight2_">
+		15
+	</xsl:variable><xsl:variable name="marginLeftRight2" select="normalize-space($marginLeftRight2_)"/><xsl:variable name="marginTop_">
+		29.5
+	</xsl:variable><xsl:variable name="marginTop" select="normalize-space($marginTop_)"/><xsl:variable name="marginBottom_">
+		23.5
+	</xsl:variable><xsl:variable name="marginBottom" select="normalize-space($marginBottom_)"/><xsl:variable name="titles_">
 		<title-edition lang="en">
@@ -1972,6 +1736,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">
@@ -1998,7 +1766,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>
@@ -2014,13 +1786,14 @@
 		<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: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_">
@@ -2043,12 +1816,73 @@
 				<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">
 			<xsl:attribute name="font-family">Times New Roman, STIX Two Math, Source Han Sans</xsl:attribute>
 			<xsl:attribute name="font-size">10.5pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
+	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
+	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-p-style">
+	</xsl:attribute-set><xsl:attribute-set name="license-statement-style">
+	</xsl:attribute-set><xsl:attribute-set name="license-statement-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="license-statement-p-style">
+	</xsl:attribute-set><xsl:attribute-set name="legal-statement-style">
+	</xsl:attribute-set><xsl:attribute-set name="legal-statement-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="legal-statement-p-style">
+	</xsl:attribute-set><xsl:attribute-set name="feedback-statement-style">
+	</xsl:attribute-set><xsl:attribute-set name="feedback-statement-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="feedback-statement-p-style">
 	</xsl:attribute-set><xsl:attribute-set name="link-style">
@@ -2058,22 +1892,32 @@
+	</xsl:attribute-set><xsl:attribute-set name="sourcecode-container-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
 		<xsl:attribute name="role">Code</xsl:attribute>
-			<xsl:attribute name="font-family">Courier New</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="font-family">Courier New</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="permission-style">
 	</xsl:attribute-set><xsl:attribute-set name="permission-name-style">
@@ -2138,11 +1982,11 @@
 	</xsl:attribute-set><xsl:attribute-set name="example-name-style">
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			 <xsl:attribute name="padding-right">5mm</xsl:attribute>
+			<xsl:attribute name="padding-right">5mm</xsl:attribute>
@@ -2188,48 +2032,262 @@
 	</xsl:attribute-set><xsl:variable name="table-border_">
-	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-name-style">
-		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:variable><xsl:variable name="table-border" select="normalize-space($table-border_)"/><xsl:attribute-set name="table-container-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
-			<xsl:attribute name="font-size">11pt</xsl:attribute>
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="text-align">center</xsl:attribute>
-			<!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
-			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<xsl:attribute name="margin-top">12pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-	</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
-	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
-			<xsl:attribute name="font-size">12pt</xsl:attribute>
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-	</xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
-			<xsl:attribute name="font-size">10pt</xsl:attribute>
-			<xsl:attribute name="margin-top">8pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
-	</xsl:attribute-set><xsl:attribute-set name="xref-style">
+	</xsl:attribute-set><xsl:attribute-set name="table-style">
+		<xsl:attribute name="table-omit-footer-at-break">true</xsl:attribute>
+		<xsl:attribute name="table-layout">fixed</xsl:attribute>
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+			<xsl:attribute name="border">1.5pt solid black</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-row-style">
+		<xsl:attribute name="min-height">4mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-header-row-style" use-attribute-sets="table-row-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
+			<xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
+			<xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-body-row-style" use-attribute-sets="table-row-style">
+	</xsl:attribute-set><xsl:attribute-set name="table-header-cell-style">
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
+		<xsl:attribute name="padding-left">1mm</xsl:attribute>
+		<xsl:attribute name="display-align">center</xsl:attribute>
+			<xsl:attribute name="padding-top">1mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-cell-style">
+		<xsl:attribute name="display-align">center</xsl:attribute>
+		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
+		<xsl:attribute name="padding-left">1mm</xsl:attribute>
+			<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
+		<xsl:attribute name="border">solid black 1pt</xsl:attribute>
+		<xsl:attribute name="padding-left">1mm</xsl:attribute>
+		<xsl:attribute name="padding-right">1mm</xsl:attribute>
+		<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-note-style">
+		<xsl:attribute name="font-size">10pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-fn-style">
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-fn-number-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+			<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="fn-container-body-style">
+		<xsl:attribute name="text-indent">0</xsl:attribute>
+		<xsl:attribute name="start-indent">0</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-fn-body-style">
+	</xsl:attribute-set><xsl:attribute-set name="figure-fn-number-style">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="padding-right">5mm</xsl:attribute>
+		<xsl:attribute name="vertical-align">super</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="figure-fn-body-style">
+		<xsl:attribute name="text-align">justify</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="dt-row-style">
+	</xsl:attribute-set><xsl:attribute-set name="dt-style">
+		<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<xsl:attribute name="margin-top">0pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="margin-top">12pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="xref-style">
@@ -2284,6 +2342,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		<xsl:attribute name="padding-right">2mm</xsl:attribute>
@@ -2324,13 +2383,12 @@
 	</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>
 			<xsl:attribute name="margin-top">12pt</xsl:attribute>
-			<xsl:attribute name="margin-left">12mm</xsl:attribute>
-			<xsl:attribute name="margin-right">12mm</xsl:attribute>
 			<xsl:attribute name="font-style">italic</xsl:attribute>
 			<xsl:attribute name="text-align">justify</xsl:attribute>
@@ -2339,10 +2397,8 @@
 	</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">
@@ -2354,6 +2410,9 @@
 			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="termsource-text-style">
 	</xsl:attribute-set><xsl:attribute-set name="origin-style">
@@ -2363,6 +2422,11 @@
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+	</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">
@@ -2391,6 +2455,37 @@
 	</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-set><xsl:attribute-set name="formula-stem-block-style">
+		<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="text-align">left</xsl:attribute>
+			<xsl:attribute name="margin-left">25mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="formula-stem-number-style">
+		<xsl:attribute name="text-align">right</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="image-style">
 		<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2426,6 +2521,20 @@
 		<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 name="line-height">1.1</xsl:attribute>
+	</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">
@@ -2446,13 +2555,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>
@@ -2463,8 +2578,49 @@
 	</xsl:attribute-set><xsl:attribute-set name="list-style">
+			<xsl:attribute name="provisional-distance-between-starts">7mm</xsl:attribute>
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+	</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">
+		<xsl:attribute name="font-size">80%</xsl:attribute>
+		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="fn-style">
 		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 	</xsl:attribute-set><xsl:attribute-set name="fn-num-style">
@@ -2494,7 +2650,6 @@
 		<xsl:attribute name="text-indent">0</xsl:attribute>
 		<xsl:attribute name="start-indent">0</xsl:attribute>
 			<xsl:attribute name="font-size">9pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 			<xsl:attribute name="line-height">124%</xsl:attribute>
@@ -2516,6 +2671,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="fn-body-num-style">
 		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
@@ -2539,15 +2695,339 @@
+	</xsl:attribute-set><xsl:attribute-set name="admonition-style">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="admonition-container-style">
+	</xsl:attribute-set><xsl:attribute-set name="admonition-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="admonition-p-style">
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-style">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-style">
+		<xsl:attribute name="provisional-distance-between-starts">12mm</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="bibitem-non-normative-style">
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-style">
+		<xsl:attribute name="provisional-distance-between-starts">12mm</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="bibitem-normative-list-body-style">
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-style">
+		<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+		<xsl:attribute name="font-size">65%</xsl:attribute>
+			<xsl:attribute name="font-size">8pt</xsl:attribute>
+			<xsl:attribute name="baseline-shift">30%</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-number-style">
+		<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
+			<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
+			<xsl:attribute name="padding-right">3mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="bibitem-note-fn-body-style">
+		<xsl:attribute name="font-size">10pt</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="start-indent">0pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">4pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="references-non-normative-style">
+	</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 name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="span">all</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="indexsect-clause-title-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="margin-left">25mm</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>
@@ -2585,6 +3065,70 @@
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
+	</xsl:template><xsl:template match="*[local-name()='copyright-statement']">
+		<fo:block xsl:use-attribute-sets="copyright-statement-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='title']">
+				<!-- process in the template 'title' -->
+				<xsl:call-template name="title"/>
+	</xsl:template><xsl:template match="*[local-name()='copyright-statement']//*[local-name()='p']">
+				<!-- process in the template 'paragraph' -->
+				<xsl:call-template name="paragraph"/>
+	</xsl:template><xsl:template match="*[local-name()='license-statement']">
+		<fo:block xsl:use-attribute-sets="license-statement-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='title']">
+				<!-- process in the template 'title' -->
+				<xsl:call-template name="title"/>
+	</xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
+				<!-- process in the template 'paragraph' -->
+				<xsl:call-template name="paragraph"/>
+	</xsl:template><xsl:template match="*[local-name()='legal-statement']">
+		<fo:block xsl:use-attribute-sets="legal-statement-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name()='legal-statement']//*[local-name()='title']">
+				<!-- process in the template 'title' -->
+				<xsl:call-template name="title"/>
+	</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: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">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name()='feedback-statement']//*[local-name()='title']">
+				<!-- process in the template 'title' -->
+				<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: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"/> -->
 		<xsl:call-template name="add-zero-spaces-java"/>
@@ -2601,10 +3145,6 @@
 				<xsl:call-template name="getSimpleTable"/>
 			</xsl:variable>
-			<!-- <xsl:if test="$namespace = 'bipm'">
-				<fo:block>&#xA0;</fo:block>
-			</xsl:if> -->
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
@@ -2622,10 +3162,10 @@
 					</xsl:call-template>
 				</xsl:if>
 			</xsl:variable>
-			<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
+			<!-- DEBUG colwidths=<xsl:copy-of select="$colwidths"/> -->
-			<xsl:variable name="margin-left">
+			<xsl:variable name="margin-side">
 				<xsl:choose>
 					<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
 					<xsl:otherwise>0</xsl:otherwise>
@@ -2633,78 +3173,65 @@
 			</xsl:variable>
-			<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
-					<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<fo:block-container xsl:use-attribute-sets="table-container-style">
-					<xsl:attribute name="margin-top">12pt</xsl:attribute>
-					<xsl:attribute name="margin-left">0mm</xsl:attribute>
-					<xsl:attribute name="margin-right">0mm</xsl:attribute>
-					<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+				<!-- end table block-container attributes -->
 				<!-- display table's name before table for PAS inside block-container (2-columnn layout) -->
+				<xsl:variable name="table_width_default">100%</xsl:variable>
 				<xsl:variable name="table_width">
-					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
-					100%
-				</xsl:variable>
-				<xsl:variable name="table_attributes">
-					<attribute name="table-layout">fixed</attribute>
-					<attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
-					<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
-					<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
-						<attribute name="border">1.5pt solid black</attribute>
-						<xsl:if test="*[local-name()='thead']">
-							<attribute name="border-top">1pt solid black</attribute>
-						</xsl:if>
-						<attribute name="margin-left">0mm</attribute>
-						<attribute name="margin-right">0mm</attribute>
+					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
+					<xsl:value-of select="$table_width_default"/>
+				</xsl:variable>
+				<xsl:variable name="table_attributes">
+					<xsl:element name="table_attributes" use-attribute-sets="table-style">
+						<xsl:attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></xsl:attribute>
+							<xsl:if test="*[local-name()='thead']">
+								<xsl:attribute name="border-top">1pt solid black</xsl:attribute>
+							</xsl:if>
+					</xsl:element>
 				</xsl:variable>
-				<fo:table id="{@id}" table-omit-footer-at-break="true">
+				<fo:table id="{@id}">
-					<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
-						<xsl:attribute name="{@name}">
+					<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+						<xsl:attribute name="{local-name()}">
 							<xsl:value-of select="."/>
 						</xsl:attribute>
 					</xsl:for-each>
@@ -2715,7 +3242,6 @@
 					</xsl:if>
 					<xsl:choose>
 						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
 							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -2741,7 +3267,7 @@
 							<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:apply-templates/>
+							<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'note')        and not(local-name() = 'thead') and not(local-name() = 'tfoot')]"/> <!-- process all table' elements, except name, header, footer and note that renders separaterely -->
 						</xsl:otherwise>
 					</xsl:choose>
@@ -2816,13 +3342,11 @@
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']">
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
-					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
@@ -2904,7 +3428,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">
@@ -2929,7 +3453,6 @@
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
 			<column>
 				<xsl:for-each select="xalan:nodeset($widths)//width">
@@ -2946,8 +3469,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">
@@ -2963,9 +3485,8 @@
 		<xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
 		<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
-	</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='thead']">
 		<xsl:param name="cols-count"/>
-		<!-- font-weight="bold" -->
 		<fo:table-header>
 				<xsl:call-template name="table-header-title">
@@ -2981,13 +3502,13 @@
 		<fo:table-row>
 			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
-				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation">
+				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']">
 					<xsl:with-param name="continued">true</xsl:with-param>
 				</xsl:apply-templates>
 					<xsl:for-each select="ancestor::*[local-name()='table'][1]">
-						<xsl:call-template name="fn_name_display"/>
+						<xsl:call-template name="table_name_fn_display"/>
 					</xsl:for-each>
 					<fo:block text-align="right" font-style="italic">
@@ -3002,13 +3523,13 @@
 		<fo:table-body>
 			<xsl:apply-templates/>
 		</fo:table-body>
-	</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='tfoot']">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="insertTableFooter">
 		<xsl:param name="cols-count"/>
 		<xsl:if test="../*[local-name()='tfoot']">
 			<fo:table-footer>
-				<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
+				<xsl:apply-templates select="../*[local-name()='tfoot']"/>
 			</fo:table-footer>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
@@ -3036,17 +3557,18 @@
 			</xsl:variable>
 			<fo:table keep-with-previous="always">
-				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
+				<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
+					<xsl:variable name="name" select="local-name()"/>
 					<xsl:choose>
-						<xsl:when test="@name = 'border-top'">
-							<xsl:attribute name="{@name}">0pt solid black</xsl:attribute>
+						<xsl:when test="$name = 'border-top'">
+							<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
 						</xsl:when>
-						<xsl:when test="@name = 'border'">
-							<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+						<xsl:when test="$name = 'border'">
+							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
 							<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
 						</xsl:when>
 						<xsl:otherwise>
-							<xsl:attribute name="{@name}"><xsl:value-of select="."/></xsl:attribute>
+							<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:for-each>
@@ -3075,11 +3597,10 @@
 				<fo:table-body>
 					<fo:table-row>
-						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
+						<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
-								<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
 							<!-- fn will be processed inside 'note' processing -->
@@ -3089,15 +3610,12 @@
 							<!-- for BSI (not PAS) display Notes before footnotes -->
 							<!-- except gb and bsi  -->
-									<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
+									<xsl:apply-templates select="../*[local-name()='note']"/>
@@ -3105,7 +3623,7 @@
 							<!-- fn processing -->
-							<xsl:call-template name="fn_display"/>
+							<xsl:call-template name="table_fn_display"/>
 							<!-- for PAS display Notes after footnotes -->
@@ -3144,7 +3662,7 @@
 			</xsl:if>
-		<xsl:apply-templates select="../*[local-name()='thead']" mode="process">
+		<xsl:apply-templates select="../*[local-name()='thead']">
 			<xsl:with-param name="cols-count" select="$cols-count"/>
 		</xsl:apply-templates>
@@ -3195,90 +3713,65 @@
 		</fo:table-body>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/text()[1]" priority="2" mode="presentation_name">
-		<xsl:choose>
-			<xsl:when test="substring-after(., '—') != ''">
-				<xsl:text>—</xsl:text><xsl:value-of select="substring-after(., '—')"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="."/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="presentation_name">
-		<xsl:apply-templates mode="presentation_name"/>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']/node()" mode="presentation_name">
-		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name()='tr']">
-		<xsl:variable name="parent-name" select="local-name(..)"/>
-		<fo:table-row min-height="4mm">
-				<xsl:if test="$parent-name = 'thead'">
-					<xsl:attribute name="font-weight">bold</xsl:attribute>
-						<xsl:choose>
-							<xsl:when test="position() = 1">
-								<xsl:attribute name="border-top">solid black 1.5pt</xsl:attribute>
-								<xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
-							</xsl:when>
-							<xsl:when test="position() = last()">
-								<xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
-								<xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
-								<xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
-							</xsl:otherwise>
-						</xsl:choose>
-				</xsl:if>
-				<xsl:if test="$parent-name = 'tfoot'">
-						<xsl:attribute name="font-size">9pt</xsl:attribute>
-						<xsl:attribute name="border-left">solid black 1pt</xsl:attribute>
-						<xsl:attribute name="border-right">solid black 1pt</xsl:attribute>
-				</xsl:if>
-			<xsl:apply-templates/>
-		</fo:table-row>
-	</xsl:template><xsl:template match="*[local-name()='th']">
-		<fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
-			<xsl:attribute name="text-align">
+	</xsl:template><xsl:template match="*[local-name()='thead']/*[local-name()='tr']" priority="2">
+		<fo:table-row xsl:use-attribute-sets="table-header-row-style">
 				<xsl:choose>
-					<xsl:when test="@align">
-						<xsl:call-template name="setAlignment"/>
+					<xsl:when test="position() = 1">
+						<xsl:attribute name="border-top">solid black 1.5pt</xsl:attribute>
+						<xsl:attribute name="border-bottom">solid black 1pt</xsl:attribute>
+					</xsl:when>
+					<xsl:when test="position() = last()">
+						<xsl:attribute name="border-top">solid black 1pt</xsl:attribute>
+						<xsl:attribute name="border-bottom">solid black 1.5pt</xsl:attribute>
 					</xsl:when>
-					<xsl:otherwise>center</xsl:otherwise>
 				</xsl:choose>
-			</xsl:attribute>
-				<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:call-template name="setTableRowAttributes"/>
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name()='tfoot']/*[local-name()='tr']" priority="2">
+		<fo:table-row xsl:use-attribute-sets="table-footer-row-style">
+			<xsl:call-template name="setTableRowAttributes"/>
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name()='tr']">
+		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
+			<xsl:call-template name="setTableRowAttributes"/>
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template name="setTableRowAttributes">
+	</xsl:template><xsl:template match="*[local-name()='th']">
+		<fo:table-cell xsl:use-attribute-sets="table-header-cell-style"> <!-- text-align="{@align}" -->
+			<xsl:call-template name="setTextAlignment">
+				<xsl:with-param name="default">center</xsl:with-param>
+			</xsl:call-template>
@@ -3287,21 +3780,25 @@
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="@colspan">
-				<xsl:attribute name="number-columns-spanned">
-					<xsl:value-of select="@colspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@rowspan">
-				<xsl:attribute name="number-rows-spanned">
-					<xsl:value-of select="@rowspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="display-align"/>
+			<xsl:call-template name="setTableCellAttributes"/>
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
+	</xsl:template><xsl:template name="setTableCellAttributes">
+		<xsl:if test="@colspan">
+			<xsl:attribute name="number-columns-spanned">
+				<xsl:value-of select="@colspan"/>
+			</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="@rowspan">
+			<xsl:attribute name="number-rows-spanned">
+				<xsl:value-of select="@rowspan"/>
+			</xsl:attribute>
+		</xsl:if>
+		<xsl:call-template name="display-align"/>
 	</xsl:template><xsl:template name="display-align">
 		<xsl:if test="@valign">
 			<xsl:attribute name="display-align">
@@ -3314,96 +3811,80 @@
 			</xsl:attribute>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='td']">
-		<fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
-			<xsl:attribute name="text-align">
-				<xsl:choose>
-					<xsl:when test="@align">
-						<xsl:call-template name="setAlignment"/>
-					</xsl:when>
-					<xsl:otherwise>left</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
+		<fo:table-cell xsl:use-attribute-sets="table-cell-style"> <!-- text-align="{@align}" -->
+			<xsl:call-template name="setTextAlignment">
+				<xsl:with-param name="default">left</xsl:with-param>
+			</xsl:call-template>
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
-			 <!--  and ancestor::*[local-name() = 'thead'] -->
-				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
-				<xsl:if test="count(*) = 1 and (local-name(*[1]) = 'stem' or local-name(*[1]) = 'figure')">
-					<xsl:attribute name="padding-left">0mm</xsl:attribute>
-				</xsl:if>
+			 <!-- bsi -->
-				<xsl:if test="ancestor::*[local-name() = 'tfoot']">
-					<xsl:attribute name="border">solid black 0</xsl:attribute>
-				</xsl:if>
+				<xsl:if test="count(*) = 1 and (local-name(*[1]) = 'stem' or local-name(*[1]) = 'figure')">
+					<xsl:attribute name="padding-left">0mm</xsl:attribute>
+				</xsl:if>
+				<xsl:if test="ancestor::*[local-name() = 'tfoot']">
+					<xsl:attribute name="border">solid black 0</xsl:attribute>
+				</xsl:if>
-			<xsl:if test=".//*[local-name() = 'table']">
+			<xsl:if test=".//*[local-name() = 'table']"> <!-- if there is nested table -->
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="@colspan">
-				<xsl:attribute name="number-columns-spanned">
-					<xsl:value-of select="@colspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@rowspan">
-				<xsl:attribute name="number-rows-spanned">
-					<xsl:value-of select="@rowspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="display-align"/>
+			<xsl:call-template name="setTableCellAttributes"/>
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2">
+		<fo:block xsl:use-attribute-sets="table-note-style">
-			<fo:block font-size="10pt" margin-bottom="12pt">
+			<!-- Table's note name (NOTE, for example) -->
+			<fo:inline xsl:use-attribute-sets="table-note-name-style">
-					<xsl:attribute name="font-size">9pt</xsl:attribute>
-					<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-				<!-- Table's note name (NOTE, for example) -->
-				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
+				<xsl:apply-templates select="*[local-name() = 'name']"/>
-					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
-				</fo:inline>
-				<xsl:apply-templates mode="process"/>
-			</fo:block>
+			</fo:inline>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+		</fo:block>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" priority="2">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'fn'][not(ancestor::*[(local-name() = 'table' or local-name() = 'figure') and not(ancestor::*[local-name() = 'name'])])]" priority="2" name="fn">
@@ -3481,8 +3962,7 @@
 					<xsl:copy-of select="$footnote_inline"/>
 					<fo:footnote-body>
-						<fo:block-container text-indent="0" start-indent="0">
+						<fo:block-container xsl:use-attribute-sets="fn-container-body-style">
 							<fo:block xsl:use-attribute-sets="fn-body-style">
@@ -3501,7 +3981,7 @@
 				<xsl:copy-of select="$footnote_inline"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template name="fn_display">
+	</xsl:template><xsl:template name="table_fn_display">
 		<xsl:variable name="references">
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
@@ -3512,35 +3992,26 @@
 		<xsl:for-each select="xalan:nodeset($references)//fn">
 			<xsl:variable name="reference" select="@reference"/>
 			<xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
-				<fo:block margin-bottom="12pt">
+				<fo:block xsl:use-attribute-sets="table-fn-style">
-						<xsl:attribute name="font-size">9pt</xsl:attribute>
-						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
+					<fo:inline id="{@id}" xsl:use-attribute-sets="table-fn-number-style">
-							<xsl:attribute name="alignment-baseline">hanging</xsl:attribute>
+						<xsl:value-of select="@reference"/>
-						<xsl:value-of select="@reference"/>
 					</fo:inline>
-					<fo:inline>
+					<fo:inline xsl:use-attribute-sets="table-fn-body-style">
 						<xsl:copy-of select="./node()"/>
 					</fo:inline>
 				</fo:block>
@@ -3552,7 +4023,7 @@
 			<xsl:apply-templates/>
 		</fn>
-	</xsl:template><xsl:template name="fn_name_display">
+	</xsl:template><xsl:template name="table_name_fn_display">
 		<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
 			<xsl:variable name="reference" select="@reference"/>
 			<fo:block id="{@reference}_{ancestor::*[@id][1]/@id}"><xsl:value-of select="@reference"/></fo:block>
@@ -3561,9 +4032,7 @@
 			</fo:block>
 		</xsl:for-each>
 	</xsl:template><xsl:template name="fn_display_figure">
-		<xsl:variable name="key_iso">
-			true <!-- and (not(@class) or @class !='pseudocode') -->
-		</xsl:variable>
 		<xsl:variable name="references">
 			<xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
 				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -3571,48 +4040,52 @@
 				</fn>
 			</xsl:for-each>
 		</xsl:variable>
+		<xsl:if test="xalan:nodeset($references)//fn">
-		<!-- current hierarchy is 'figure' element -->
-		<xsl:variable name="following_dl_colwidths">
-			<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
-				<xsl:variable name="html-table">
-					<xsl:variable name="doc_ns">
+			<xsl:variable name="key_iso">
+				true
+			</xsl:variable>
+			<!-- current hierarchy is 'figure' element -->
+			<xsl:variable name="following_dl_colwidths">
+				<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
+					<xsl:variable name="html-table">
+						<xsl:variable name="doc_ns">
+						</xsl:variable>
+						<xsl:variable name="ns">
+							<xsl:choose>
+								<xsl:when test="normalize-space($doc_ns)  != ''">
+									<xsl:value-of select="normalize-space($doc_ns)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:value-of select="substring-before(name(/*), '-')"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:variable>
-					</xsl:variable>
-					<xsl:variable name="ns">
-						<xsl:choose>
-							<xsl:when test="normalize-space($doc_ns)  != ''">
-								<xsl:value-of select="normalize-space($doc_ns)"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:value-of select="substring-before(name(/*), '-')"/>
-							</xsl:otherwise>
-						</xsl:choose>
+						<xsl:for-each select="*[local-name() = 'dl'][1]">
+							<tbody>
+								<xsl:apply-templates mode="dl"/>
+							</tbody>
+						</xsl:for-each>
 					</xsl:variable>
-					<xsl:for-each select="*[local-name() = 'dl'][1]">
-						<tbody>
-							<xsl:apply-templates mode="dl"/>
-						</tbody>
-					</xsl:for-each>
-				</xsl:variable>
-				<xsl:call-template name="calculate-column-widths">
-					<xsl:with-param name="cols-count" select="2"/>
-					<xsl:with-param name="table" select="$html-table"/>
-				</xsl:call-template>
-			</xsl:if>
-		</xsl:variable>
-		<xsl:variable name="maxlength_dt">
-			<xsl:for-each select="*[local-name() = 'dl'][1]">
-				<xsl:call-template name="getMaxLength_dt"/>
-			</xsl:for-each>
-		</xsl:variable>
-		<xsl:if test="xalan:nodeset($references)//fn">
+					<xsl:call-template name="calculate-column-widths">
+						<xsl:with-param name="cols-count" select="2"/>
+						<xsl:with-param name="table" select="$html-table"/>
+					</xsl:call-template>
+				</xsl:if>
+			</xsl:variable>
+			<xsl:variable name="maxlength_dt">
+				<xsl:for-each select="*[local-name() = 'dl'][1]">
+					<xsl:call-template name="getMaxLength_dt"/>
+				</xsl:for-each>
+			</xsl:variable>
 			<fo:block>
 				<fo:table width="95%" table-layout="fixed">
 					<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3639,20 +4112,18 @@
 								<fo:table-row>
 									<fo:table-cell>
 										<fo:block>
-											<fo:inline font-size="80%" padding-right="5mm" vertical-align="super" id="{@id}">
+											<fo:inline id="{@id}" xsl:use-attribute-sets="figure-fn-number-style">
 												<xsl:value-of select="@reference"/>
 											</fo:inline>
 										</fo:block>
 									</fo:table-cell>
 									<fo:table-cell>
-										<fo:block text-align="justify" margin-bottom="12pt">
+										<fo:block xsl:use-attribute-sets="figure-fn-body-style">
 											<xsl:if test="normalize-space($key_iso) = 'true'">
-												<xsl:attribute name="margin-bottom">0</xsl:attribute>
+														<xsl:attribute name="margin-bottom">0</xsl:attribute>
 											</xsl:if>
-											<!-- <xsl:apply-templates /> -->
 											<xsl:copy-of select="./node()"/>
 										</fo:block>
 									</fo:table-cell>
@@ -3665,7 +4136,8 @@
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='fn']">
-		<fo:inline font-size="80%" keep-with-previous.within-line="always">
+		<fo:inline xsl:use-attribute-sets="fn-reference-style">
@@ -3675,12 +4147,6 @@
 				</xsl:if>
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
@@ -3720,9 +4186,9 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
-			<fo:block-container>
+			<fo:block-container margin-left="0mm">
-						<xsl:attribute name="margin-left">0mm</xsl:attribute>
 						<xsl:attribute name="margin-right">0mm</xsl:attribute>
@@ -3950,12 +4416,12 @@
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="margin-top">0</xsl:attribute>
 					</xsl:if>
-					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+					<xsl:apply-templates select="*[local-name() = 'name']"/>
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
 				<fo:block>
-					<xsl:apply-templates/>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
@@ -3966,7 +4432,9 @@
 			</td>
 			<td>
-						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
+							<xsl:with-param name="process">true</xsl:with-param>
+						</xsl:apply-templates>
 			</td>
 		</tr>
@@ -3974,28 +4442,18 @@
 	</xsl:template><xsl:template match="*[local-name()='dt']">
 		<xsl:param name="key_iso"/>
-		<fo:table-row>
+		<fo:table-row xsl:use-attribute-sets="dt-row-style">
 			<fo:table-cell>
-				<fo:block margin-top="6pt">
+				<fo:block xsl:use-attribute-sets="dt-style">
 					<xsl:copy-of select="@id"/>
-						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="margin-top">0</xsl:attribute>
 					</xsl:if>
 					<xsl:apply-templates/>
 				</fo:block>
 			</fo:table-cell>
@@ -4003,15 +4461,20 @@
 				<fo:block>
-					<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
+					<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
+						<xsl:with-param name="process">true</xsl:with-param>
+					</xsl:apply-templates>
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
-		<xsl:apply-templates select="@language"/>
-		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name()='dd']">
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:apply-templates select="@language"/>
+			<xsl:apply-templates/>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='em']">
@@ -4035,6 +4498,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
 			<xsl:variable name="_font-size">
@@ -4070,16 +4534,46 @@
 		<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 -->
-				<fo:inline>
-					<xsl:call-template name="insertTag">
-						<xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
-						<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: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']) 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>
+						<xsl:variable name="tag">
+							<xsl:call-template name="insertTag">
+								<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>
+						</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>
 			<xsl:when test="@amendment">
 				<fo:inline>
@@ -4179,7 +4673,11 @@
         <xsl:with-param name="text" select="substring($text,2)"/>
       </xsl:call-template>
     </xsl:if>
-  </xsl:template><xsl:template name="tokenize">
+  </xsl:template><xsl:template match="*[local-name() = 'pagebreak']">
+		<fo:block break-after="page"/>
+		<fo:block> </fo:block>
+		<fo:block break-after="page"/>
+	</xsl:template><xsl:template name="tokenize">
 		<xsl:param name="text"/>
 		<xsl:param name="separator" select="' '"/>
 		<xsl:choose>
@@ -4432,17 +4930,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>
@@ -4493,6 +4995,7 @@
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
 				<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
@@ -4524,6 +5027,7 @@
 				</xsl:attribute>
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>
 		</fo:inline>
@@ -4582,6 +5086,10 @@
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -4605,10 +5113,10 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
-			<xsl:apply-templates select="*[local-name()='title']" mode="process"/>
+			<xsl:apply-templates select="*[local-name()='title']"/>
 		</fo:block>
-		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
+		<xsl:apply-templates select="node()[not(local-name()='title')]"/>
+	</xsl:template><xsl:template match="*[local-name()='appendix']/*[local-name()='title']" priority="2">
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
@@ -4639,7 +5147,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">
@@ -4654,8 +5164,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>
@@ -4667,18 +5177,57 @@
 		<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="presentation">
+	</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() = '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">
@@ -4689,15 +5238,34 @@
 						<fo:block>
 							<fo:inline xsl:use-attribute-sets="note-name-style">
+								<!-- 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)]">
+										<xsl:with-param name="skip">false</xsl:with-param>
+									</xsl:apply-templates>
+								</xsl:if>
+								<xsl:apply-templates select="*[local-name() = 'name']"/>
-								<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 							</fo:inline>
-							<xsl:apply-templates/>
+							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 						</fo:block>
 			</fo:block-container>
@@ -4706,7 +5274,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
-			<xsl:when test="$num = 1">
+			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
 				<fo:inline xsl:use-attribute-sets="note-p-style">
 					<xsl:apply-templates/>
 				</fo:inline>
@@ -4721,12 +5289,22 @@
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
+				<!-- 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']"/>
-				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 			</fo:inline>
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name'] |               *[local-name() = 'termnote']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']">
 		<xsl:param name="sfx"/>
 		<xsl:variable name="suffix">
 			<xsl:choose>
@@ -4743,7 +5321,7 @@
 			<xsl:apply-templates/>
 			<xsl:value-of select="$suffix"/>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']">
 		<xsl:param name="sfx"/>
 		<xsl:variable name="suffix">
 			<xsl:choose>
@@ -4771,14 +5349,17 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
 			</xsl:if>
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<xsl:variable name="level">
 				<xsl:call-template name="getLevelTermName"/>
@@ -4797,9 +5378,10 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
-			<fo:block>
-				<xsl:apply-templates/>
+			<fo:block xsl:use-attribute-sets="figure-style">
+				<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 			</fo:block>
 			<xsl:call-template name="fn_display_figure"/>
 			<xsl:for-each select="*[local-name() = 'note']">
@@ -4807,15 +5389,15 @@
 			</xsl:for-each>
-					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+					<xsl:apply-templates select="*[local-name() = 'name']"/> <!-- show figure's name AFTER image -->
 		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
 		<fo:block id="{@id}">
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
-		<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+		<xsl:apply-templates select="*[local-name() = 'name']"/>
 	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
 		<fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
 			<xsl:apply-templates/>
@@ -5192,7 +5774,7 @@
 			</fo:basic-link>
 		 </fo:block>
 	  </fo:block-container>
-	</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'emf']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name'] |               *[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="bookmarks">
@@ -5204,7 +5786,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']" 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"/>
@@ -5212,10 +5798,15 @@
 		</xsl:variable>
 		<xsl:variable name="section">
-			<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+			<xsl:choose>
+				<xsl:when test="@type = 'section-title'"/>
+				<xsl:otherwise>
+					<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="type">floating-title</xsl:variable>
+		<xsl:variable name="type"><xsl:value-of select="@type"/></xsl:variable>
 		<xsl:variable name="display">
 			<xsl:choose>
@@ -5232,7 +5823,16 @@
 			<xsl:variable name="title">
 				<xsl:choose>
 					<xsl:when test="*[local-name() = 'tab']">
-						<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+						<xsl:choose>
+							<xsl:when test="@type = 'section-title'">
+								<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+								<xsl:text>: </xsl:text>
+								<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>
 						<xsl:copy-of select="node()"/>
@@ -5415,7 +6015,7 @@
 				<xsl:apply-templates mode="bookmark"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="figure-name-style">
@@ -5499,16 +6099,21 @@
 		<xsl:apply-templates mode="contents_item">
 			<xsl:with-param name="mode" select="$mode"/>
 		</xsl:apply-templates>
-	</xsl:template><xsl:template match="*[local-name() = 'add'][starts-with(text(), $ace_tag)]" mode="contents_item">
+	</xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item">
 		<xsl:param name="mode">bookmarks</xsl:param>
-		<xsl:if test="$mode = 'contents'">
-			<xsl:copy>
-				<xsl:apply-templates mode="contents_item"/>
-			</xsl:copy>
-		</xsl:if>
+		<xsl:choose>
+			<xsl:when test="starts-with(text(), $ace_tag)">
+				<xsl:if test="$mode = 'contents'">
+					<xsl:copy>
+						<xsl:apply-templates mode="contents_item"/>
+					</xsl:copy>
+				</xsl:if>
+			</xsl:when>
+			<xsl:otherwise><xsl:apply-templates mode="contents_item"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
 			<xsl:copy-of select="@id"/>
 			<xsl:if test="parent::*[local-name() = 'note']">
@@ -5545,6 +6150,7 @@
 				</xsl:variable>
 				<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
@@ -5561,11 +6167,11 @@
-				<xsl:apply-templates/>
+				<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 			</fo:block>
-					<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+					<xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
@@ -5573,13 +6179,141 @@
 			</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:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
+		<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">
 				<xsl:apply-templates/>
@@ -5587,10 +6321,10 @@
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'permission']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="*[local-name()='name']"/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="permission-name-style">
 				<xsl:apply-templates/>
@@ -5603,13 +6337,13 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'requirement']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-			<xsl:apply-templates select="*[local-name()='label']" mode="presentation"/>
-			<xsl:apply-templates select="@obligation" mode="presentation"/>
-			<xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/>
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="*[local-name()='name']"/>
+			<xsl:apply-templates select="*[local-name()='label']"/>
+			<xsl:apply-templates select="@obligation"/>
+			<xsl:apply-templates select="*[local-name()='subject']"/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name') and not(local-name() = 'label') and not(local-name() = 'subject')]"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="requirement-name-style">
@@ -5617,20 +6351,24 @@
 			</fo:block>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']">
 		<fo:block xsl:use-attribute-sets="requirement-label-style">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation">
 			<fo:block>
 				<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
 			</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2">
+		<fo:block xsl:use-attribute-sets="subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="*[local-name()='name']"/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="recommendation-name-style">
 				<xsl:apply-templates/>
@@ -5641,10 +6379,6 @@
 		<fo:block xsl:use-attribute-sets="recommendation-label-style">
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" priority="2"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
-		<fo:block xsl:use-attribute-sets="subject-style">
-			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
-		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'subject']">
 		<fo:block xsl:use-attribute-sets="subject-style">
 			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
@@ -5697,7 +6431,7 @@
 				<xsl:if test=".//*[local-name() = 'fn']">
 					<xsl:for-each select="*[local-name() = 'tbody']">
 						<fo:block font-size="90%" border-bottom="1pt solid black">
-							<xsl:call-template name="fn_display"/>
+							<xsl:call-template name="table_fn_display"/>
 						</fo:block>
 					</xsl:for-each>
 				</xsl:if>
@@ -5726,25 +6460,11 @@
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
 		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
-			<xsl:attribute name="text-align">
-				<xsl:choose>
-					<xsl:when test="@align">
-						<xsl:value-of select="@align"/>
-					</xsl:when>
-					<xsl:otherwise>left</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<xsl:if test="@colspan">
-				<xsl:attribute name="number-columns-spanned">
-					<xsl:value-of select="@colspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@rowspan">
-				<xsl:attribute name="number-rows-spanned">
-					<xsl:value-of select="@rowspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="display-align"/>
+			<xsl:call-template name="setTextAlignment">
+				<xsl:with-param name="default">left</xsl:with-param>
+			</xsl:call-template>
+			<xsl:call-template name="setTableCellAttributes"/>
 			<fo:block>
 				<xsl:apply-templates/>
@@ -5756,28 +6476,15 @@
 				<xsl:attribute name="padding">0mm</xsl:attribute>
 				<xsl:attribute name="padding-left">0mm</xsl:attribute>
 			</xsl:if>
-			<xsl:attribute name="text-align">
-				<xsl:choose>
-					<xsl:when test="@align">
-						<xsl:value-of select="@align"/>
-					</xsl:when>
-					<xsl:otherwise>left</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
+			<xsl:call-template name="setTextAlignment">
+				<xsl:with-param name="default">left</xsl:with-param>
+			</xsl:call-template>
 			<xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
 				<xsl:attribute name="font-weight">bold</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="@colspan">
-				<xsl:attribute name="number-columns-spanned">
-					<xsl:value-of select="@colspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@rowspan">
-				<xsl:attribute name="number-rows-spanned">
-					<xsl:value-of select="@rowspan"/>
-				</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="display-align"/>
+			<xsl:call-template name="setTableCellAttributes"/>
 			<fo:block>
 				<xsl:apply-templates/>
@@ -5794,10 +6501,10 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="*[local-name()='name']"/>
+			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']">
 		<xsl:if test="normalize-space() != ''">
 			<fo:inline xsl:use-attribute-sets="termexample-name-style">
 				<xsl:apply-templates/>
@@ -5823,9 +6530,7 @@
 			<xsl:variable name="fo_element">
 				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if>
 				inline
 			</xsl:variable>
 			<!-- display 'EXAMPLE' -->
@@ -5903,6 +6608,8 @@
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" name="termsource">
 		<fo:block xsl:use-attribute-sets="termsource-style">
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
@@ -5940,9 +6647,7 @@
 			<xsl:value-of select="."/>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/*[local-name() = 'strong'][1][following-sibling::*[1][local-name() = 'origin']]/text()">
-		<fo:inline>
+		<fo:inline xsl:use-attribute-sets="termsource-text-style">
 			<xsl:value-of select="."/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'origin']">
@@ -5987,8 +6692,7 @@
 				</xsl:if>
 			<fo:block-container margin-left="0mm">
-				<fo:block xsl:use-attribute-sets="quote-style">
+				<fo:block-container xsl:use-attribute-sets="quote-style">
 						<xsl:if test="ancestor::*[local-name() = 'boilerplate']">
 							<xsl:attribute name="margin-left">7mm</xsl:attribute>
@@ -5996,8 +6700,12 @@
 							<xsl:attribute name="font-style">normal</xsl:attribute>
 						</xsl:if>
-					<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 -->
@@ -6037,7 +6745,7 @@
 		</xsl:variable>
 		<xsl:choose>
-			<xsl:when test="normalize-space($bibitemid) != ''">
+			<xsl:when test="normalize-space($bibitemid) != ''"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link -->
 				<fo:inline xsl:use-attribute-sets="eref-style">
 					<xsl:if test="@type = 'footnote'">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -6060,7 +6768,6 @@
 						</xsl:if>
@@ -6118,7 +6825,6 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'">
 				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -6144,6 +6850,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>
@@ -6218,11 +6949,6 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
@@ -6241,26 +6967,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template><xsl:variable name="ul_labels_">
-			<label level="1">—</label> <!-- em dash -->
-			<label level="2">−</label><!-- minus sign -->
-			<label level="3" font-size="75%">o</label> <!-- white circle -->
+				<label level="1">—</label> <!-- em dash -->
+				<label level="2">−</label><!-- minus sign -->
+				<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">
@@ -6283,9 +6993,94 @@
 				<xsl:apply-templates select="$ul_labels/label[@level = 1]" mode="ul_labels"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</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 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']">
@@ -6301,18 +7096,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>
@@ -6334,7 +7182,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>
@@ -6359,7 +7207,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">
@@ -6443,12 +7291,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/>
@@ -6458,6 +7316,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']">
@@ -6492,64 +7353,105 @@
 		<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
-	</xsl:template><xsl:template name="processBibitem">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][starts-with(@id, 'hidden_bibitem_')]" priority="3"/><xsl:template match="*[local-name() = 'references'][@normative='true']" priority="2">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'references']">
+		<xsl:if test="not(ancestor::*[local-name() = 'annex'])">
+					<fo:block break-after="page"/>
+		</xsl:if>
+		<!-- <xsl:if test="ancestor::*[local-name() = 'annex']">
+			<xsl:if test="$namespace = 'csa' or $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'itu'">
+				<fo:block break-after="page"/>
+			</xsl:if>
+		</xsl:if> -->
+		<fo:block id="{@id}" xsl:use-attribute-sets="references-non-normative-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'bibitem']">
+		<xsl:call-template name="bibitem"/>
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
+				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
+					<xsl:call-template name="processBibitem"/>
+				</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
+		 <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
+			$namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
+				<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
+				<fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
+					<fo:list-item>
+						<fo:list-item-label end-indent="label-end()">
+							<fo:block>
+								<fo:inline>
+											<xsl:value-of select="*[local-name()='docidentifier'][@type = 'metanorma-ordinal']"/>
+											<xsl:if test="not(*[local-name()='docidentifier'][@type = 'metanorma-ordinal'])">
+												<xsl:number format="[1]"/>
+											</xsl:if>
+								</fo:inline>
+							</fo:block>
+						</fo:list-item-label>
+						<fo:list-item-body start-indent="body-start()">
+							<fo:block xsl:use-attribute-sets="bibitem-non-normative-list-body-style">
+								<xsl:call-template name="processBibitem"/>
+							</fo:block>
+						</fo:list-item-body>
+					</fo:list-item>
+				</fo:list-block>
+	</xsl:template><xsl:template name="processBibitem">
-			<!-- start JCGM bibitem processing -->
-			<xsl:variable name="docidentifier">
-				<xsl:if test="*[local-name()='docidentifier']">
+				<!-- start JCGM bibitem processing -->
+				<xsl:variable name="docidentifier">
 					<xsl:choose>
 						<xsl:when test="*[local-name()='docidentifier']/@type = 'metanorma'"/>
 						<xsl:otherwise><xsl:value-of select="*[local-name()='docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
 					</xsl:choose>
-				</xsl:if>
-			</xsl:variable>
-			<xsl:value-of select="$docidentifier"/>
+				</xsl:variable>
+				<xsl:value-of select="$docidentifier"/>
+				<xsl:choose>
+					<xsl:when test="*[local-name()='formattedref']">
+						<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
+						<xsl:apply-templates select="*[local-name()='formattedref']"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="*[local-name()='note']"/>
+						<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
+						<xsl:choose>
+							<xsl:when test="*[local-name()='title'][@type = 'main' and @language = $lang]">
+								<xsl:apply-templates select="*[local-name()='title'][@type = 'main' and @language = $lang]"/>
+							</xsl:when>
+							<xsl:when test="*[local-name()='title'][@type = 'main' and @language = 'en']">
+								<xsl:apply-templates select="*[local-name()='title'][@type = 'main' and @language = 'en']"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="*[local-name()='title']"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:otherwise>
+				</xsl:choose>
+				<!-- end JCGM bibitem processing -->
-			<xsl:choose>
-				<xsl:when test="*[local-name()='formattedref']">
-					<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
-					<xsl:apply-templates select="*[local-name()='formattedref']"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:apply-templates select="*[local-name()='note']"/>
-					<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
-					<xsl:choose>
-						<xsl:when test="*[local-name()='title'][@type = 'main' and @language = $lang]">
-							<xsl:apply-templates select="*[local-name()='title'][@type = 'main' and @language = $lang]"/>
-						</xsl:when>
-						<xsl:when test="*[local-name()='title'][@type = 'main' and @language = 'en']">
-							<xsl:apply-templates select="*[local-name()='title'][@type = 'main' and @language = 'en']"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:apply-templates select="*[local-name()='title']"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:otherwise>
-			</xsl:choose>
-			<!-- end JCGM bibitem processing -->
 	</xsl:template><xsl:template name="processBibitemDocId">
 		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
 		<xsl:choose>
@@ -6606,6 +7508,52 @@
 		<xsl:value-of select="substring(.,1,1)"/>
 	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
 		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'title']" priority="2">
+		<!-- <fo:inline><xsl:apply-templates /></fo:inline> -->
+		<fo:inline font-style="italic"> <!-- BIPM BSI CSD CSA GB IEC IHO ISO ITU JCGM -->
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'note']" priority="2">
+		<fo:footnote>
+			<xsl:variable name="number">
+						<xsl:number level="any" count="*[local-name() = 'bibitem']/*[local-name() = 'note']"/>
+			</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"/>
+						<xsl:text>)</xsl: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"/>
+							<xsl:text>)</xsl:text>
+					</fo:inline>
+					<xsl:apply-templates/>
+				</fo:block>
+			</fo:footnote-body>
+		</fo:footnote>
+	</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'edition']"> <!-- for iho -->
+		<xsl:text> edition </xsl:text>
+		<xsl:value-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'uri']"> <!-- for iho -->
+		<xsl:text> (</xsl:text>
+		<fo:inline xsl:use-attribute-sets="link-style">
+			<fo:basic-link external-destination="." fox:alt-text=".">
+				<xsl:value-of select="."/>
+			</fo:basic-link>
+		</fo:inline>
+		<xsl:text>)</xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'bibitem']/*[local-name() = 'docidentifier']"/><xsl:template match="*[local-name() = 'formattedref']">
+		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'form']">
 		<fo:block>
 			<xsl:apply-templates/>
@@ -6712,7 +7660,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>
@@ -6774,8 +7722,58 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="@language">
 		<xsl:copy-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="4">
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="4">
 		<xsl:call-template name="title"/>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']">
+				<fo:block xsl:use-attribute-sets="admonition-style">
+						<xsl:call-template name="displayAdmonitionName"/>
+						<xsl:text> — </xsl:text>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
+	</xsl:template><xsl:template name="displayAdmonitionName">
+				<xsl:apply-templates select="*[local-name() = 'name']"/>
+				<xsl:if test="not(*[local-name() = 'name'])">
+					<xsl:apply-templates select="@type"/>
+				</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'name']">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/@type">
+		<xsl:variable name="admonition_type_">
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">admonition.<xsl:value-of select="."/></xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="admonition_type" select="normalize-space(java:toUpperCase(java:java.lang.String.new($admonition_type_)))"/>
+		<xsl:value-of select="$admonition_type"/>
+		<xsl:if test="$admonition_type = ''">
+			<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'admonition']/*[local-name() = 'p']">
+				<fo:block xsl:use-attribute-sets="admonition-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -6783,83 +7781,80 @@
 		<xsl:variable name="month" select="substring($date, 6, 2)"/>
 		<xsl:variable name="day" select="substring($date, 9, 2)"/>
 		<xsl:variable name="monthStr">
-			<xsl:choose>
-				<xsl:when test="$month = '01'">January</xsl:when>
-				<xsl:when test="$month = '02'">February</xsl:when>
-				<xsl:when test="$month = '03'">March</xsl:when>
-				<xsl:when test="$month = '04'">April</xsl:when>
-				<xsl:when test="$month = '05'">May</xsl:when>
-				<xsl:when test="$month = '06'">June</xsl:when>
-				<xsl:when test="$month = '07'">July</xsl:when>
-				<xsl:when test="$month = '08'">August</xsl:when>
-				<xsl:when test="$month = '09'">September</xsl:when>
-				<xsl:when test="$month = '10'">October</xsl:when>
-				<xsl:when test="$month = '11'">November</xsl:when>
-				<xsl:when test="$month = '12'">December</xsl:when>
-			</xsl:choose>
+			<xsl:call-template name="getMonthByNum">
+				<xsl:with-param name="num" select="$month"/>
+				<xsl:with-param name="lowercase" select="'true'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="monthStr_localized">
+			<xsl:if test="normalize-space($monthStr) != ''"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_<xsl:value-of select="$monthStr"/></xsl:with-param></xsl:call-template></xsl:if>
 		</xsl:variable>
 		<xsl:variable name="result">
 			<xsl:choose>
-				<xsl:when test="$format = 'ddMMyyyy'">
+				<xsl:when test="$format = 'ddMMyyyy'"> <!-- convert date from format 2007-04-01 to 1 April 2007 -->
 					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
 					<xsl:text> </xsl:text>
-					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+					<xsl:value-of select="normalize-space(concat($monthStr_localized, ' ' , $year))"/>
 				</xsl:when>
 				<xsl:when test="$format = 'ddMM'">
 					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
-					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr_localized"/>
 				</xsl:when>
 				<xsl:when test="$format = 'short' or $day = ''">
-					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
+					<xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $year))"/>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
+					<xsl:value-of select="normalize-space(concat($monthStr_localized, ' ', $day, ', ' , $year))"/> <!-- January 01, 2022 -->
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:value-of select="$result"/>
-	</xsl:template><xsl:template name="convertDateLocalized">
-		<xsl:param name="date"/>
-		<xsl:param name="format" select="'short'"/>
-		<xsl:variable name="year" select="substring($date, 1, 4)"/>
-		<xsl:variable name="month" select="substring($date, 6, 2)"/>
-		<xsl:variable name="day" select="substring($date, 9, 2)"/>
-		<xsl:variable name="monthStr">
-			<xsl:choose>
-				<xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
-				<xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:variable name="result">
+	</xsl:template><xsl:template name="getMonthByNum">
+		<xsl:param name="num"/>
+		<xsl:param name="lang">en</xsl:param>
+		<xsl:param name="lowercase">false</xsl:param> <!-- return 'january' instead of 'January' -->
+		<xsl:variable name="monthStr_">
 			<xsl:choose>
-				<xsl:when test="$format = 'ddMMyyyy'">
-					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
-					<xsl:text> </xsl:text>
-					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
-				</xsl:when>
-				<xsl:when test="$format = 'ddMM'">
-					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
-					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
-				</xsl:when>
-				<xsl:when test="$format = 'short' or $day = ''">
-					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
+				<xsl:when test="$lang = 'fr'">
+					<xsl:choose>
+						<xsl:when test="$num = '01'">Janvier</xsl:when>
+						<xsl:when test="$num = '02'">Février</xsl:when>
+						<xsl:when test="$num = '03'">Mars</xsl:when>
+						<xsl:when test="$num = '04'">Avril</xsl:when>
+						<xsl:when test="$num = '05'">Mai</xsl:when>
+						<xsl:when test="$num = '06'">Juin</xsl:when>
+						<xsl:when test="$num = '07'">Juillet</xsl:when>
+						<xsl:when test="$num = '08'">Août</xsl:when>
+						<xsl:when test="$num = '09'">Septembre</xsl:when>
+						<xsl:when test="$num = '10'">Octobre</xsl:when>
+						<xsl:when test="$num = '11'">Novembre</xsl:when>
+						<xsl:when test="$num = '12'">Décembre</xsl:when>
+					</xsl:choose>
 				</xsl:when>
 				<xsl:otherwise>
-					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
+					<xsl:choose>
+						<xsl:when test="$num = '01'">January</xsl:when>
+						<xsl:when test="$num = '02'">February</xsl:when>
+						<xsl:when test="$num = '03'">March</xsl:when>
+						<xsl:when test="$num = '04'">April</xsl:when>
+						<xsl:when test="$num = '05'">May</xsl:when>
+						<xsl:when test="$num = '06'">June</xsl:when>
+						<xsl:when test="$num = '07'">July</xsl:when>
+						<xsl:when test="$num = '08'">August</xsl:when>
+						<xsl:when test="$num = '09'">September</xsl:when>
+						<xsl:when test="$num = '10'">October</xsl:when>
+						<xsl:when test="$num = '11'">November</xsl:when>
+						<xsl:when test="$num = '12'">December</xsl:when>
+					</xsl:choose>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:value-of select="$result"/>
+		<xsl:choose>
+			<xsl:when test="normalize-space($lowercase) = 'true'">
+				<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($monthStr_))"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$monthStr_"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
@@ -6892,9 +7887,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>
@@ -7119,10 +8111,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>
@@ -7157,6 +8151,7 @@
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:when>
+			<xsl:when test="$returnEmptyIfNotFound = 'true'"/>
 			<xsl:otherwise>
 				<xsl:variable name="key_">
 					<xsl:call-template name="capitalize">
@@ -7166,7 +8161,6 @@
 				<xsl:value-of select="$key_"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="setTrackChangesStyles">
 		<xsl:param name="isAdded"/>
 		<xsl:param name="isDeleted"/>
@@ -7208,15 +8202,18 @@
 		</xsl:choose>
 	</xsl:template><xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:variable name="align" select="normalize-space(@align)"/>
 		<xsl:attribute name="text-align">
 			<xsl:choose>
-				<xsl:when test="@align and not(@align = 'indent')"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
+				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
+				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
 				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:attribute>
-		<xsl:if test="@align = 'indent'">
+		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
 	</xsl:template><xsl:template name="number-to-words">
@@ -7224,53 +8221,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>
@@ -7315,6 +8412,25 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:if>
+	</xsl:template><xsl:template name="number-to-ordinal">
+		<xsl:param name="number"/>
+		<xsl:param name="curr_lang"/>
+		<xsl:choose>
+			<xsl:when test="$curr_lang = 'fr'">
+				<xsl:choose>
+					<xsl:when test="$number = '1'">re</xsl:when>
+					<xsl:otherwise>e</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="$number = 1">st</xsl:when>
+					<xsl:when test="$number = 2">nd</xsl:when>
+					<xsl:when test="$number = 3">rd</xsl:when>
+					<xsl:otherwise>th</xsl:otherwise>
+				</xsl:choose>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="setAltText">
 		<xsl:param name="value"/>
 		<xsl:attribute name="fox:alt-text">
@@ -7325,4 +8441,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>