metanorma-iso 1.10.5 → 2.0.2

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -16,8 +16,7 @@
 	
 	
 	<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="12.5"/>
 	<xsl:variable name="marginTop" select="27.4"/>
@@ -175,7 +174,7 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root font-family="Cambria, Times New Roman, Cambria Math, Source Han Sans" font-size="11pt" xml:lang="{$lang}"> <!--   -->
+		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}"> <!--   -->
 			<xsl:if test="$lang = 'zh'">
 				<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
 			</xsl:if>
@@ -457,14 +456,6 @@
 									<fo:block-container>
 										<fo:block margin-top="-1mm" font-size="20pt" text-align="right">
 											<xsl:value-of select="$stage-fullname-uppercased"/>
-											<!-- <xsl:if test="$doctype = 'amendment'">
-												<xsl:variable name="title-amendment">
-													<xsl:call-template name="getTitle">
-														<xsl:with-param name="name" select="'title-amendment'"/>
-													</xsl:call-template>
-												</xsl:variable>
-												<xsl:text> </xsl:text><xsl:value-of select="$title-amendment"/>
-											</xsl:if> -->
 										</fo:block>
 										<fo:block font-size="20pt" font-weight="bold" text-align="right">
 											<xsl:value-of select="$docidentifierISO"/>
@@ -655,12 +646,8 @@
 														<xsl:if test="$doctype = 'amendment'">
 															<fo:block text-align="right" margin-right="0.5mm">
 																<fo:block font-weight="bold" margin-top="4pt" role="H1">
-																	<xsl:variable name="title-amendment">
-																		<xsl:call-template name="getTitle">
-																			<xsl:with-param name="name" select="'title-amendment'"/>
-																		</xsl:call-template>
-																	</xsl:variable>
-																	<xsl:value-of select="$title-amendment"/><xsl:text> </xsl:text>
+																	<xsl:value-of select="$doctype_uppercased"/>
+																	<xsl:text> </xsl:text>
 																	<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
 																	<xsl:if test="normalize-space($amendment-number) != ''">
 																		<xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
@@ -1193,8 +1180,13 @@
 								<xsl:if test="normalize-space($title-part-doc-lang) != ''">
 									<xsl:if test="$part != ''">
 										<xsl:text> — </xsl:text>
-										<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">											
-											<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang=$lang]),'#',$part)"/>											
+										<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">Part.sg</xsl:with-param>
+											</xsl:call-template>
+											<xsl:text> </xsl:text>
+											<xsl:value-of select="$part"/>
+											<xsl:text>:</xsl:text>
 											<!-- <xsl:value-of select="$title-part-en"/>
 											<xsl:value-of select="$part"/>
 											<xsl:text>:</xsl:text> -->
@@ -1334,12 +1326,7 @@
 		<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']"/>
 		<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
 			<fo:block font-weight="normal" line-height="1.1">
-				<xsl:variable name="title-amendment">
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-amendment'"/>
-					</xsl:call-template>
-				</xsl:variable>
-				<xsl:value-of select="$title-amendment"/>
+				<xsl:value-of select="$doctype_uppercased"/>
 				<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
 				<xsl:if test="normalize-space($amendment-number) != ''">
 					<xsl:text> </xsl:text><xsl:value-of select="$amendment-number"/>
@@ -1353,10 +1340,7 @@
 	<!-- ============================= -->
 	<!-- CONTENTS                                       -->
 	<!-- ============================= -->
-	<xsl:template match="node()" mode="contents">		
-		<xsl:apply-templates mode="contents"/>			
-	</xsl:template>
-
+	
 	<!-- element with title -->
 	<xsl:template match="*[iso:title]" mode="contents">
 		<xsl:variable name="level">
@@ -1380,7 +1364,7 @@
 			<xsl:choose>				
 				<xsl:when test="ancestor-or-self::iso:annex and $level &gt;= 2">false</xsl:when>
 				<xsl:when test="$section = '' and $type = 'clause'">false</xsl:when>
-				<xsl:when test="$level &lt;= 3">true</xsl:when>
+				<xsl:when test="$level &lt;= $toc_level">true</xsl:when>
 				<xsl:otherwise>false</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -1454,26 +1438,7 @@
 	
 	<!-- ============================= -->
 	<!-- ============================= -->
-	
-	
-	<xsl:template match="iso:license-statement//iso:title">
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<fo:block text-align="center" font-weight="bold" role="H{$level}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	
-	<xsl:template match="iso:license-statement//iso:p">
-		<fo:block margin-left="1.5mm" margin-right="1.5mm">
-			<xsl:if test="following-sibling::iso:p">
-				<xsl:attribute name="margin-top">6pt</xsl:attribute>
-				<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
+
 	
 	<!-- <fo:block margin-bottom="12pt">© ISO 2019, Published in Switzerland.</fo:block>
 			<fo:block font-size="10pt" margin-bottom="12pt">All rights reserved. Unless otherwise specified, no part of this publication may be reproduced or utilized otherwise in any form or by any means, electronic or mechanical, including photocopying, or posting on the internet or an intranet, without prior written permission. Permission can be requested from either ISO at the address below or ISO’s member body in the country of the requester.</fo:block>
@@ -1487,7 +1452,7 @@
 				<fo:block>www.iso.org</fo:block>
 			</fo:block> -->
 	
-	<xsl:template match="iso:copyright-statement/iso:clause[1]/iso:title">
+	<xsl:template match="iso:copyright-statement/iso:clause[1]/iso:title" priority="2">
 		<fo:block margin-bottom="3mm" role="H1">
 				<fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-Attention))}" width="14mm" content-height="13mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
 				<!-- <fo:inline padding-left="6mm" font-size="12pt" font-weight="bold">COPYRIGHT PROTECTED DOCUMENT</fo:inline> -->
@@ -1495,17 +1460,12 @@
 			</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="iso:copyright-statement//iso:p">
+	<xsl:template match="iso:copyright-statement//iso:p" priority="2">
 		<fo:block>
-			<xsl:if test="preceding-sibling::iso:p">
-				<!-- <xsl:attribute name="font-size">10pt</xsl:attribute> -->
-			</xsl:if>
 			<xsl:if test="following-sibling::iso:p">
-				<!-- <xsl:attribute name="margin-bottom">12pt</xsl:attribute> -->
 				<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
 			</xsl:if>
-			<xsl:if test="contains(@id, 'address')"> <!-- not(following-sibling::iso:p) -->
-				<!-- <xsl:attribute name="margin-left">7.1mm</xsl:attribute> -->
+			<xsl:if test="contains(@id, 'address')">
 				<xsl:attribute name="margin-left">4mm</xsl:attribute>
 			</xsl:if>
 			<xsl:apply-templates/>
@@ -1639,7 +1599,7 @@
 	<!-- ====== -->
 
 	
-	<xsl:template match="iso:p">
+	<xsl:template match="iso: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">
@@ -1708,15 +1668,13 @@
 		
 	<xsl:template match="iso:ul | iso:ol" mode="ul_ol">
 		<fo:list-block provisional-distance-between-starts="7mm" margin-top="8pt"> <!-- margin-bottom="8pt" -->
-			<xsl:apply-templates/>
+			<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
 		</fo:list-block>
 		<xsl:for-each select="./iso:note">
 			<xsl:call-template name="note"/>
 		</xsl:for-each>
 	</xsl:template>
 	
-	<xsl:template match="iso:ul/iso:note |  iso:ol/iso:note | iso:ul/iso:li/iso:note |  iso:ol/iso:li/iso:note" priority="2"/>
-	
 	<xsl:template match="iso:li">
 		<fo:list-item id="{@id}">
 			<fo:list-item-label end-indent="label-end()">
@@ -1726,8 +1684,8 @@
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()">
 				<fo:block>
-					<xsl:apply-templates/>
-					<!-- <xsl:apply-templates select=".//iso:note" mode="process"/> -->
+					<xsl:apply-templates select="node()[not(local-name() = 'note')]"/>
+					
 					<xsl:for-each select="./iso:note">
 						<xsl:call-template name="note"/>
 					</xsl:for-each>
@@ -1736,13 +1694,6 @@
 		</fo:list-item>
 	</xsl:template>
 	
-	<xsl:template match="iso:note" mode="process">
-		<xsl:call-template name="note"/>
-	</xsl:template>
-	
-	<xsl:template match="*" mode="process">
-		<xsl:apply-templates select="."/>
-	</xsl:template>
 	
 	<xsl:template match="iso:preferred">	
 		<xsl:variable name="levelTerm">
@@ -1750,7 +1701,7 @@
 		</xsl:variable>
 		<fo:block line-height="1.1" role="H{$levelTerm}">
 			<fo:block font-weight="bold" keep-with-next="always">
-				<xsl:apply-templates select="ancestor::iso:term[1]/iso:name" mode="presentation"/>
+				<xsl:apply-templates select="ancestor::iso:term[1]/iso:name"/>
 			</fo:block>
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:call-template name="setStyle_preferred"/>
@@ -1760,95 +1711,7 @@
 	</xsl:template>
 	
 
-	<xsl:template match="iso:references[@normative='true']">
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	
-	<!-- <xsl:template match="iso:references[@id = '_bibliography']"> -->
-	<xsl:template match="iso:references[not(@normative='true')]">
-		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-
-
-	<xsl:template match="iso:bibitem">
-		<fo:block id="{@id}" margin-bottom="6pt">
-			<xsl:call-template name="processBibitem"/>
-		</fo:block>
-	</xsl:template>
-	
-	
-	<xsl:template match="iso:bibitem/iso:note" priority="2">
-		<fo:footnote>
-			<xsl:variable name="number">
-				<xsl:number level="any" count="iso:bibitem/iso: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>
-
-	<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
-	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem"> -->
-	<xsl:template match="iso:references[not(@normative='true')]/iso: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:number format="[1]"/>
-						</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="iso:references[@id = '_bibliography']/iso:bibitem" mode="contents"/> [not(@normative='true')] -->
-	<xsl:template match="iso:references/iso:bibitem" mode="contents"/>
-	
-	<!-- <xsl:template match="iso:references[@id = '_bibliography']/iso:bibitem/iso:title"> iso:references[not(@normative='true')]/ -->
-	<xsl:template match="iso:bibitem/iso:title">
-		<fo:inline font-style="italic">
-			<xsl:apply-templates/>
-		</fo:inline>
-	</xsl:template>
-
-	
-	<xsl:template match="iso: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="iso:formula/iso:stem">
 		<fo:block margin-top="6pt" margin-bottom="12pt">
 			<fo:table table-layout="fixed" width="100%">
@@ -1863,7 +1726,7 @@
 						</fo:table-cell>
 						<fo:table-cell display-align="center">
 							<fo:block text-align="right">
-								<xsl:apply-templates select="../iso:name" mode="presentation"/>
+								<xsl:apply-templates select="../iso:name" mode="formula_number"/>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
@@ -2120,55 +1983,36 @@
 	</xsl:template>
 
 	
-<xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
-				
-		<title-annex lang="en">Annex </title-annex>
-		<title-annex lang="fr">Annexe </title-annex>
-		
-			<title-annex lang="zh">Annex </title-annex>
-		
-		
+<xsl:variable name="pageWidth_">
+		210
+	</xsl:variable><xsl:variable name="pageWidth" select="normalize-space($pageWidth_)"/><xsl:variable name="pageHeight_">
+		297
+	</xsl:variable><xsl:variable name="pageHeight" select="normalize-space($pageHeight_)"/><xsl:variable name="titles_">
 				
 		<title-edition lang="en">
 			
-				<xsl:text>Edition </xsl:text>
-			
-			
+					<xsl:text>Edition </xsl:text>
+				
 		</title-edition>
 		
 		<title-edition lang="fr">
-			
-				<xsl:text>Édition </xsl:text>
-			
+			<xsl:text>Édition </xsl:text>
 		</title-edition>
 		
-
+		<!-- These titles of Table of contents renders different than determined in localized-strings -->
 		<title-toc lang="en">
 			
-				<xsl:text>Contents</xsl:text>
-			
 			
 			
 		</title-toc>
 		<title-toc lang="fr">
+			<xsl:text>Sommaire</xsl:text>
+		</title-toc>
+		<title-toc lang="zh">
 			
-				<xsl:text>Sommaire</xsl:text>
-			
-			
-			</title-toc>
-		
-			<title-toc lang="zh">Contents</title-toc>
-		
-		
-		
-		<title-page lang="en">Page</title-page>
-		<title-page lang="fr">Page</title-page>
-		
-		<title-key lang="en">Key</title-key>
-		<title-key lang="fr">Légende</title-key>
-			
-		<title-where lang="en">where</title-where>
-		<title-where lang="fr">où</title-where>
+					<xsl:text>Contents</xsl:text>
+				
+		</title-toc>
 					
 		<title-descriptors lang="en">Descriptors</title-descriptors>
 		
@@ -2188,32 +2032,9 @@
 		</title-part>		
 		<title-part lang="zh">第 # 部分:</title-part>
 		
-		<title-subpart lang="en">			
-			
-		</title-subpart>
-		<title-subpart lang="fr">		
-			
-		</title-subpart>
-		
-		<title-modified lang="en">modified</title-modified>
-		<title-modified lang="fr">modifiée</title-modified>
-		
-			<title-modified lang="zh">modified</title-modified>
-		
+		<title-subpart lang="en">Sub-part #</title-subpart>
+		<title-subpart lang="fr">Partie de sub #</title-subpart>
 		
-		
-		<title-source lang="en">
-			
-				<xsl:text>SOURCE</xsl:text>
-						
-			 
-		</title-source>
-		
-		<title-keywords lang="en">Keywords</title-keywords>
-		
-		<title-deprecated lang="en">DEPRECATED</title-deprecated>
-		<title-deprecated lang="fr">DEPRECATED</title-deprecated>
-				
 		<title-list-tables lang="en">List of Tables</title-list-tables>
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
@@ -2222,41 +2043,12 @@
 		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
-		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
-		
-		<title-abstract lang="en">Abstract</title-abstract>
-		
 		<title-summary lang="en">Summary</title-summary>
 		
-		<title-in lang="en">in </title-in>
-		
-		<title-partly-supercedes lang="en">Partly Supercedes </title-partly-supercedes>
-		<title-partly-supercedes lang="zh">部分代替 </title-partly-supercedes>
-		
-		<title-completion-date lang="en">Completion date for this manuscript</title-completion-date>
-		<title-completion-date lang="zh">本稿完成日期</title-completion-date>
-		
-		<title-issuance-date lang="en">Issuance Date: #</title-issuance-date>
-		<title-issuance-date lang="zh"># 发布</title-issuance-date>
-		
-		<title-implementation-date lang="en">Implementation Date: #</title-implementation-date>
-		<title-implementation-date lang="zh"># 实施</title-implementation-date>
-
-		<title-obligation-normative lang="en">normative</title-obligation-normative>
-		<title-obligation-normative lang="zh">规范性附录</title-obligation-normative>
-		
-		<title-caution lang="en">CAUTION</title-caution>
-		<title-caution lang="zh">注意</title-caution>
-			
-		<title-warning lang="en">WARNING</title-warning>
-		<title-warning lang="zh">警告</title-warning>
-		
-		<title-amendment lang="en">AMENDMENT</title-amendment>
-		
 		<title-continued lang="en">(continued)</title-continued>
 		<title-continued lang="fr">(continué)</title-continued>
 		
-	</xsl:variable><xsl:variable name="bibdata">
+	</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">
@@ -2285,6 +2077,75 @@
 	</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:attribute name="font-family">Cambria, Times New Roman, Cambria Math, Source Han Sans</xsl:attribute>
+			<xsl:attribute name="font-size">11pt</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 name="text-align">center</xsl:attribute>
+		
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="license-statement-p-style">
+		
+		
+			<xsl:attribute name="margin-left">1.5mm</xsl:attribute>
+			<xsl:attribute name="margin-right">1.5mm</xsl:attribute>
+		
+		
+		
+	</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">
 		
 		
@@ -2294,19 +2155,29 @@
 		
 		
 		
+	</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>
 		
 		
 		
+				
 		
 		
-				
 		
 		
 		
@@ -2367,16 +2238,18 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
 		
+		
 	</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="keep-with-next">always</xsl:attribute>
 		
 		
 		
@@ -2402,6 +2275,7 @@
 		
 		
 		
+		
 			<xsl:attribute name="text-align">justify</xsl:attribute>
 		
 		
@@ -2423,115 +2297,330 @@
 				
 	</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="color">blue</xsl:attribute>
-			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="eref-style">
 		
 		
 		
 		
+			<xsl:attribute name="border">1.5pt solid black</xsl:attribute>
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
 		
 		
-				
 		
 		
-			<xsl:attribute name="font-size">10pt</xsl:attribute>
-			<xsl:attribute name="margin-top">8pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-			<xsl:attribute name="text-align">justify</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:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
 		
 		
+				
 		
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-row-style">
+		<xsl:attribute name="min-height">4mm</xsl:attribute>
 		
-			<xsl:attribute name="padding-right">6mm</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-note-name-style">
 		
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
+				
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-footer-row-style" use-attribute-sets="table-row-style">
 		
 		
-				
 		
-					
-			<xsl:attribute name="margin-top">8pt</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>			
+			<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">
+		
+		
+		
+			<xsl:attribute name="color">blue</xsl:attribute>
+			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="eref-style">
+		
+		
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="note-style">
+		
+		
+		
+		
+				
+		
+		
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="text-align">justify</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
+		
+		
+		
+		
+		
+		
+		
+			<xsl:attribute name="padding-right">6mm</xsl:attribute>
+		
+		
+		
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		<xsl:attribute name="padding-right">2mm</xsl:attribute>
+		
+		
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
+		
+		
+		
+				
+		
+					
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>			
 		
 		
 		
@@ -2587,6 +2676,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">
 		
 		
@@ -2596,6 +2688,8 @@
 		
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
 		
+	</xsl:attribute-set><xsl:attribute-set name="figure-style">
+		
 	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
 		
 		
@@ -2698,6 +2792,17 @@
 		
 	</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">
@@ -2768,30 +2873,196 @@
 		
 		
 		
-	</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:template name="OLD_processPrefaceSectionsDefault_Contents">
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
-	</xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
+	</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: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:for-each select="/*/*[local-name()='preface']/*">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
-	</xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
-		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>			
-		
-		<!-- Normative references  -->
-		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true'] |   /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][@normative='true']]" mode="contents"/>	
-		<!-- Terms and definitions -->
-		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] |                       /*/*[local-name()='sections']/*[local-name()='definitions'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>		
-		<!-- Another main sections -->
-		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and                                                local-name() != 'definitions' and                                                not(@type='scope') and                                               not(local-name() = 'clause' and .//*[local-name()='terms']) and                                               not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
-		<xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>		
-		<!-- Bibliography -->
-		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] |       /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
-		
 	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
 	
 		<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']]">
@@ -2808,29 +3079,11 @@
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="." mode="contents"/>
 		</xsl:for-each>
-	</xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
-		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
 	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/*[local-name()='preface']/*">
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:apply-templates select="."/>
 		</xsl:for-each>
-	</xsl:template><xsl:template name="OLD_processMainSectionsDefault">			
-		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
-		
-		<!-- Normative references  -->
-		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
-		<!-- Terms and definitions -->
-		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] |                       /*/*[local-name()='sections']/*[local-name()='definitions'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
-		<!-- Another main sections -->
-		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and                                                local-name() != 'definitions' and                                                not(@type='scope') and                                               not(local-name() = 'clause' and .//*[local-name()='terms']) and                                               not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
-		<xsl:apply-templates select="/*/*[local-name()='annex']"/>
-		<!-- Bibliography -->
-		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
 	</xsl:template><xsl:template name="processMainSectionsDefault">
 		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -2851,6 +3104,79 @@
 		<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']">
+		
+				<xsl:variable name="level">
+					<xsl:call-template name="getLevel"/>
+				</xsl:variable>
+				<fo:block role="H{$level}" xsl:use-attribute-sets="license-statement-title-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			
+	</xsl:template><xsl:template match="*[local-name()='license-statement']//*[local-name()='p']">
+		
+				<fo:block xsl:use-attribute-sets="license-statement-p-style">
+		
+					
+						<xsl:if test="following-sibling::*[local-name() = 'p']">
+							<xsl:attribute name="margin-top">6pt</xsl:attribute>
+							<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+						</xsl:if>
+					
+					
+					
+					
+					<xsl:apply-templates/>
+				</fo:block>
+			
+	</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']">
+		
+				<!-- process in the template 'paragraph' -->
+				<xsl:call-template name="paragraph"/>
+			
+	</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']">
+		
+				<!-- process in the template 'paragraph' -->
+				<xsl:call-template name="paragraph"/>
+			
 	</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"/>
@@ -2867,10 +3193,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  -->
@@ -2878,28 +3200,8 @@
 			
 			
 			
-			
-				
-			
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/tr[1]/td)"/>
 			
-			<!-- <xsl:variable name="cols-count">
-				<xsl:choose>
-					<xsl:when test="*[local-name()='thead']">
-						<xsl:call-template name="calculate-columns-numbers">
-							<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
-						</xsl:call-template>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:call-template name="calculate-columns-numbers">
-							<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
-						</xsl:call-template>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable> -->
-			<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
-			<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
-			
 			<xsl:variable name="colwidths">
 				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
 					<xsl:call-template name="calculate-column-widths">
@@ -2910,17 +3212,8 @@
 			</xsl:variable>
 			<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 			
-			<!-- <xsl:variable name="colwidths2">
-				<xsl:call-template name="calculate-column-widths">
-					<xsl:with-param name="cols-count" select="$cols-count"/>
-				</xsl:call-template>
-			</xsl:variable> -->
 			
-			<!-- cols-count=<xsl:copy-of select="$cols-count"/>
-			colwidthsNew=<xsl:copy-of select="$colwidths"/>
-			colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
-			
-			<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>
@@ -2928,83 +3221,69 @@
 			</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:value-of select="$table_width_default"/>
 				</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>
-					
-					
-					
-						<xsl:if test="ancestor::*[local-name() = 'table']">
-							<!-- for internal table in table cell -->
-							<attribute name="border">0.5pt solid black</attribute>
-						</xsl:if>
-					
-					
-					
-					
-						<attribute name="margin-left">0mm</attribute>
-						<attribute name="margin-right">0mm</attribute>
-					
-									
-									
-									
-					
-									
-					
-					
+				
+				
+				<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:if test="ancestor::*[local-name() = 'table']">
+								<!-- for internal table in table cell -->
+								<xsl:attribute name="border">0.5pt 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>
@@ -3015,7 +3294,6 @@
 					</xsl:if>
 					
 					
-					
 					<xsl:choose>
 						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
 							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
@@ -3041,7 +3319,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>
 					
@@ -3056,25 +3334,6 @@
 					</xsl:call-template>
 				</xsl:for-each>
 				
-				<!-- insert footer as table -->
-				<!-- <fo:table>
-					<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
-						<xsl:attribute name="{@name}">
-							<xsl:value-of select="."/>
-						</xsl:attribute>
-					</xsl:for-each>
-					
-					<xsl:for-each select="xalan:nodeset($colwidths)//column">
-						<xsl:choose>
-							<xsl:when test=". = 1 or . = 0">
-								<fo:table-column column-width="proportional-column-width(2)"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<fo:table-column column-width="proportional-column-width({.})"/>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:for-each>
-				</fo:table>-->
 				
 				
 				
@@ -3135,20 +3394,17 @@
 			</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>
-				
+
 				
 				
 				
 				
 				<xsl:choose>
 					<xsl:when test="$continued = 'true'"> 
-						<!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
 						
 							<xsl:apply-templates/>
 						
@@ -3213,13 +3469,6 @@
 						<xsl:for-each select="xalan:nodeset($table)/*/tr">
 							<xsl:variable name="td_text">
 								<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
-								
-								<!-- <xsl:if test="$namespace = 'bipm'">
-									<xsl:for-each select="*[local-name()='td'][$curr-col]//*[local-name()='math']">									
-										<word><xsl:value-of select="normalize-space(.)"/></word>
-									</xsl:for-each>
-								</xsl:if> -->
-								
 							</xsl:variable>
 							<xsl:variable name="words">
 								<xsl:variable name="string_with_added_zerospaces">
@@ -3256,7 +3505,6 @@
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable>
-
 			
 			<column>
 				<xsl:for-each select="xalan:nodeset($widths)//width">
@@ -3290,9 +3538,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">
@@ -3308,96 +3555,35 @@
 		<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">
 						<xsl:text> </xsl:text>
 						<fo:retrieve-table-marker retrieve-class-name="table_continued"/>
 					</fo:block>
 				
+				
 			</fo:table-cell>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
 		<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"/>
-			</fo:table-footer>
-		</xsl:if>
-	</xsl:template><xsl:template name="insertTableFooter2">
-		<xsl:param name="cols-count"/>
-		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
-		<xsl:if test="../*[local-name()='tfoot'] or           $isNoteOrFnExist = 'true'">
-		
-			<fo:table-footer>
-			
-				<xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/>
-				
-				<!-- if there are note(s) or fn(s) then create footer row -->
-				<xsl:if test="$isNoteOrFnExist = 'true'">
-				
-					
-				
-					<fo:table-row>
-						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
-							
-								<xsl:attribute name="border-top">solid black 0pt</xsl:attribute>
-							
-							
-							
-							<!-- fn will be processed inside 'note' processing -->
-							
-							
-							
-							
-							
-							
-							<!-- except gb -->
-							
-								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
-							
-							
-							<!-- show Note under table in preface (ex. abstract) sections -->
-							<!-- empty, because notes show at page side in main sections -->
-							<!-- <xsl:if test="$namespace = 'bipm'">
-								<xsl:choose>
-									<xsl:when test="ancestor::*[local-name()='preface']">										
-										<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
-									</xsl:when>
-									<xsl:otherwise>										
-									<fo:block/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</xsl:if> -->
-							
-							
-							<!-- horizontal row separator -->
-							
-							
-							<!-- fn processing -->
-							<xsl:call-template name="fn_display"/>
-							
-						</fo:table-cell>
-					</fo:table-row>
-					
-				</xsl:if>
+				<xsl:apply-templates select="../*[local-name()='tfoot']"/>
 			</fo:table-footer>
-		
 		</xsl:if>
 	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
 		<xsl:param name="table_attributes"/>
@@ -3424,17 +3610,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>
@@ -3463,11 +3650,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 -->
@@ -3477,37 +3663,20 @@
 							
 							
 							
-							
-							
-							
 							<!-- for BSI (not PAS) display Notes before footnotes -->
 							
 							
-							<!-- except gb  -->
+							<!-- except gb and bsi  -->
 							
-								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
-							
-							
-							<!-- <xsl:if test="$namespace = 'bipm'">
-								<xsl:choose>
-									<xsl:when test="ancestor::*[local-name()='preface']">
-										show Note under table in preface (ex. abstract) sections
-										<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
-									</xsl:when>
-									<xsl:otherwise>
-										empty, because notes show at page side in main sections
-									<fo:block/>
-									</xsl:otherwise>
-								</xsl:choose>
-							</xsl:if> -->
+									<xsl:apply-templates select="../*[local-name()='note']"/>
+								
 							
 							
 							<!-- horizontal row separator -->
 							
 							
 							<!-- fn processing -->
-							<xsl:call-template name="fn_display"/>
-							
+							<xsl:call-template name="table_fn_display"/>
 							
 							<!-- for PAS display Notes after footnotes -->
 							
@@ -3546,7 +3715,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>
 		
@@ -3594,99 +3763,68 @@
 			
 
 			<xsl:apply-templates/>
-			<!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
-		
+			
 		</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(..)"/>
-		<!-- <xsl:variable name="namespace" select="substring-before(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:if test="$namespace = 'bipm'">
-					<xsl:attribute name="height">8mm</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:value-of select="@align"/> -->
+					<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:call-template name="setTableRowAttributes"/>
 			
-				<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<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>
 			
 			
 			
 			
+
 			
 			
 			
@@ -3695,21 +3833,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">
@@ -3722,93 +3864,77 @@
 			</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:value-of select="@align"/> -->
-					</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>
 			
 			
 			
+			 <!-- bsi -->
+			
 			
 			
-				<xsl:if test="ancestor::*[local-name() = 'tfoot']">
-					<xsl:attribute name="border">solid black 0</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">
 	
@@ -3888,8 +4014,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">
 								
@@ -3908,7 +4033,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']">
@@ -3919,36 +4044,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>
-						
-						<!-- <xsl:apply-templates /> -->
+					<fo:inline xsl:use-attribute-sets="table-fn-body-style">
 						<xsl:copy-of select="./node()"/>
 					</fo:inline>
 				</fo:block>
@@ -3960,15 +4075,7 @@
 			
 			<xsl:apply-templates/>
 		</fn>
-	</xsl:template><xsl:template name="fn_name_display">
-		<!-- <xsl:variable name="references">
-			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
-				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
-					<xsl:apply-templates />
-				</fn>
-			</xsl:for-each>
-		</xsl:variable>
-		$references=<xsl:copy-of select="$references"/> -->
+	</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>
@@ -3977,9 +4084,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}">
@@ -3987,50 +4092,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:variable>
-					<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
-					<!-- <xsl:element name="{$ns}:table"> -->
 						<xsl:for-each select="*[local-name() = 'dl'][1]">
 							<tbody>
 								<xsl:apply-templates mode="dl"/>
 							</tbody>
 						</xsl:for-each>
-					<!-- </xsl:element> -->
-				</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: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>
+
 			<fo:block>
 				<fo:table width="95%" table-layout="fixed">
 					<xsl:if test="normalize-space($key_iso) = 'true'">
@@ -4057,20 +4164,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>
@@ -4083,24 +4188,17 @@
 		</xsl:if>
 		
 	</xsl:template><xsl:template match="*[local-name()='fn']">
-		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
-		<fo:inline font-size="80%" keep-with-previous.within-line="always">
+		<fo:inline xsl:use-attribute-sets="fn-reference-style">
+		
 			
 			
 			
 				<xsl:if test="ancestor::*[local-name()='table']">
 					<xsl:attribute name="font-weight">normal</xsl:attribute>
-					<!-- <xsl:attribute name="alignment-baseline">hanging</xsl:attribute> -->
 					<xsl:attribute name="baseline-shift">15%</xsl:attribute>
 				</xsl:if>
 			
 			
-			
-			
-			
-			
-			
-			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				
@@ -4120,10 +4218,10 @@
 		<xsl:variable name="isDeleted" select="@deleted"/>
 		<fo:block-container>
 			
-				<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
-					<xsl:attribute name="margin-left">0mm</xsl:attribute>
-				</xsl:if>
-			
+					<xsl:if test="not(ancestor::*[local-name() = 'quote'])">
+						<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					</xsl:if>
+				
 			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
@@ -4140,11 +4238,11 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 			
-			<fo:block-container>
-				
-					<xsl:attribute name="margin-left">0mm</xsl:attribute>
-					<xsl:attribute name="margin-right">0mm</xsl:attribute>
+			<fo:block-container margin-left="0mm">
+			
 				
+						<xsl:attribute name="margin-right">0mm</xsl:attribute>
+					
 				
 				<xsl:variable name="parent" select="local-name(..)"/>
 				
@@ -4157,25 +4255,21 @@
 				<xsl:choose>
 					<xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
 						
-						
-							<fo:block margin-bottom="12pt" text-align="left">
-								
-									<xsl:attribute name="margin-bottom">0</xsl:attribute>
-								
-								<xsl:variable name="title-where">
+								<fo:block margin-bottom="12pt" text-align="left">
+									
+										<xsl:attribute name="margin-bottom">0</xsl:attribute>
 									
+									<xsl:variable name="title-where">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">where</xsl:with-param>
 										</xsl:call-template>
-									
-									
-								</xsl:variable>
-								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
-								<xsl:apply-templates select="*[local-name()='dt']/*"/>
-								<xsl:text/>
-								<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
-							</fo:block>
-						
+									</xsl:variable>
+									<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
+									<xsl:apply-templates select="*[local-name()='dt']/*"/>
+									<xsl:text/>
+									<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
+								</fo:block>
+							
 					</xsl:when>
 					<xsl:when test="$parent = 'formula'"> <!-- a few components -->
 						<fo:block margin-bottom="12pt" text-align="left">
@@ -4186,12 +4280,9 @@
 							
 							
 							<xsl:variable name="title-where">
-								
-									<xsl:call-template name="getLocalizedString">
-										<xsl:with-param name="key">where</xsl:with-param>
-									</xsl:call-template>
-								
-																
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">where</xsl:with-param>
+								</xsl:call-template>
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -4206,12 +4297,9 @@
 							
 							
 							<xsl:variable name="title-key">
-								
-									<xsl:call-template name="getLocalizedString">
-										<xsl:with-param name="key">key</xsl:with-param>
-									</xsl:call-template>
-								
-								
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">key</xsl:with-param>
+								</xsl:call-template>
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -4238,9 +4326,7 @@
 							<fo:table width="95%" table-layout="fixed">
 								
 								<xsl:choose>
-									<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
-										<!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
-									</xsl:when>
+									<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'"/>
 									<xsl:when test="normalize-space($key_iso) = 'true'">
 										<xsl:attribute name="font-size">10pt</xsl:attribute>
 										
@@ -4261,12 +4347,9 @@
 											</xsl:otherwise>
 										</xsl:choose>
 									</xsl:variable>
-									<!-- <xsl:variable name="ns" select="substring-before(name(/*), '-')"/> -->
-									<!-- <xsl:element name="{$ns}:table"> -->
-										<tbody>
-											<xsl:apply-templates mode="dl"/>
-										</tbody>
-									<!-- </xsl:element> -->
+									<tbody>
+										<xsl:apply-templates mode="dl"/>
+									</tbody>
 								</xsl:variable>
 								<!-- html-table<xsl:copy-of select="$html-table"/> -->
 								<xsl:variable name="colwidths">
@@ -4346,8 +4429,6 @@
 						</xsl:for-each>
 					</xsl:otherwise>
 				</xsl:choose>
-				<!-- <fo:table-column column-width="15%"/>
-				<fo:table-column column-width="85%"/> -->
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="getMaxLength_dt">
@@ -4362,12 +4443,6 @@
 			</xsl:for-each>
 		</xsl:variable>
 		<xsl:variable name="maxLength">
-			<!-- <xsl:for-each select="*[local-name()='dt']">
-				<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
-				<xsl:if test="position() = 1">
-					<xsl:value-of select="string-length(normalize-space(.))"/>
-				</xsl:if>
-			</xsl:for-each> -->
 			<xsl:for-each select="xalan:nodeset($lengths)/length">
 				<xsl:sort select="." data-type="number" order="descending"/>
 				<xsl:if test="position() = 1">
@@ -4393,12 +4468,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>
@@ -4409,83 +4484,49 @@
 			</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>
 		
 	</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/>
-					<!-- <xsl:if test="$namespace = 'gb'">
-						<xsl:if test="ancestor::*[local-name()='formula']">
-							<xsl:text>—</xsl:text>
-						</xsl:if>
-					</xsl:if> -->
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
 				<fo:block>
 					
-					<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
-						<xsl:if test="local-name(*[1]) != 'stem'">
-							<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
-						</xsl:if>
-					</xsl:if> -->
-					
-						<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:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
-			<xsl:if test="local-name(*[1]) = 'stem'">
-				<fo:table-row>
-				<fo:table-cell>
-					<fo:block margin-top="6pt">
-						<xsl:if test="normalize-space($key_iso) = 'true'">
-							<xsl:attribute name="margin-top">0</xsl:attribute>
-						</xsl:if>
-						<xsl:text>&#xA0;</xsl:text>
-					</fo:block>
-				</fo:table-cell>
-				<fo:table-cell>
-					<fo:block>
-						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
-					</fo:block>
-				</fo:table-cell>
-			</fo:table-row>
-			</xsl:if>
-		</xsl:if> -->
 	</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']">
@@ -4509,6 +4550,7 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
+		
 			<xsl:variable name="_font-size">
 				
 				
@@ -4545,7 +4587,22 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='add']">
+		<xsl:param name="skip">true</xsl:param>
 		<xsl:choose>
+			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
+				<xsl:choose>
+					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
+					<xsl:otherwise>
+						<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:otherwise>
+				</xsl:choose>
+			</xsl:when>
 			<xsl:when test="@amendment">
 				<fo:inline>
 					<xsl:call-template name="insertTag">
@@ -4580,7 +4637,6 @@
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
-		
 	</xsl:template><xsl:template name="insertTag">
 		<xsl:param name="type"/>
 		<xsl:param name="kind"/>
@@ -4588,22 +4644,20 @@
 		<xsl:variable name="add_width" select="string-length($value) * 20"/>
 		<xsl:variable name="maxwidth" select="60 + $add_width"/>
 			<fo:instream-foreign-object fox:alt-text="OpeningTag" baseline-shift="-20%"><!-- alignment-baseline="middle" -->
-				<!-- <xsl:attribute name="width">7mm</xsl:attribute>
-				<xsl:attribute name="content-height">100%</xsl:attribute> -->
 				<xsl:attribute name="height">5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
 				<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 				<xsl:attribute name="scaling">uniform</xsl:attribute>
 				<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
 					<g>
-						<xsl:if test="$type = 'closing'">
+						<xsl:if test="$type = 'closing' or $type = 'end'">
 							<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
 						</xsl:if>
 						<polyline points="0,0 {$maxwidth},0 {$maxwidth + 30},40 {$maxwidth},80 0,80 " stroke="black" stroke-width="5" fill="white"/>
 						<line x1="0" y1="0" x2="0" y2="80" stroke="black" stroke-width="20"/>
 					</g>
 					<text font-family="Arial" x="15" y="57" font-size="40pt">
-						<xsl:if test="$type = 'closing'">
+						<xsl:if test="$type = 'closing' or $type = 'end'">
 							<xsl:attribute name="x">25</xsl:attribute>
 						</xsl:if>
 						<xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
@@ -4647,7 +4701,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>
@@ -4807,14 +4865,6 @@
 			
 			<xsl:copy-of select="xalan:nodeset($simple-table-rowspan)"/>
 					
-			<!-- <xsl:choose>
-				<xsl:when test="current()//*[local-name()='th'][@colspan] or current()//*[local-name()='td'][@colspan] ">
-					
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:copy-of select="current()"/>
-				</xsl:otherwise>
-			</xsl:choose> -->
 		</xsl:variable>
 		<xsl:copy-of select="$simple-table"/>
 	</xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
@@ -4933,8 +4983,6 @@
 		<xsl:choose>
 			<xsl:when test="contains($str2, ' ')">
 				<xsl:variable name="substr" select="substring-before($str2, ' ')"/>
-				<!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
-				<xsl:value-of select="substring($substr, 2)"/> -->
 				<xsl:call-template name="capitalize">
 					<xsl:with-param name="str" select="$substr"/>
 				</xsl:call-template>
@@ -4944,8 +4992,6 @@
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
-				<!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
-				<xsl:value-of select="substring($str2, 2)"/> -->
 				<xsl:call-template name="capitalize">
 					<xsl:with-param name="str" select="$str2"/>
 				</xsl:call-template>
@@ -4973,6 +5019,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()]"/>
@@ -5011,7 +5058,7 @@
 						<xsl:attribute name="scaling">uniform</xsl:attribute>
 					</xsl:if>
 				
-				<!-- <xsl:copy-of select="."/> -->
+				
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
 		</fo:inline>
@@ -5070,6 +5117,10 @@
 			
 			
 			
+			
+			
+			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -5093,19 +5144,19 @@
 		</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>
 		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">			
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:apply-templates select="*[local-name()='name']"/>
 		</fo:block>
-		<xsl:apply-templates/>
+		<xsl:apply-templates select="node()[not(local-name()='name')]"/>
 	</xsl:template><xsl:template match="*[local-name() = 'callout']">		
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'annotation']">
@@ -5127,7 +5178,6 @@
 		</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:apply-templates/>
 		</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
@@ -5155,49 +5205,64 @@
 		<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']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="formula_number"> <!-- show by demand -->
 		<xsl:if test="normalize-space() != ''">
 			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
 	
 		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
+		
+			
+			
 			
 			
 			
 			
 			
+		
+			
+			
 			<fo:block-container margin-left="0mm">
+			
 				
 				
 				
+			
 				
-				
-				
-
-				
-					<fo:block>
-						
-						
-						
-						
-						
+						<fo:block>
+							
+							
 						
-						<fo:inline xsl:use-attribute-sets="note-name-style">
 							
-							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
-						</fo:inline>
-						<xsl:apply-templates/>
-					</fo:block>
-				
-				
+							
+							
+							
+							<fo:inline xsl:use-attribute-sets="note-name-style">
+							
+								
+								
+								<!-- 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']"/>
+								
+							</fo:inline>
+							
+							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+						</fo:block>
+					
 			</fo:block-container>
 		</fo:block-container>
 		
 	</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>
@@ -5212,12 +5277,16 @@
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">			
 			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
+			
+				
+				
+				<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>
@@ -5234,7 +5303,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>
@@ -5261,27 +5330,25 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'term']">
-		<!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
 		<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:attribute name="space-before">12pt</xsl:attribute>
 				
 			</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"/>
 			</xsl:variable>
 			<fo:inline role="H{$level}">
 				<xsl:apply-templates/>
-				<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
-					<xsl:text>.</xsl:text>
-				</xsl:if> -->
 			</fo:inline>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
@@ -5294,9 +5361,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']">
@@ -5304,14 +5372,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/>
@@ -5418,9 +5487,7 @@
 				<xsl:variable name="bis" select="java:java.io.ByteArrayInputStream.new($fileContent)"/>
 				<xsl:variable name="bufferedImage" select="java:javax.imageio.ImageIO.read($bis)"/>
 				<xsl:variable name="width" select="java:getWidth($bufferedImage)"/>
-				<!-- width=<xsl:value-of select="$width"/> -->
 				<xsl:variable name="height" select="java:getHeight($bufferedImage)"/>
-				<!-- height=<xsl:value-of select="$height"/> -->
 				<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="enable-background:new 0 0 595.28 841.89;" height="{$height}" width="{$width}" viewBox="0 0 {$width} {$height}" y="0px" x="0px" id="Layer_1" version="1.1">
 					<image xlink:href="{@src}" height="{$height}" width="{$width}" style="overflow:visible;"/>
 					<xsl:call-template name="svg_cross">
@@ -5690,7 +5757,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">		
@@ -5702,11 +5769,72 @@
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title' or @type = 'section-title']" priority="2" mode="contents">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="depth" select="@depth"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:variable name="section">
+			<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"><xsl:value-of select="@type"/></xsl:variable>
+			
+		<xsl:variable name="display">
+			<xsl:choose>
+				<xsl:when test="normalize-space(@id) = ''">false</xsl:when>
+				<xsl:when test="$level &lt;= $toc_level">true</xsl:when>
+				<xsl:otherwise>false</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
+		<xsl:variable name="skip">false</xsl:variable>
+
+		<xsl:if test="$skip = 'false'">		
+		
+			<xsl:variable name="title">
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'tab']">
+						<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()"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			
+			<xsl:variable name="root">
+				<xsl:if test="ancestor-or-self::*[local-name() = 'preface']">preface</xsl:if>
+				<xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
+			</xsl:variable>
+			
+			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
+				<title>
+					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+				</title>
+			</item>
+		</xsl:if>
 	</xsl:template><xsl:template match="node()" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -5796,8 +5924,6 @@
 				
 				
 				
-				
-				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -5868,7 +5994,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">
 				
@@ -5877,16 +6003,13 @@
 			</fo:block>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/><xsl:template match="*[local-name() = 'title']" mode="contents_item">
-		<xsl:apply-templates mode="contents_item"/>
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="mode" select="$mode"/>
+		</xsl:apply-templates>
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template><xsl:template name="getSection">
 		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
-		<!-- 
-		<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
-			<xsl:value-of select="."/>
-		</xsl:for-each>
-		-->
-		
 	</xsl:template><xsl:template name="getName">
 		<xsl:choose>
 			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -5950,9 +6073,26 @@
 		<xsl:copy-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'name']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="mode" select="$mode"/>
+		</xsl:apply-templates>
+	</xsl:template><xsl:template match="*[local-name() = 'add']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<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']">
@@ -5989,6 +6129,7 @@
 						
 								
 				</xsl:variable>
+				
 				<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
@@ -6005,11 +6146,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 -->
 				
 				
 			
@@ -6023,7 +6164,7 @@
 		<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: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/>
@@ -6031,10 +6172,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/>
@@ -6047,13 +6188,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">
 				
@@ -6061,20 +6202,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/>
@@ -6085,10 +6230,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/>
@@ -6132,8 +6273,6 @@
 					</xsl:variable>					
 					<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
 					<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
-						<!-- <fo:table-column column-width="35mm"/>
-						<fo:table-column column-width="115mm"/> -->
 						<fo:table-column column-width="30%"/>
 						<fo:table-column column-width="70%"/>
 					</xsl:if>
@@ -6143,7 +6282,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>
@@ -6160,7 +6299,6 @@
 	</xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
 		<fo:table-row height="7mm" border-bottom="0.5pt solid grey">			
 			<xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
-				<!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> -->
 				<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
 			</xsl:if>
 			<xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
@@ -6173,34 +6311,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:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
-				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
-				<xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>				
-			</xsl:if>
-			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
-				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
-				<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>				
-			</xsl:if> -->
+			<xsl:call-template name="setTableCellAttributes"/>
 			
 			<fo:block>
 				<xsl:apply-templates/>
@@ -6212,37 +6327,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:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
-				<xsl:attribute name="padding-left">0.5mm</xsl:attribute>
-				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>				 
-				<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
-					<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>					
-				</xsl:if>
-			</xsl:if> -->
-			<!-- 2nd line and below -->
+			<xsl:call-template name="setTableCellAttributes"/>
 			
 			<fo:block>			
 				<xsl:apply-templates/>
@@ -6254,15 +6347,15 @@
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
-		<fo:block> <!-- margin-bottom="10pt" -->
+		<fo:block>
 			<xsl:apply-templates/>
 		</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/>
@@ -6286,42 +6379,46 @@
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
 			
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-			
-			<xsl:variable name="element">
-								
+			<xsl:variable name="fo_element">
+				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if> 
 				inline
-				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if> 
 			</xsl:variable>
 			
+			<!-- display 'EXAMPLE' -->
+			<xsl:apply-templates select="*[local-name()='name']">
+				<xsl:with-param name="fo_element" select="$fo_element"/>
+			</xsl:apply-templates>
+			
 			<xsl:choose>
-				<xsl:when test="contains(normalize-space($element), 'block')">
-					<fo:block xsl:use-attribute-sets="example-body-style">
-						<xsl:apply-templates/>
-					</fo:block>
+				<xsl:when test="contains(normalize-space($fo_element), 'block')">
+					<fo:block-container xsl:use-attribute-sets="example-body-style">
+						<fo:block-container margin-left="0mm" margin-right="0mm">
+							<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+								<xsl:with-param name="fo_element" select="$fo_element"/>
+							</xsl:apply-templates>
+						</fo:block-container>
+					</fo:block-container>
 				</xsl:when>
 				<xsl:otherwise>
 					<fo:inline>
-						<xsl:apply-templates/>
+						<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+							<xsl:with-param name="fo_element" select="$fo_element"/>
+						</xsl:apply-templates>
 					</fo:inline>
 				</xsl:otherwise>
 			</xsl:choose>
 			
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']" mode="presentation">
-
-		<xsl:variable name="element">
-			
-			inline
-			<xsl:if test="following-sibling::*[1][local-name() = 'table']">block</xsl:if> 
-		</xsl:variable>		
+	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
+		<xsl:param name="fo_element">block</xsl:param>
+	
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'appendix']">
 				<fo:inline>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
-			<xsl:when test="contains(normalize-space($element), 'block')">
+			<xsl:when test="contains(normalize-space($fo_element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
 					<xsl:apply-templates/>
 				</fo:block>
@@ -6334,19 +6431,20 @@
 		</xsl:choose>
 
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
+		<xsl:param name="fo_element">block</xsl:param>
+		
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
 			
-			
 				<xsl:choose>
 					<xsl:when test="$num = 1">inline</xsl:when>
 					<xsl:otherwise>block</xsl:otherwise>
 				</xsl:choose>
 			
-			
+			<xsl:value-of select="$fo_element"/>
 		</xsl:variable>		
 		<xsl:choose>			
-			<xsl:when test="normalize-space($element) = 'block'">
+			<xsl:when test="starts-with(normalize-space($element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
 					
 					<xsl:apply-templates/>
@@ -6361,6 +6459,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/>
@@ -6398,9 +6498,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']">
@@ -6414,12 +6512,9 @@
 		</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']">
 		<xsl:variable name="title-modified">
-			
-				<xsl:call-template name="getLocalizedString">
-					<xsl:with-param name="key">modified</xsl:with-param>
-				</xsl:call-template>
-			
-			
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">modified</xsl:with-param>
+			</xsl:call-template>
 		</xsl:variable>
 		
     <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
@@ -6446,7 +6541,6 @@
 			<fo:block-container margin-left="0mm">
 		
 				<fo:block xsl:use-attribute-sets="quote-style">
-					<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
 					
 					<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
 				</fo:block>
@@ -6489,15 +6583,13 @@
 		</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>
-							<xsl:attribute name="font-size">80%</xsl:attribute>
-							<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-							<xsl:attribute name="vertical-align">super</xsl:attribute>
-											
+						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+						<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+						<xsl:attribute name="vertical-align">super</xsl:attribute>
+						<xsl:attribute name="font-size">80%</xsl:attribute>
 						
 					</xsl:if>	
 					
@@ -6514,7 +6606,6 @@
 							
 							
 							
-							
 						</xsl:if>
 						
 						
@@ -6572,8 +6663,6 @@
 			</xsl:choose>
 		</xsl:variable>
 		
-		<!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
-		
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'">
 				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
@@ -6608,12 +6697,9 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
-			
-				<xsl:call-template name="getLocalizedString">
-					<xsl:with-param name="key">deprecated</xsl:with-param>
-				</xsl:call-template>
-			
-			
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">deprecated</xsl:with-param>
+			</xsl:call-template>
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -6622,6 +6708,8 @@
 		<xsl:if test="*[local-name() = 'strong']">
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]">
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
 	</xsl:template><xsl:template match="*[local-name() = 'definition']">
 		<fo:block xsl:use-attribute-sets="definition-style">
 			<xsl:apply-templates/>
@@ -6630,7 +6718,6 @@
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p'][1]">
 		<fo:inline> <xsl:apply-templates/></fo:inline>
-		<!-- <fo:block>&#xA0;</fo:block> -->
 		<fo:block/>
 	</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
 		
@@ -6671,11 +6758,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>
@@ -6943,46 +7025,102 @@
 		<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>
 		
 		
-			<!-- start ISO bibtem processing -->
-			<xsl:variable name="docidentifier">
-				<xsl:if test="*[local-name() = 'docidentifier']">
-					<xsl:choose>
-						<xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
-						<xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier']"/></xsl:otherwise>
-					</xsl:choose>
-				</xsl:if>
-			</xsl:variable>
-			<xsl:value-of select="$docidentifier"/>
-			<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:apply-templates select="*[local-name() = 'formattedref']"/>
-			<!-- end ISO bibitem processing -->
 		
 		
+	</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 bibitem processing -->
+				<xsl:if test=".//*[local-name() = 'fn']">
+					<xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
+				</xsl:if>
+				<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:variable>
+				<fo:inline><xsl:value-of select="$docidentifier"/></fo:inline>
+				<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:apply-templates select="*[local-name() = 'formattedref']"/>
+				<!-- end 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 = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
+		<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>
 			<xsl:when test="normalize-space($_doc_ident) != ''">
 				<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
@@ -6996,7 +7134,7 @@
 				<xsl:if test="$type != ''">
 					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
 				</xsl:if> -->
-				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
+				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma') and not(@type = 'metanorma-ordinal')]"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="processPersonalAuthor">
@@ -7037,6 +7175,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/>
@@ -7102,27 +7286,14 @@
 			<fo:block> </fo:block>
 		</fo:block-container>
 	</xsl:template><xsl:variable name="toc_level">
+		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
+		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
-			<xsl:when test="1 = 2"/> <!-- to do https://github.com/metanorma/mn-native-pdf/issues/337: if there is value in xml -->
+			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
+			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
 			<xsl:otherwise><!-- default value -->
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
-				
+				3
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:variable><xsl:template match="*[local-name() = 'toc']">
@@ -7205,7 +7376,7 @@
 			</td>
 		</xsl:for-each>
 		<td>333</td> <!-- page number, just for fill -->
-	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
+	</xsl:template><xsl:template match="*[local-name() = 'variant-title']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
@@ -7218,8 +7389,53 @@
 		</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']">
+		 <!-- processing for admonition/p found in the template for 'p' -->
+				<xsl:call-template name="paragraph"/>
+			
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -7227,83 +7443,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="'.'"/>
@@ -7352,13 +7565,8 @@
 						<xsl:variable name="title">
 							<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
 								
-									<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
-								
-								
-								
-								
-								
-																
+										<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
+									
 							</xsl:for-each>
 						</xsl:variable>
 						<xsl:choose>
@@ -7373,21 +7581,18 @@
 					<dc:creator>
 						<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
 							
-								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
-									<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
-									<xsl:if test="position() != last()">; </xsl:if>
-								</xsl:for-each>
-							
-							
-							
+									<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+										<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+										<xsl:if test="position() != last()">; </xsl:if>
+									</xsl:for-each>
+								
 						</xsl:for-each>
 					</dc:creator>
 					<dc:description>
 						<xsl:variable name="abstract">
 							
-								<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
-							
-							
+									<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+								
 						</xsl:variable>
 						<xsl:value-of select="normalize-space($abstract)"/>
 					</dc:description>
@@ -7407,7 +7612,6 @@
 				<xsl:value-of select="../@id"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<!-- <xsl:value-of select="concat(local-name(..), '_', text())"/> -->
 				<xsl:value-of select="concat(generate-id(..), '_', text())"/>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -7433,9 +7637,6 @@
 						<xsl:when test="ancestor::*[local-name() = 'preface']">
 							<xsl:value-of select="$level_total - 2"/>
 						</xsl:when>
-						<!-- <xsl:when test="parent::*[local-name() = 'sections']">
-							<xsl:value-of select="$level_total - 1"/>
-						</xsl:when> -->
 						<xsl:when test="ancestor::*[local-name() = 'sections']">
 							<xsl:value-of select="$level_total - 1"/>
 						</xsl:when>
@@ -7577,9 +7778,15 @@
 	</xsl:template><xsl:template name="getLocalizedString">
 		<xsl:param name="key"/>
 		<xsl:param name="formatted">false</xsl:param>
+		<xsl:param name="lang"/>
 		
 		<xsl:variable name="curr_lang">
-			<xsl:call-template name="getLang"/>
+			<xsl:choose>
+				<xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="getLang"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:variable>
 		
 		<xsl:variable name="data_value">
@@ -7619,7 +7826,6 @@
 				<xsl:value-of select="$key_"/>
 			</xsl:otherwise>
 		</xsl:choose>
-			
 	</xsl:template><xsl:template name="setTrackChangesStyles">
 		<xsl:param name="isAdded"/>
 		<xsl:param name="isDeleted"/>
@@ -7642,7 +7848,6 @@
 					<xsl:if test="local-name() = 'table'">
 						<xsl:attribute name="background-color">rgb(255, 185, 185)</xsl:attribute>
 					</xsl:if>
-					<!-- <xsl:attribute name="color"><xsl:value-of select="$color-deleted-text"/></xsl:attribute> -->
 					<xsl:attribute name="padding">2mm</xsl:attribute>
 				</xsl:if>
 			</xsl:otherwise>
@@ -7662,15 +7867,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">
@@ -7769,6 +7977,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">