RubyGems - metanorma-iso - Versions diffs - 1.3.24 → 1.4.1 - Mend

metanorma-iso 1.3.24 → 1.4.1

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

Files changed (60) hide show

checksums.yaml +4 -4
data/.github/workflows/macos.yml +8 -1
data/.github/workflows/ubuntu.yml +14 -3
data/.github/workflows/windows.yml +8 -1
data/lib/asciidoctor/iso/base.rb +21 -13
data/lib/asciidoctor/iso/biblio.rng +36 -6
data/lib/asciidoctor/iso/cleanup.rb +10 -1
data/lib/asciidoctor/iso/front.rb +16 -110
data/lib/asciidoctor/iso/front_id.rb +196 -0
data/lib/asciidoctor/iso/isodoc.rng +444 -1
data/lib/asciidoctor/iso/isostandard-amd.rng +98 -0
data/lib/asciidoctor/iso/isostandard.rng +12 -1
data/lib/asciidoctor/iso/reqt.rng +23 -0
data/lib/asciidoctor/iso/section.rb +12 -0
data/lib/asciidoctor/iso/term_lookup_cleanup.rb +7 -10
data/lib/asciidoctor/iso/validate.rb +40 -23
data/lib/asciidoctor/iso/validate_requirements.rb +1 -1
data/lib/asciidoctor/iso/validate_style.rb +6 -5
data/lib/asciidoctor/iso/validate_title.rb +1 -1
data/lib/isodoc/iso/base_convert.rb +68 -87
data/lib/isodoc/iso/html/header.html +5 -1
data/lib/isodoc/iso/html/html_iso_titlepage.html +25 -16
data/lib/isodoc/iso/html/isodoc.scss +25 -0
data/lib/isodoc/iso/html/scripts.html +18 -0
data/lib/isodoc/iso/html/style-human.scss +23 -0
data/lib/isodoc/iso/html/style-iso.scss +18 -0
data/lib/isodoc/iso/html/word_iso_intro.html +4 -0
data/lib/isodoc/iso/html/word_iso_titlepage.html +21 -0
data/lib/isodoc/iso/html/wordstyle.scss +45 -4
data/lib/isodoc/iso/iso.amendment.xsl +5082 -0
data/lib/isodoc/iso/iso.international-standard.xsl +1226 -530
data/lib/isodoc/iso/metadata.rb +67 -23
data/lib/isodoc/iso/pdf_convert.rb +5 -11
data/lib/isodoc/iso/presentation_xml_convert.rb +13 -0
data/lib/isodoc/iso/sections.rb +66 -0
data/lib/isodoc/iso/sts_convert.rb +31 -0
data/lib/isodoc/iso/xref.rb +111 -0
data/lib/metanorma-iso.rb +2 -0
data/lib/metanorma/iso/processor.rb +20 -9
data/lib/metanorma/iso/version.rb +1 -1
data/metanorma-iso.gemspec +5 -2
data/spec/asciidoctor-iso/amd_spec.rb +726 -0
data/spec/asciidoctor-iso/base_spec.rb +24 -20
data/spec/asciidoctor-iso/cleanup_spec.rb +2 -2
data/spec/asciidoctor-iso/macros_spec.rb +33 -17
data/spec/asciidoctor-iso/refs_spec.rb +1 -1
data/spec/asciidoctor-iso/table_spec.rb +1 -1
data/spec/isodoc/amd_spec.rb +652 -0
data/spec/isodoc/blocks_spec.rb +112 -27
data/spec/isodoc/inline_spec.rb +2 -2
data/spec/isodoc/metadata_spec.rb +88 -4
data/spec/isodoc/postproc_spec.rb +11 -11
data/spec/isodoc/ref_spec.rb +7 -7
data/spec/isodoc/section_spec.rb +28 -1
data/spec/isodoc/table_spec.rb +29 -29
data/spec/isodoc/terms_spec.rb +4 -4
data/spec/isodoc/xref_spec.rb +32 -26
data/spec/metanorma/processor_spec.rb +2 -2
data/spec/spec_helper.rb +11 -0
metadata +61 -11

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
@@ -24,18 +24,15 @@
 	<xsl:variable name="ISOname" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-reference']"/>
 	<!-- Information and documentation — Codes for transcription systems  -->
-	<xsl:variable name="title-en" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'main']"/>
-	<xsl:variable name="title-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'main']"/>
 	<xsl:variable name="title-intro" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-intro']"/>
 	<xsl:variable name="title-intro-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-intro']"/>
 	<xsl:variable name="title-main" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-main']"/>
 	<xsl:variable name="title-main-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-main']"/>
 	<xsl:variable name="part" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@part"/>
-	<xsl:variable name="title-part" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-part']"/>
-	<xsl:variable name="title-part-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-part']"/>
-	<xsl:variable name="doctype_uppercased" select="translate(translate(/iso:iso-standard/iso:bibdata/iso:ext/iso:doctype,'-',' '), $lower,$upper)"/>
+	<xsl:variable name="doctype" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:doctype"/>
+	<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(translate($doctype,'-',' ')))"/>
 	<xsl:variable name="stage" select="number(/iso:iso-standard/iso:bibdata/iso:status/iso:stage)"/>
 	<xsl:variable name="substage" select="number(/iso:iso-standard/iso:bibdata/iso:status/iso:substage)"/>
 	<xsl:variable name="stagename" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:stagename)"/>
@@ -62,8 +59,8 @@
 	<xsl:variable name="stage-fullname-uppercased">
 		<xsl:choose>
-			<xsl:when test="$stagename != ''">
-				<xsl:value-of select="translate($stagename, $lower, $upper)"/>
+			<xsl:when test="$stagename != ''">
+				<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($stagename))"/>
 			</xsl:when>
 			<xsl:when test="$stage-abbreviation = 'NWIP' or                $stage-abbreviation = 'NP'">NEW WORK ITEM PROPOSAL</xsl:when>
 			<xsl:when test="$stage-abbreviation = 'PWI'">PRELIMINARY WORK ITEM</xsl:when>
@@ -144,10 +141,6 @@
 	</xsl:variable>
 	<xsl:variable name="proof-text">PROOF/ÉPREUVE</xsl:variable>
-	<xsl:variable name="title-figure">
-		<xsl:text>Figure </xsl:text>
-	</xsl:variable>
 	<!-- Example:
 		<item level="1" id="Foreword" display="true">Foreword</item>
@@ -315,33 +308,7 @@
 			</fo:layout-master-set>
-			<fo:declarations>
-				<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
-						<pdf:dictionary type="normal" key="ViewerPreferences">
-							<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
-						</pdf:dictionary>
-					</pdf:catalog>
-				<x:xmpmeta xmlns:x="adobe:ns:meta/">
-					<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-						<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
-						<!-- Dublin Core properties go here -->
-							<dc:title><xsl:value-of select="$title-en"/></dc:title>
-							<dc:creator><xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:contributor[iso:role/@type='author']/iso:organization/iso:name"/></dc:creator>
-							<dc:description>
-								<xsl:variable name="abstract">
-									<xsl:copy-of select="/iso:iso-standard/iso:bibliography/iso:references/iso:bibitem/iso:abstract//text()"/>
-								</xsl:variable>
-								<xsl:value-of select="normalize-space($abstract)"/>
-							</dc:description>
-							<pdf:Keywords/>
-						</rdf:Description>
-						<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
-							<!-- XMP properties go here -->
-							<xmp:CreatorTool/>
-						</rdf:Description>
-					</rdf:RDF>
-				</x:xmpmeta>
-			</fo:declarations>
+			<xsl:call-template name="addPDFUAmeta"/>
 			<!-- cover page -->
 			<xsl:choose>
@@ -518,8 +485,10 @@
 													</xsl:if>
 													<xsl:value-of select="$title-main"/>
+													<xsl:call-template name="printTitlePartEn"/>
-													<xsl:if test="normalize-space($title-part) != ''">
+													<!-- <xsl:if test="normalize-space($title-part) != ''">
 														<xsl:if test="$part != ''">
 															<xsl:text> — </xsl:text>
 															<fo:block font-weight="normal" margin-top="6pt">
@@ -528,7 +497,7 @@
 															</fo:block>
 														</xsl:if>
 														<xsl:value-of select="$title-part"/>
-													</xsl:if>
+													</xsl:if> -->
 												</fo:block>
 												<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
@@ -540,16 +509,9 @@
 													</xsl:if>
 													<xsl:value-of select="$title-main-fr"/>
+													<xsl:call-template name="printTitlePartFr"/>
-													<xsl:if test="normalize-space($title-part-fr) != ''">
-														<xsl:if test="$part != ''">
-															<xsl:text> — </xsl:text>
-															<xsl:text>Partie </xsl:text>
-															<xsl:value-of select="$part"/>
-															<xsl:text>:</xsl:text>
-														</xsl:if>
-														<xsl:value-of select="$title-part-fr"/>
-													</xsl:if>
 												</fo:block>
 											</fo:block>
 											<fo:block margin-top="10mm">
@@ -681,7 +643,8 @@
 																	<xsl:value-of select="$title-main"/>
-																	<xsl:if test="normalize-space($title-part) != ''">
+																	<xsl:call-template name="printTitlePartEn"/>
+																	<!-- <xsl:if test="normalize-space($title-part) != ''">
 																		<xsl:if test="$part != ''">
 																			<xsl:text> — </xsl:text>
 																			<fo:block font-weight="normal" margin-top="6pt">
@@ -690,7 +653,7 @@
 																			</fo:block>
 																		</xsl:if>
 																		<xsl:value-of select="$title-part"/>
-																	</xsl:if>
+																	</xsl:if> -->
 																</fo:block>
 																<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
@@ -703,15 +666,8 @@
 																	<xsl:value-of select="$title-main-fr"/>
-																	<xsl:if test="normalize-space($title-part-fr) != ''">
-																		<xsl:if test="$part != ''">
-																			<xsl:text> — </xsl:text>
-																			<xsl:text>Partie </xsl:text>
-																			<xsl:value-of select="$part"/>
-																			<xsl:text>:</xsl:text>
-																		</xsl:if>
-																		<xsl:value-of select="$title-part-fr"/>
-																	</xsl:if>
+																	<xsl:call-template name="printTitlePartFr"/>
 																</fo:block>
 															</fo:block>
 														</fo:block-container>
@@ -801,7 +757,8 @@
 										<xsl:value-of select="$title-main"/>
-										<xsl:if test="normalize-space($title-part) != ''">
+										<xsl:call-template name="printTitlePartEn"/>
+										<!-- <xsl:if test="normalize-space($title-part) != ''">
 											<xsl:if test="$part != ''">
 												<xsl:text> — </xsl:text>
 												<fo:block font-weight="normal" margin-top="6pt">
@@ -810,7 +767,7 @@
 												</fo:block>
 											</xsl:if>
 											<xsl:value-of select="$title-part"/>
-										</xsl:if>
+										</xsl:if> -->
 									</fo:block>
 									<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
@@ -823,15 +780,8 @@
 										<xsl:value-of select="$title-main-fr"/>
-										<xsl:if test="normalize-space($title-part-fr) != ''">
-											<xsl:if test="$part != ''">
-												<xsl:text> — </xsl:text>
-												<xsl:text>Partie </xsl:text>
-												<xsl:value-of select="$part"/>
-												<xsl:text>:</xsl:text>
-											</xsl:if>
-											<xsl:value-of select="$title-part-fr"/>
-										</xsl:if>
+										<xsl:call-template name="printTitlePartFr"/>
 									</fo:block>
 									</fo:block>
 								</fo:block-container>
@@ -920,7 +870,8 @@
 										<xsl:value-of select="$title-main"/>
-										<xsl:if test="normalize-space($title-part) != ''">
+										<xsl:call-template name="printTitlePartEn"/>
+										<!-- <xsl:if test="normalize-space($title-part) != ''">
 											<xsl:if test="$part != ''">
 												<xsl:text> — </xsl:text>
 												<fo:block font-weight="normal" margin-top="6pt">
@@ -929,7 +880,7 @@
 												</fo:block>
 											</xsl:if>
 											<xsl:value-of select="$title-part"/>
-										</xsl:if>
+										</xsl:if> -->
 									</fo:block>
 									<fo:block font-size="12pt"><xsl:value-of select="$linebreak"/></fo:block>
@@ -941,15 +892,17 @@
 										<xsl:value-of select="$title-main-fr"/>
-										<xsl:if test="normalize-space($title-part-fr) != ''">
+										<xsl:variable name="part-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-part']"/>
+										<xsl:if test="normalize-space($part-fr) != ''">
 											<xsl:if test="$part != ''">
 												<xsl:text> — </xsl:text>
 												<fo:block margin-top="6pt" font-weight="normal">
-													<xsl:text>Partie </xsl:text><xsl:value-of select="$part"/>
-													<xsl:text>:</xsl:text>
+													<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='fr']),'#',$part)"/>
+													<!-- <xsl:value-of select="$title-part-fr"/><xsl:value-of select="$part"/>
+													<xsl:text>:</xsl:text> -->
 												</fo:block>
 											</xsl:if>
-											<xsl:value-of select="$title-part-fr"/>
+											<xsl:value-of select="$part-fr"/>
 										</xsl:if>
 									</fo:block>
 							</fo:block-container>
@@ -989,81 +942,101 @@
 									<xsl:apply-templates select="/iso:iso-standard/iso:boilerplate/iso:copyright-statement"/>
 								</fo:block>
 							</fo:block>
-						</fo:block-container>
-						<fo:block break-after="page"/>
+						</fo:block-container>
 					</xsl:if>
-					<fo:block-container font-weight="bold">
-						<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
-							<fo:inline font-size="16pt" font-weight="bold">Contents</fo:inline>
-							<fo:inline keep-together.within-line="always">
-								<fo:leader leader-pattern="space"/>
-								<fo:inline font-weight="normal" font-size="10pt">Page</fo:inline>
-							</fo:inline>
-						</fo:block>
-						<xsl:if test="$debug = 'true'">
-							<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
-								DEBUG
-								contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
-							<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
-						</xsl:if>
+					<xsl:choose>
+						<xsl:when test="$doctype = 'amendment'"/><!-- ToC shouldn't be generated in amendments. -->
-						<xsl:variable name="margin-left">12</xsl:variable>
-						<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true'][not(@level = 2 and starts-with(@section, '0'))]"><!-- skip clause from preface -->
-							<fo:block>
-								<xsl:if test="@level = 1">
-									<xsl:attribute name="margin-top">5pt</xsl:attribute>
-								</xsl:if>
-								<xsl:if test="@level = 3">
-									<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
+						<xsl:otherwise>
+							<xsl:if test="/iso:iso-standard/iso:boilerplate/iso:copyright-statement">
+								<fo:block break-after="page"/>
+							</xsl:if>
+							<fo:block-container font-weight="bold">
+								<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
+									<xsl:variable name="title-toc">
+										<xsl:call-template name="getTitle">
+											<xsl:with-param name="name" select="'title-toc'"/>
+										</xsl:call-template>
+									</xsl:variable>
+									<fo:inline font-size="16pt" font-weight="bold"><xsl:value-of select="$title-toc"/></fo:inline>
+									<fo:inline keep-together.within-line="always">
+										<fo:leader leader-pattern="space"/>
+										<xsl:variable name="title-page">
+											<xsl:call-template name="getTitle">
+												<xsl:with-param name="name" select="'title-page'"/>
+											</xsl:call-template>
+										</xsl:variable>
+										<fo:inline font-weight="normal" font-size="10pt"><xsl:value-of select="$title-page"/></fo:inline>
+									</fo:inline>
+								</fo:block>
+								<xsl:if test="$debug = 'true'">
+									<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
+										DEBUG
+										contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
+									<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
 								</xsl:if>
-								<fo:list-block>
-									<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
-									<xsl:if test="@level &gt;= 2">
-										<xsl:attribute name="font-weight">normal</xsl:attribute>
-									</xsl:if>
-									<xsl:attribute name="provisional-distance-between-starts">
-										<xsl:choose>
-											<!-- skip 0 section without subsections -->
-											<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
-											<xsl:when test="@section != '' and not(@display-section = 'false')"><xsl:value-of select="$margin-left"/>mm</xsl:when>
-											<xsl:otherwise>0mm</xsl:otherwise>
-										</xsl:choose>
-									</xsl:attribute>
-									<fo:list-item>
-										<fo:list-item-label end-indent="label-end()">
-											<fo:block>
-												<xsl:if test="@section and not(@display-section = 'false')"> <!-- output below   -->
-													<xsl:value-of select="@section"/>
-												</xsl:if>
-											</fo:block>
-										</fo:list-item-label>
-											<fo:list-item-body start-indent="body-start()">
-												<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
-													<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
-														<xsl:if test="@section and @display-section = 'false'">
-															<xsl:value-of select="@section"/><xsl:text> </xsl:text>
-														</xsl:if>
-														<xsl:if test="@addon != ''">
-															<fo:inline font-weight="normal">(<xsl:value-of select="@addon"/>)</fo:inline>
+								<xsl:variable name="margin-left">12</xsl:variable>
+								<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true'][not(@level = 2 and starts-with(@section, '0'))]"><!-- skip clause from preface -->
+									<fo:block>
+										<xsl:if test="@level = 1">
+											<xsl:attribute name="margin-top">5pt</xsl:attribute>
+										</xsl:if>
+										<xsl:if test="@level = 3">
+											<xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
+										</xsl:if>
+										<fo:list-block>
+											<xsl:attribute name="margin-left"><xsl:value-of select="$margin-left * (@level - 1)"/>mm</xsl:attribute>
+											<xsl:if test="@level &gt;= 2">
+												<xsl:attribute name="font-weight">normal</xsl:attribute>
+											</xsl:if>
+											<xsl:attribute name="provisional-distance-between-starts">
+												<xsl:choose>
+													<!-- skip 0 section without subsections -->
+													<xsl:when test="@level &gt;= 3"><xsl:value-of select="$margin-left * 1.2"/>mm</xsl:when>
+													<xsl:when test="@section != '' and not(@display-section = 'false')"><xsl:value-of select="$margin-left"/>mm</xsl:when>
+													<xsl:otherwise>0mm</xsl:otherwise>
+												</xsl:choose>
+											</xsl:attribute>
+											<fo:list-item>
+												<fo:list-item-label end-indent="label-end()">
+													<fo:block>
+														<xsl:if test="@section and not(@display-section = 'false')"> <!-- output below   -->
+															<xsl:value-of select="@section"/>
 														</xsl:if>
-														<xsl:text> </xsl:text><xsl:value-of select="text()"/>
-														<fo:inline keep-together.within-line="always">
-															<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
-															<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-														</fo:inline>
-													</fo:basic-link>
-												</fo:block>
-											</fo:list-item-body>
-									</fo:list-item>
-								</fo:list-block>
-							</fo:block>
-						</xsl:for-each>
-					</fo:block-container>
+													</fo:block>
+												</fo:list-item-label>
+												<fo:list-item-body start-indent="body-start()">
+													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
+														<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
+															<xsl:if test="@section and @display-section = 'false'">
+																<xsl:value-of select="@section"/><xsl:text> </xsl:text>
+															</xsl:if>
+															<xsl:if test="@addon != ''">
+																<fo:inline font-weight="normal">(<xsl:value-of select="@addon"/>)</fo:inline>
+															</xsl:if>
+															<xsl:text> </xsl:text><xsl:value-of select="text()"/>
+															<fo:inline keep-together.within-line="always">
+																<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
+																<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+															</fo:inline>
+														</fo:basic-link>
+													</fo:block>
+												</fo:list-item-body>
+											</fo:list-item>
+										</fo:list-block>
+									</fo:block>
+								</xsl:for-each>
+							</fo:block-container>
+						</xsl:otherwise>
+					</xsl:choose>
 					<!-- Foreword, Introduction -->
 					<xsl:apply-templates select="/iso:iso-standard/iso:preface/node()"/>
@@ -1088,6 +1061,7 @@
 						</fo:block>
 						 -->
 						<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1">
+							<xsl:variable name="part-en" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-part']"/>
 							<fo:block>
 								<xsl:if test="normalize-space($title-intro) != ''">
 									<xsl:value-of select="$title-intro"/>
@@ -1096,22 +1070,42 @@
 								<xsl:value-of select="$title-main"/>
-								<xsl:if test="normalize-space($title-part) != ''">
+								<xsl:if test="normalize-space($part-en) != ''">
 									<xsl:if test="$part != ''">
 										<xsl:text> — </xsl:text>
 										<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
-											<xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
-											<xsl:text>:</xsl:text>
+											<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part)"/>
+											<!-- <xsl:value-of select="$title-part-en"/>
+											<xsl:value-of select="$part"/>
+											<xsl:text>:</xsl:text> -->
 										</fo:block>
 									</xsl:if>
 								</xsl:if>
 							</fo:block>
 							<fo:block>
-								<xsl:value-of select="$title-part"/>
+								<xsl:value-of select="$part-en"/>
 							</fo:block>
+							<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
+							<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
+								<fo:block font-weight="normal" margin-top="12pt" 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: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"/>
+									</xsl:if>
+									<xsl:text>: </xsl:text>
+									<xsl:value-of select="$title-amd"/>
+								</fo:block>
+							</xsl:if>
 						</fo:block>
 					</fo:block-container>
 					<!-- Clause(s) -->
 					<fo:block>
@@ -1187,6 +1181,19 @@
 										<xsl:otherwise>ICS&#xA0;&#xA0;67.060</xsl:otherwise>
 									</xsl:choose> -->
 									</fo:block>
+								<xsl:if test="/iso:iso-standard/iso:bibdata/iso:keyword">
+									<fo:block font-size="9pt" margin-bottom="6pt">
+										<xsl:variable name="title-descriptors">
+											<xsl:call-template name="getTitle">
+												<xsl:with-param name="name" select="'title-descriptors'"/>
+											</xsl:call-template>
+										</xsl:variable>
+										<fo:inline font-weight="bold"><xsl:value-of select="$title-descriptors"/>: </fo:inline>
+										<xsl:call-template name="insertKeywords">
+											<xsl:with-param name="sorting">no</xsl:with-param>
+										</xsl:call-template>
+									</fo:block>
+								</xsl:if>
 								<fo:block font-size="9pt">Price based on <fo:page-number-citation ref-id="lastBlock"/> pages</fo:block>
 							</fo:block-container>
 						</fo:block-container>
@@ -1303,8 +1310,7 @@
 	<xsl:template match="iso:figure" mode="contents">
 		<item level="" id="{@id}" display="false">
 			<xsl:attribute name="section">
-				<xsl:call-template name="getFigureNumber"/>
-				<!-- <xsl:text>Figure </xsl:text><xsl:number format="A.1-1" level="multiple" count="iso:annex | iso:figure"/> -->
+				<xsl:call-template name="getFigureNumber"/>
 			</xsl:attribute>
 		</item>
 	</xsl:template>
@@ -1314,21 +1320,14 @@
 		<xsl:param name="sectionNum"/>
 		<xsl:variable name="annex-id" select="ancestor::iso:annex/@id"/>
 		<item level="" id="{@id}" display="false" type="table">
-			<xsl:attribute name="section">
-				<xsl:text>Table </xsl:text>
-				<xsl:choose>
-					<xsl:when test="ancestor::*[local-name()='executivesummary']"> <!-- NIST -->
-							<xsl:text>ES-</xsl:text><xsl:number format="1" count="*[local-name()='executivesummary']//*[local-name()='table']"/>
-						</xsl:when>
-					<xsl:when test="ancestor::*[local-name()='annex']">
-						<xsl:number format="A-" count="iso:annex"/>
-						<xsl:number format="1" level="any" count="iso:table[ancestor::iso:annex[@id = $annex-id]]"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<!-- <xsl:number format="1"/> -->
-						<xsl:number format="1" level="any" count="*[local-name()='sections']//*[local-name()='table']"/>
-					</xsl:otherwise>
-				</xsl:choose>
+			<xsl:attribute name="section">
+				<xsl:variable name="title-table">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-table'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-table"/>
+				<xsl:call-template name="getTableNumber"/>
 			</xsl:attribute>
 			<xsl:value-of select="iso:name/text()"/>
 		</item>
@@ -1337,7 +1336,15 @@
 	<xsl:template match="iso:formula" mode="contents">
 		<item level="" id="{@id}" display="false">
 			<xsl:attribute name="section">
-				<xsl:text>Formula (</xsl:text><xsl:number format="A.1" level="multiple" count="iso:annex | iso:formula"/><xsl:text>)</xsl:text>
+				<xsl:variable name="title-formula">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-formula'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-formula"/>
+				<xsl:call-template name="getFormulaNumber">
+					<xsl:with-param name="display" select="not(@unnumbered = 'true')"/>
+				</xsl:call-template>
 			</xsl:attribute>
 		</item>
 	</xsl:template>
@@ -1443,7 +1450,7 @@
 		<xsl:param name="sectionNum"/>
 		<xsl:param name="sectionNumSkew" select="0"/>
 		<fo:block>
-			<xsl:variable name="pos"><xsl:number count="iso:sections/iso:clause | iso:sections/iso:terms"/></xsl:variable>
+			<xsl:variable name="pos"><xsl:number count="*"/></xsl:variable> <!-- iso:sections/iso:clause | iso:sections/iso:terms | iso:sections/iso:definitions -->
 			<xsl:if test="$pos &gt;= 2">
 				<xsl:attribute name="space-before">18pt</xsl:attribute>
 			</xsl:if>
@@ -1452,7 +1459,7 @@
 				<xsl:choose>
 					<xsl:when test="$sectionNum"><xsl:value-of select="$sectionNum"/></xsl:when>
 					<xsl:when test="$sectionNumSkew != 0">
-						<xsl:variable name="number"><xsl:number count="iso:sections/iso:clause | iso:sections/iso:terms"/></xsl:variable>
+						<xsl:variable name="number"><xsl:number count="*"/></xsl:variable> <!--iso:sections/iso:clause | iso:sections/iso:terms | iso:sections/iso:definitions -->
 						<xsl:value-of select="$number + $sectionNumSkew"/>
 					</xsl:when>
 				</xsl:choose>
@@ -1531,6 +1538,11 @@
 		</xsl:variable>
 		<xsl:choose>
+			<xsl:when test="$doctype = 'amendment'">
+				<fo:block id="{$id}" font-size="11pt" font-style="italic" margin-bottom="12pt" keep-with-next="always">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
 			<xsl:when test="$parent-name = 'annex'">
 				<fo:block id="{$id}" font-size="16pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always">
 					<xsl:value-of select="$section"/>
@@ -1724,7 +1736,7 @@
 				<fo:external-graphic src="{@src}" fox:alt-text="Image {@alt}"/>
 			</fo:block>
 			<fo:block font-weight="bold" margin-top="12pt" margin-bottom="12pt">
-				<xsl:value-of select="$title-figure"/>
+				<!-- <xsl:value-of select="$title-figure"/> -->
 				<xsl:call-template name="getFigureNumber"/>
 			</fo:block>
 		</fo:block-container>
@@ -1740,9 +1752,12 @@
 				<xsl:call-template name="note"/>
 			</xsl:for-each>
 			<fo:block font-weight="bold" text-align="center" margin-top="12pt" margin-bottom="12pt" keep-with-previous="always">
-				<xsl:call-template name="getFigureNumber"/>
+				<xsl:variable name="figureNumber">
+					<xsl:call-template name="getFigureNumber"/>
+				</xsl:variable>
+				<xsl:value-of select="$figureNumber"/>
 				<xsl:if test="iso:name">
-					<xsl:if test="not(local-name(..) = 'figure')">
+					<xsl:if test="not(local-name(..) = 'figure') and normalize-space($figureNumber) != ''">
 						<xsl:text> — </xsl:text>
 					</xsl:if>
 					<xsl:value-of select="iso:name"/>
@@ -1752,7 +1767,13 @@
 	</xsl:template>
 	<xsl:template name="getFigureNumber">
+		<xsl:variable name="title-figure">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-figure'"/>
+			</xsl:call-template>
+		</xsl:variable>
 		<xsl:choose>
+			<xsl:when test="$doctype = 'amendment'"/>
 			<xsl:when test="ancestor::iso:annex">
 				<xsl:choose>
 					<xsl:when test="local-name(..) = 'figure'">
@@ -1793,15 +1814,17 @@
 	<xsl:template match="iso:bibitem">
 		<fo:block id="{@id}" margin-bottom="6pt"> <!-- 12 pt -->
-				<!-- iso:docidentifier -->
-			<xsl:if test="iso:docidentifier">
-				<xsl:choose>
-					<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
-					<xsl:otherwise><fo:inline><xsl:value-of select="iso:docidentifier"/></fo:inline></xsl:otherwise>
-				</xsl:choose>
-			</xsl:if>
-			<xsl:apply-templates select="iso:note"/>
-			<xsl:if test="iso:docidentifier">, </xsl:if>
+			<xsl:variable name="docidentifier">
+				<xsl:if test="iso:docidentifier">
+					<xsl:choose>
+						<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
+						<xsl:otherwise><xsl:value-of select="iso:docidentifier"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:if>
+			</xsl:variable>
+			<xsl:value-of select="$docidentifier"/>
+			<xsl:apply-templates select="iso:note"/>
+			<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
 			<fo:inline font-style="italic">
 				<xsl:choose>
 					<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
@@ -1822,13 +1845,13 @@
 				<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="footnote_{../@id}" fox:alt-text="footnote {$number}">
+				<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="footnote_{../@id}" keep-with-next.within-line="always" alignment-baseline="hanging" padding-right="3mm"><!-- font-size="60%"  -->
+					<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/>
@@ -1866,7 +1889,7 @@
 	<xsl:template match="iso:term">
 		<xsl:param name="sectionNum"/>
-		<fo:block margin-bottom="10pt">
+		<fo:block id="{@id}" margin-bottom="10pt">
 			<xsl:apply-templates>
 				<xsl:with-param name="sectionNum" select="$sectionNum"/>
 			</xsl:apply-templates>
@@ -1877,7 +1900,7 @@
 		<xsl:param name="sectionNum"/>
 		<fo:block line-height="1.1">
 			<fo:block font-weight="bold" keep-with-next="always">
-				<fo:inline id="{../@id}">
+				<fo:inline>
 					<xsl:variable name="section">
 						<xsl:call-template name="getSection">
 							<xsl:with-param name="sectionNum" select="$sectionNum"/>
@@ -1900,7 +1923,12 @@
 	</xsl:template>
 	<xsl:template match="iso:deprecates">
-		<fo:block>DEPRECATED: <xsl:apply-templates/></fo:block>
+		<xsl:variable name="title-deprecated">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-deprecated'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<fo:block><xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/></fo:block>
 	</xsl:template>
 	<xsl:template match="iso:definition[preceding-sibling::iso:domain]">
@@ -1921,7 +1949,14 @@
 		<fo:block margin-bottom="8pt"> <!-- keep-with-previous="always" -->
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<fo:basic-link internal-destination="{iso:origin/@bibitemid}" fox:alt-text="{iso:origin/@citeas}">
-				<xsl:text>[SOURCE: </xsl:text>
+				<xsl:text>[</xsl:text>
+				<xsl:variable name="title-source">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-source'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-source"/>
+				<xsl:text>: </xsl:text>
 				<xsl:value-of select="iso:origin/@citeas"/>
 				<xsl:apply-templates select="iso:origin/iso:localityStack"/>
@@ -1935,19 +1970,23 @@
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="iso:modification">
-		<xsl:text>, modified — </xsl:text>
-		<xsl:apply-templates/>
-	</xsl:template>
 	<xsl:template match="iso:modification/iso:p">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 	<xsl:template match="iso:termnote">
 		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt" text-align="justify">
-			<xsl:text>Note </xsl:text>
-			<xsl:number/>
-			<xsl:text> to entry: </xsl:text>
+			<!-- <xsl:text>Note </xsl:text>
+			<xsl:number />
+			<xsl:text> to entry: </xsl:text> -->
+			<xsl:variable name="num"><xsl:number/></xsl:variable>
+			<xsl:variable name="title-note-to-entry">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-note-to-entry'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:value-of select="java:replaceAll(java:java.lang.String.new($title-note-to-entry),'#',$num)"/>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -1961,14 +2000,19 @@
 	</xsl:template>
 	<xsl:template match="iso:domain">
-		<fo:inline>&lt;<xsl:apply-templates/>&gt;</fo:inline>
+		<fo:inline>&lt;<xsl:apply-templates/>&gt;</fo:inline><xsl:text> </xsl:text>
 	</xsl:template>
 	<xsl:template match="iso:termexample">
 		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt" text-align="justify">
 			<fo:inline padding-right="5mm">
-				<xsl:text>EXAMPLE </xsl:text>
+				<xsl:variable name="title-example">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-example'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-example"/>
 				<xsl:if test="count(ancestor::iso:term[1]//iso:termexample) &gt; 1">
 					<xsl:number/>
 				</xsl:if>
@@ -2009,14 +2053,17 @@
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:if test="iso:docidentifier">
-							<xsl:choose>
-								<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
-								<xsl:otherwise><fo:inline><xsl:value-of select="iso:docidentifier"/></fo:inline></xsl:otherwise>
-							</xsl:choose>
-						</xsl:if>
+						<xsl:variable name="docidentifier">
+							<xsl:if test="iso:docidentifier">
+								<xsl:choose>
+									<xsl:when test="iso:docidentifier/@type = 'metanorma'"/>
+									<xsl:otherwise><xsl:value-of select="iso:docidentifier"/></xsl:otherwise>
+								</xsl:choose>
+							</xsl:if>
+						</xsl:variable>
+						<xsl:value-of select="$docidentifier"/>
 						<xsl:apply-templates select="iso:note"/>
-						<xsl:if test="iso:docidentifier">, </xsl:if>
+						<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
 						<xsl:choose>
 							<xsl:when test="iso:title[@type = 'main' and @language = 'en']">
 								<xsl:apply-templates select="iso:title[@type = 'main' and @language = 'en']"/>
@@ -2048,7 +2095,8 @@
 		</fo:block>
 		<fo:block text-align="right">
 			<!-- — ISO, ISO 7301:2011, Clause 1 -->
-			<xsl:text>— </xsl:text><xsl:value-of select="iso:author"/>
+			<xsl:apply-templates select="iso:author"/>
+			<!-- <xsl:text>— </xsl:text><xsl:value-of select="iso:author"/> -->
 			<xsl:if test="iso:source">
 				<xsl:text>, </xsl:text>
 				<xsl:apply-templates select="iso:source"/>
@@ -2056,70 +2104,17 @@
 		</fo:block>
 	</xsl:template>
+	<xsl:template match="iso:quote/iso:author">
+		<xsl:text>— </xsl:text><xsl:apply-templates/>
+	</xsl:template>
 	<xsl:template match="iso:source">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
+			<xsl:value-of select="@citeas"/> <!--  disable-output-escaping="yes" -->
 			<xsl:apply-templates select="iso:localityStack"/>
 		</fo:basic-link>
 	</xsl:template>
-	<xsl:template match="iso:appendix">
-		<fo:block font-size="12pt" font-weight="bold" margin-top="12pt" margin-bottom="12pt">
-			<fo:inline padding-right="5mm">Appendix <xsl:number/></fo:inline>
-			<xsl:apply-templates select="iso:title" mode="process"/>
-		</fo:block>
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="iso:appendix//iso:example">
-		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt">
-			<xsl:variable name="claims_id" select="ancestor::iso:clause[1]/@id"/>
-			<xsl:text>EXAMPLE </xsl:text>
-			<xsl:if test="count(ancestor::iso:clause[1]//iso:example) &gt; 1">
-					<xsl:number count="iso:example[ancestor::iso:clause[@id = $claims_id]]" level="any"/><xsl:text> </xsl:text>
-				</xsl:if>
-			<xsl:if test="iso:name">
-				<xsl:text>— </xsl:text><xsl:apply-templates select="iso:name" mode="process"/>
-			</xsl:if>
-		</fo:block>
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="iso:appendix//iso:example/iso:name"/>
-	<xsl:template match="iso:appendix//iso:example/iso:name" mode="process">
-		<fo:inline><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-	<!-- <xsl:template match="iso:callout/text()">
-		<fo:basic-link internal-destination="{@target}"><fo:inline>&lt;<xsl:apply-templates />&gt;</fo:inline></fo:basic-link>
-	</xsl:template> -->
-	<xsl:template match="iso:callout">
-			<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
-	</xsl:template>
-	<xsl:template match="iso:annotation">
-		<fo:block>
-		</fo:block>
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="iso:annotation/text()"/>
-	<xsl:template match="iso:annotation/iso:p">
-		<xsl:variable name="annotation-id" select="../@id"/>
-		<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
-		<fo:block id="{$annotation-id}">
-			<xsl:value-of select="concat('&lt;', $callout, '&gt; ')"/>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="iso:appendix/iso:title"/>
-	<xsl:template match="iso:appendix/iso:title" mode="process">
-		<fo:inline><xsl:apply-templates/></fo:inline>
-	</xsl:template>
 	<xsl:template match="mathml:math" priority="2">
 		<fo:inline font-family="Cambria Math">
@@ -2142,8 +2137,15 @@
 			<xsl:variable name="type" select="xalan:nodeset($contents)//item[@id = $target]/@type"/>
 			<xsl:variable name="root" select="xalan:nodeset($contents)//item[@id =$target]/@root"/>
 			<xsl:variable name="level" select="xalan:nodeset($contents)//item[@id =$target]/@level"/>
+			<xsl:variable name="title-clause">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-clause'"/>
+				</xsl:call-template>
+			</xsl:variable>
 			<xsl:choose>
-				<xsl:when test="$type = 'clause' and $root != 'annex' and $level = 1">Clause </xsl:when><!-- and not (ancestor::annex) -->
+				<xsl:when test="$type = 'clause' and $root != 'annex' and $level = 1"><xsl:value-of select="$title-clause"/></xsl:when><!-- and not (ancestor::annex) -->
 				<xsl:when test="$type = 'li'">
 					<xsl:attribute name="color">black</xsl:attribute>
 					<xsl:attribute name="text-decoration">none</xsl:attribute>
@@ -2164,18 +2166,6 @@
 			<xsl:value-of select="$section"/>
       </fo:basic-link>
 	</xsl:template>
-	<xsl:template match="iso:sourcecode">
-		<fo:block font-family="Courier" font-size="9pt" margin-bottom="12pt">
-			<xsl:choose>
-				<xsl:when test="@lang = 'en'"/>
-				<xsl:otherwise>
-					<xsl:attribute name="white-space">pre</xsl:attribute>
-				</xsl:otherwise>
-			</xsl:choose>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
 	<xsl:template match="iso:example/iso:p">
 		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt">
@@ -2183,8 +2173,13 @@
 				<xsl:attribute name="font-size">11pt</xsl:attribute>
 			</xsl:if> -->
 			<xsl:variable name="claims_id" select="ancestor::iso:clause[1]/@id"/>
-			<fo:inline padding-right="5mm">
-				<xsl:text>EXAMPLE </xsl:text>
+			<fo:inline padding-right="5mm">
+				<xsl:variable name="title-example">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-example'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-example"/>
 				<xsl:if test="count(ancestor::iso:clause[1]//iso:example) &gt; 1">
 					<xsl:number count="iso:example[ancestor::iso:clause[@id = $claims_id]]" level="any"/>
 				</xsl:if>
@@ -2196,8 +2191,13 @@
 	<xsl:template match="iso:note/iso:p" name="note">
 		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="12pt" text-align="justify">
 			<xsl:variable name="claims_id" select="ancestor::iso:clause[1]/@id"/>
-			<fo:inline padding-right="6mm">
-				<xsl:text>NOTE </xsl:text>
+			<fo:inline padding-right="6mm">
+				<xsl:variable name="title-note">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-note'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-note"/>
 				<xsl:if test="count(ancestor::iso:clause[1]//iso:note) &gt; 1">
 					<xsl:number count="iso:note[ancestor::iso:clause[@id = $claims_id]]" level="any"/>
 				</xsl:if>
@@ -2222,7 +2222,7 @@
 			<xsl:choose>
 				<xsl:when test="@citeas and normalize-space(text()) = ''">
-					<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
+					<xsl:value-of select="@citeas"/> <!--  disable-output-escaping="yes" -->
 				</xsl:when>
 				<xsl:when test="@bibitemid and normalize-space(text()) = ''">
 					<xsl:value-of select="//iso:bibitem[@id = current()/@bibitemid]/iso:docidentifier"/>
@@ -2235,25 +2235,46 @@
 	</xsl:template>
 	<xsl:template match="iso:locality">
+		<xsl:variable name="title-clause">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-clause'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="title-annex">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-annex'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="title-table">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-table'"/>
+			</xsl:call-template>
+		</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="ancestor::iso:termsource"/>
 			<xsl:when test="@type ='clause' and ancestor::iso:eref"/>
-			<xsl:when test="@type ='clause'">Clause </xsl:when>
-			<xsl:when test="@type ='annex'">Annex </xsl:when>
-			<xsl:when test="@type ='table'">Table </xsl:when>
+			<xsl:when test="@type ='clause'"><xsl:value-of select="$title-clause"/></xsl:when>
+			<xsl:when test="@type ='annex'"><xsl:value-of select="$title-annex"/></xsl:when>
+			<xsl:when test="@type ='table'"><xsl:value-of select="$title-table"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="@type"/></xsl:otherwise>
 		</xsl:choose>
 		<xsl:text> </xsl:text><xsl:value-of select="iso:referenceFrom"/>
 	</xsl:template>
 	<xsl:template match="iso:admonition">
-		<fo:block margin-bottom="12pt" font-weight="bold"> <!-- text-align="center"  -->
-			<xsl:value-of select="translate(@type, $lower, $upper)"/>
+		<fo:block margin-bottom="12pt" font-weight="bold"> <!-- text-align="center"  -->
+			<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">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
 	<xsl:template match="iso:formula/iso:dt/iso:stem">
 		<fo:inline>
 			<xsl:apply-templates/>
@@ -2261,7 +2282,7 @@
 	</xsl:template>
 	<xsl:template match="iso:formula/iso:stem">
-		<fo:block id="{../@id}" margin-top="6pt" margin-bottom="12pt">
+		<fo:block margin-top="6pt" margin-bottom="12pt">
 			<fo:table table-layout="fixed" width="100%">
 				<fo:table-column column-width="95%"/>
 				<fo:table-column column-width="5%"/>
@@ -2274,14 +2295,9 @@
 						</fo:table-cell>
 						<fo:table-cell display-align="center">
 							<fo:block text-align="right">
-								<xsl:choose>
-									<xsl:when test="ancestor::iso:annex">
-										<xsl:text>(</xsl:text><xsl:number format="A.1" level="multiple" count="iso:annex | iso:formula"/><xsl:text>)</xsl:text>
-									</xsl:when>
-									<xsl:otherwise> <!-- not(ancestor::iso:annex) -->
-										<!-- <xsl:text>(</xsl:text><xsl:number level="any" count="iso:formula"/><xsl:text>)</xsl:text> -->
-									</xsl:otherwise>
-								</xsl:choose>
+								<xsl:call-template name="getFormulaNumber">
+									<xsl:with-param name="display" select="not(../@unnumbered = 'true')"/>
+								</xsl:call-template>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
@@ -2380,38 +2396,6 @@
 		</fo:static-content>
 	</xsl:template>
-	<xsl:template name="getId">
-		<xsl:choose>
-			<xsl:when test="../@id">
-				<xsl:value-of select="../@id"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="text()"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-	<xsl:template name="getLevel">
-		<xsl:variable name="level_total" select="count(ancestor::*)"/>
-		<xsl:variable name="level">
-			<xsl:choose>
-				<xsl:when test="ancestor::iso:preface">
-					<xsl:value-of select="$level_total - 2"/>
-				</xsl:when>
-				<xsl:when test="ancestor::iso:sections">
-					<xsl:value-of select="$level_total - 2"/>
-				</xsl:when>
-				<xsl:when test="ancestor::iso:bibliography">
-					<xsl:value-of select="$level_total - 2"/>
-				</xsl:when>
-				<xsl:when test="local-name(ancestor::*[1]) = 'annex'">1</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$level_total - 1"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:value-of select="$level"/>
-	</xsl:template>
 	<xsl:template name="getSection">
 		<xsl:param name="sectionNum"/>
@@ -2431,7 +2415,7 @@
 						</xsl:when>
 						<xsl:when test="$level &gt;= 2">
 							<xsl:variable name="num">
-								<xsl:number format=".1" level="multiple" count="iso:clause/iso:clause |                                            iso:clause/iso:terms |                                            iso:terms/iso:term |                                            iso:clause/iso:term |                                             iso:terms/iso:clause |                                           iso:terms/iso:definitions |                                           iso:definitions/iso:clause |                                           iso:clause/iso:definitions"/>
+								<xsl:call-template name="getSubSection"/>
 							</xsl:variable>
 							<xsl:value-of select="concat($sectionNum, $num)"/>
 						</xsl:when>
@@ -2455,7 +2439,12 @@
 					<xsl:variable name="annexid" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:annexid)"/>
 					<xsl:choose>
 						<xsl:when test="$level = 1">
-							<xsl:text>Annex </xsl:text>
+							<xsl:variable name="title-annex">
+								<xsl:call-template name="getTitle">
+									<xsl:with-param name="name" select="'title-annex'"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="$title-annex"/>
 							<xsl:choose>
 								<xsl:when test="count(//iso:annex) = 1 and $annexid != ''">
 									<xsl:value-of select="$annexid"/>
@@ -2465,8 +2454,7 @@
 								</xsl:otherwise>
 							</xsl:choose>
 						</xsl:when>
-						<xsl:otherwise>
-							<xsl:variable name="annexid" select="normalize-space(/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:annexid)"/>
+						<xsl:otherwise>
 							<xsl:choose>
 								<xsl:when test="count(//iso:annex) = 1 and $annexid != ''">
 									<xsl:value-of select="$annexid"/><xsl:number format=".1" level="multiple" count="iso:clause"/>
@@ -3181,40 +3169,302 @@
 				<xsl:value-of select="$edition"/>
 			</xsl:when>
 		</xsl:choose>
-		<xsl:if test="$edition != ''"><xsl:text> edition</xsl:text></xsl:if>
+		<xsl:variable name="title-edition">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-edition'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:if test="$edition != ''"><xsl:text> </xsl:text><xsl:value-of select="java:toLowerCase(java:java.lang.String.new($title-edition))"/></xsl:if>
+	</xsl:template>
+	<xsl:template name="printTitlePartFr">
+		<xsl:variable name="part-fr" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-part']"/>
+		<xsl:if test="normalize-space($part-fr) != ''">
+			<xsl:if test="$part != ''">
+				<xsl:text> — </xsl:text>
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='fr']),'#',$part)"/>
+				<!-- <xsl:value-of select="$title-part-fr"/>
+				<xsl:value-of select="$part"/>
+				<xsl:text>:</xsl:text> -->
+			</xsl:if>
+			<xsl:value-of select="$part-fr"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="printTitlePartEn">
+		<xsl:variable name="part-en" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-part']"/>
+		<xsl:if test="normalize-space($part-en) != ''">
+			<xsl:if test="$part != ''">
+				<xsl:text> — </xsl:text>
+				<fo:block font-weight="normal" margin-top="6pt">
+					<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part)"/>
+					<!-- <xsl:value-of select="$title-part-en"/>
+					<xsl:value-of select="$part"/>
+					<xsl:text>:</xsl:text> -->
+				</fo:block>
+			</xsl:if>
+			<xsl:value-of select="$part-en"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template name="getFormulaNumber">
+		<xsl:param name="display" select="'true'"/>
+		<xsl:if test="$display = 'true'">
+			<xsl:choose>
+				<xsl:when test="ancestor::iso:annex">
+					<xsl:number format="(A.1)" level="multiple" count="iso:annex | iso:formula[not(@unnumbered='true')]"/>
+				</xsl:when>
+				<xsl:otherwise> <!-- not(ancestor::iso:annex) -->
+					<xsl:text>(</xsl:text><xsl:number level="any" count="iso:formula[not(@unnumbered='true')]"/><xsl:text>)</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:if>
 	</xsl:template>
-<xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="linebreak" select="'&#8232;'"/><xsl:attribute-set xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="link-style">
+<xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
-			<xsl:attribute name="color">blue</xsl:attribute>
-			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+		<title-table lang="en">Table </title-table>
+		<title-table lang="fr">Tableau </title-table>
+			<title-table lang="zh">Table </title-table>
-	</xsl:attribute-set><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()">
-		<xsl:value-of select="."/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='br']">
-		<xsl:value-of select="$linebreak"/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" 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:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']">
-		<xsl:variable name="simple-table">
-			<!-- <xsl:copy> -->
-				<xsl:call-template name="getSimpleTable"/>
-			<!-- </xsl:copy> -->
-		</xsl:variable>
-		<!-- DEBUG -->
-		<!-- SourceTable=<xsl:copy-of select="current()"/>EndSourceTable -->
-		<!-- Simpletable=<xsl:copy-of select="$simple-table"/>EndSimpltable -->
-		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
+		<title-note lang="en">NOTE </title-note>
+		<title-note lang="fr">NOTE </title-note>
-		<!-- <xsl:if test="$namespace = 'iso'">
-			<fo:block space-before="6pt">&#xA0;</fo:block>
-		</xsl:if> -->
+			<title-note lang="zh">NOTE </title-note>
-		<xsl:choose>
+		<title-figure lang="en">Figure </title-figure>
+		<title-figure lang="fr">Figure </title-figure>
+			<title-figure lang="zh">Figure </title-figure>
+		<title-example lang="en">EXAMPLE </title-example>
+		<title-example lang="fr">EXEMPLE </title-example>
+			<title-example lang="zh">EXAMPLE </title-example>
+		<title-example-xref lang="en">Example </title-example-xref>
+		<title-example-xref lang="fr">Exemple </title-example-xref>
+		<title-section lang="en">Section </title-section>
+		<title-section lang="fr">Section </title-section>
+		<title-inequality lang="en">Inequality </title-inequality>
+		<title-inequality lang="fr">Inequality </title-inequality>
+		<title-equation lang="en">Equation </title-equation>
+		<title-equation lang="fr">Equation </title-equation>
+		<title-annex lang="en">Annex </title-annex>
+		<title-annex lang="fr">Annexe </title-annex>
+			<title-annex lang="zh">Annex </title-annex>
+		<title-appendix lang="en">Appendix </title-appendix>
+		<title-appendix lang="fr">Appendix </title-appendix>
+		<title-clause lang="en">Clause </title-clause>
+		<title-clause lang="fr">Article </title-clause>
+			<title-clause lang="zh">Clause </title-clause>
+		<title-edition lang="en">
+				<xsl:text>Edition </xsl:text>
+		</title-edition>
+		<title-formula lang="en">Formula </title-formula>
+		<title-formula lang="fr">Formula </title-formula>
+		<title-toc lang="en">
+				<xsl:text>Contents</xsl:text>
+		</title-toc>
+		<title-toc lang="fr">Sommaire</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>
+		<title-descriptors lang="en">Descriptors</title-descriptors>
+		<title-part lang="en">
+				<xsl:text>Part #:</xsl:text>
+		</title-part>
+		<title-part lang="fr">
+				<xsl:text>Partie #:</xsl:text>
+		</title-part>
+		<title-part lang="zh">第 # 部分:</title-part>
+		<title-note-to-entry lang="en">Note # to entry: </title-note-to-entry>
+		<title-note-to-entry lang="fr">Note # à l'article: </title-note-to-entry>
+			<title-note-to-entry lang="zh">Note # to entry: </title-note-to-entry>
+		<title-modified lang="en">modified</title-modified>
+		<title-modified lang="fr">modifiée</title-modified>
+			<title-modified lang="zh">modified</title-modified>
+		<title-source lang="en">SOURCE</title-source>
+		<title-keywords lang="en">Keywords</title-keywords>
+		<title-deprecated lang="en">DEPRECATED</title-deprecated>
+		<title-deprecated lang="fr">DEPRECATED</title-deprecated>
+		<title-submitting-organizations lang="en">Submitting Organizations</title-submitting-organizations>
+		<title-list-tables lang="en">List of Tables</title-list-tables>
+		<title-list-figures lang="en">List of Figures</title-list-figures>
+		<title-recommendation lang="en">Recommendation </title-recommendation>
+		<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-box lang="en">Box </title-box>
+		<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>
+	</xsl:variable><xsl:template name="getTitle">
+		<xsl:param name="name"/>
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $lang]"/>
+		<xsl:choose>
+			<xsl:when test="normalize-space($title_) != ''">
+				<xsl:value-of select="$title_"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="link-style">
+			<xsl:attribute name="color">blue</xsl:attribute>
+			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
+			<xsl:attribute name="font-family">Courier</xsl:attribute>
+			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</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:template match="text()">
+		<xsl:value-of select="."/>
+	</xsl:template><xsl:template match="*[local-name()='br']">
+		<xsl:value-of select="$linebreak"/>
+	</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"/>
+	</xsl:template><xsl:template match="*[local-name()='table']">
+		<xsl:variable name="simple-table">
+			<!-- <xsl:copy> -->
+				<xsl:call-template name="getSimpleTable"/>
+			<!-- </xsl:copy> -->
+		</xsl:variable>
+		<!-- DEBUG -->
+		<!-- SourceTable=<xsl:copy-of select="current()"/>EndSourceTable -->
+		<!-- Simpletable=<xsl:copy-of select="$simple-table"/>EndSimpltable -->
+		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
+		<!-- <xsl:if test="$namespace = 'iso'">
+			<fo:block space-before="6pt">&#xA0;</fo:block>
+		</xsl:if> -->
+		<xsl:choose>
 			<xsl:when test="@unnumbered = 'true'"/>
 			<xsl:otherwise>
@@ -3230,32 +3480,17 @@
-						<xsl:text>Table </xsl:text>
-						<xsl:choose>
-							<xsl:when test="ancestor::*[local-name()='executivesummary']"> <!-- NIST -->
-								<xsl:text>ES-</xsl:text><xsl:number format="1" count="*[local-name()='executivesummary']//*[local-name()='table'][not(@unnumbered) or @unnumbered != 'true']"/>
-							</xsl:when>
-							<xsl:when test="ancestor::*[local-name()='annex']">
-									<xsl:variable name="annex-id" select="ancestor::iso:annex/@id"/>
-									<xsl:number format="A." count="*[local-name()='annex']"/><xsl:number format="1" level="any" count="iso:table[(not(@unnumbered) or @unnumbered != 'true') and ancestor::iso:annex[@id = $annex-id]]"/>
-							</xsl:when>
-							<xsl:otherwise>
-									<xsl:number format="A." count="*[local-name()='annex']"/>
-									<xsl:number format="1" level="any" count="//*[local-name()='table']                                           [not(ancestor::*[local-name()='annex'])                                            and not(ancestor::*[local-name()='executivesummary'])                                           and not(ancestor::*[local-name()='bibdata'])]                                           [not(@unnumbered) or @unnumbered != 'true']"/>
-							</xsl:otherwise>
-						</xsl:choose>
+						<xsl:variable name="title-table">
+							<xsl:call-template name="getTitle">
+								<xsl:with-param name="name" select="'title-table'"/>
+							</xsl:call-template>
+						</xsl:variable>
+						<xsl:value-of select="$title-table"/>
+						<xsl:call-template name="getTableNumber"/>
 						<xsl:if test="*[local-name()='name']">
@@ -3329,9 +3564,13 @@
 				<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 			<fo:table id="{@id}" table-layout="fixed" width="100%" margin-left="{$margin-left}mm" margin-right="{$margin-left}mm" table-omit-footer-at-break="true">
 					<xsl:attribute name="border">1.5pt solid black</xsl:attribute>
+					<xsl:if test="*[local-name()='thead']">
+						<xsl:attribute name="border-top">1pt solid black</xsl:attribute>
+					</xsl:if>
@@ -3347,9 +3586,10 @@
 					<xsl:attribute name="font-size">10pt</xsl:attribute>
 				<xsl:for-each select="xalan:nodeset($colwidths)//column">
 					<xsl:choose>
-						<xsl:when test=". = 1">
+						<xsl:when test=". = 1 or . = 0">
 							<fo:table-column column-width="proportional-column-width(2)"/>
 						</xsl:when>
 						<xsl:otherwise>
@@ -3357,21 +3597,56 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:for-each>
-				<xsl:apply-templates/>
+				<xsl:choose>
+					<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
+						<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates/>
+					</xsl:otherwise>
+				</xsl:choose>
 			</fo:table>
 		</fo:block-container>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='name']" mode="process">
+	</xsl:template><xsl:template name="getTableNumber">
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name()='executivesummary']"> <!-- NIST -->
+				<xsl:text>ES-</xsl:text><xsl:number format="1" count="*[local-name()='executivesummary']//*[local-name()='table'][not(@unnumbered) or @unnumbered != 'true']"/>
+			</xsl:when>
+			<xsl:when test="ancestor::*[local-name()='annex']">
+					<xsl:variable name="annex-id" select="ancestor::*[local-name()='annex']/@id"/>
+					<xsl:number format="A." count="*[local-name()='annex']"/><xsl:number format="1" level="any" count="*[local-name()='table'][(not(@unnumbered) or @unnumbered != 'true') and ancestor::*[local-name()='annex'][@id = $annex-id]]"/>
+			</xsl:when>
+			<xsl:otherwise>
+					<xsl:number format="A." count="*[local-name()='annex']"/>
+					<xsl:number format="1" level="any" count="//*[local-name()='table']                                       [not(ancestor::*[local-name()='annex'])                                        and not(ancestor::*[local-name()='executivesummary'])                                       and not(ancestor::*[local-name()='bibdata'])]                                       [not(@unnumbered) or @unnumbered != 'true']"/>
+			</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="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="calculate-columns-numbers">
+	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
 		<xsl:variable name="columns-count" select="count($table-row/*)"/>
 		<xsl:variable name="sum-colspans" select="sum($table-row/*/@colspan)"/>
 		<xsl:variable name="columns-with-colspan" select="count($table-row/*[@colspan])"/>
 		<xsl:value-of select="$columns-count + $sum-colspans - $columns-with-colspan"/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="calculate-column-widths">
+	</xsl:template><xsl:template name="calculate-column-widths">
 		<xsl:param name="table"/>
 		<xsl:param name="cols-count"/>
 		<xsl:param name="curr-col" select="1"/>
@@ -3380,7 +3655,7 @@
 		<xsl:if test="$curr-col &lt;= $cols-count">
 			<xsl:variable name="widths">
 				<xsl:choose>
-					<xsl:when test="not($table)">
+					<xsl:when test="not($table)"><!-- this branch is not using in production, for debug only -->
 						<xsl:for-each select="*[local-name()='thead']//*[local-name()='tr']">
 							<xsl:variable name="words">
 								<xsl:call-template name="tokenize">
@@ -3419,9 +3694,16 @@
 								<xsl:apply-templates select="td[$curr-col]" mode="td_text"/>
 							</xsl:variable>
 							<xsl:variable name="words">
+								<xsl:variable name="string_with_added_zerospaces">
+									<xsl:call-template name="add-zero-spaces-java">
+										<xsl:with-param name="text" select="$td_text"/>
+									</xsl:call-template>
+								</xsl:variable>
 								<xsl:call-template name="tokenize">
 									<!-- <xsl:with-param name="text" select="translate(td[$curr-col],'- —:', '    ')"/> -->
-									<xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', '    ')"/>
+									<!-- 2009 thinspace -->
+									<!-- <xsl:with-param name="text" select="translate(normalize-space($td_text),'- —:', '    ')"/> -->
+									<xsl:with-param name="text" select="normalize-space(translate($string_with_added_zerospaces, '', ' '))"/>
 								</xsl:call-template>
 							</xsl:variable>
 							<xsl:variable name="max_length">
@@ -3462,17 +3744,46 @@
 				<xsl:with-param name="table" select="$table"/>
 			</xsl:call-template>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()" mode="td_text">
+	</xsl:template><xsl:template match="text()" mode="td_text">
 		<xsl:variable name="zero-space"></xsl:variable>
 		<xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table2']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
+		<xsl:value-of select="*[local-name()='origin']/@citeas"/>
+	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
+		<xsl:value-of select="@target"/>
+	</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
+		<xsl:param name="cols-count"/>
 		<!-- font-weight="bold" -->
-		<fo:table-header>
+		<fo:table-header>
+				<fo:table-row>
+					<fo:table-cell number-columns-spanned="{$cols-count}"> <!-- border-left="1pt solid white" border-right="1pt solid white" border-top="1pt solid white" -->
+						<fo:block text-align="center" font-size="11pt" font-weight="bold">
+							<!-- (continued) -->
+							<fo:block-container position="absolute" top="-7mm">
+								<fo:block>
+									<fo:retrieve-table-marker retrieve-class-name="table_continued" retrieve-position-within-table="first-starting" retrieve-boundary-within-table="table-fragment"/>
+								</fo:block>
+							</fo:block-container>
+						</fo:block>
+						<!-- <fo:block>fn_name_display
+							<xsl:call-template name="fn_name_display"/>
+						</fo:block> -->
+					</fo:table-cell>
+				</fo:table-row>
 			<xsl:apply-templates/>
 		</fo:table-header>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tfoot']" mode="process">
+	</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:apply-templates/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="insertTableFooter">
+	</xsl:template><xsl:template name="insertTableFooter">
+		<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'">
@@ -3483,22 +3794,7 @@
 				<!-- if there are note(s) or fn(s) then create footer row -->
 				<xsl:if test="$isNoteOrFnExist = 'true'">
-					<xsl:variable name="cols-count">
-						<xsl:choose>
-							<xsl:when test="../*[local-name()='thead']">
-								<!-- <xsl:value-of select="count(../*[local-name()='thead']/*[local-name()='tr']/*[local-name()='th'])"/> -->
-								<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:value-of select="count(./*[local-name()='tr'][1]/*[local-name()='td'])"/> -->
-								<xsl:call-template name="calculate-columns-numbers">
-									<xsl:with-param name="table-row" select="./*[local-name()='tr'][1]"/>
-								</xsl:call-template>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:variable>
 					<fo:table-row>
 						<fo:table-cell border="solid black 1pt" padding-left="1mm" padding-right="1mm" padding-top="1mm" number-columns-spanned="{$cols-count}">
@@ -3528,11 +3824,30 @@
 			</fo:table-footer>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tbody']">
+	</xsl:template><xsl:template match="*[local-name()='tbody']">
-		<xsl:apply-templates select="../*[local-name()='thead']" mode="process"/>
+		<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()='tr'][1]"/>
+					</xsl:call-template>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
-		<xsl:call-template name="insertTableFooter"/>
+		<xsl:apply-templates select="../*[local-name()='thead']" mode="process">
+			<xsl:with-param name="cols-count" select="$cols-count"/>
+		</xsl:apply-templates>
+		<xsl:call-template name="insertTableFooter">
+			<xsl:with-param name="cols-count" select="$cols-count"/>
+		</xsl:call-template>
 		<fo:table-body>
 			<xsl:apply-templates/>
@@ -3540,7 +3855,7 @@
 		</fo:table-body>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tr']">
+	</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">
@@ -3579,7 +3894,7 @@
 			<xsl:apply-templates/>
 		</fo:table-row>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='th']">
+	</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="padding-top">1mm</xsl:attribute>
@@ -3604,7 +3919,7 @@
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='td']">
+	</xsl:template><xsl:template match="*[local-name()='td']">
 		<fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
 			 <!--  and ancestor::*[local-name() = 'thead'] -->
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
@@ -3632,6 +3947,26 @@
 				</xsl:attribute>
 			</xsl:if>
 			<fo:block>
+					<xsl:variable name="row_number">
+						<xsl:number format="1" count="*[local-name() = 'tr'] | *[local-name() = 'th']"/>
+					</xsl:variable>
+					<fo:marker marker-class-name="table_continued">
+						<xsl:if test="$row_number &gt; 1">
+								<fo:inline>
+									<xsl:variable name="title-table">
+										<xsl:call-template name="getTitle">
+											<xsl:with-param name="name" select="'title-table'"/>
+										</xsl:call-template>
+									</xsl:variable>
+									<xsl:value-of select="$title-table"/>
+									<xsl:call-template name="getTableNumber"/>
+									<xsl:text> </xsl:text>
+									<fo:inline font-style="italic" font-weight="normal">(continued)</fo:inline>
+								</fo:inline>
+						</xsl:if>
+					</fo:marker>
 				<xsl:apply-templates/>
 			</fo:block>
 			<!-- <xsl:choose>
@@ -3647,7 +3982,7 @@
 		</fo:table-cell>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='note']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='table']/*[local-name()='note']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
 			<fo:block font-size="10pt" margin-bottom="12pt">
@@ -3657,9 +3992,16 @@
 				<fo:inline padding-right="2mm">
-					<xsl:text>NOTE </xsl:text>
+					<xsl:variable name="title-note">
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-note'"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:value-of select="$title-note"/>
 						<xsl:variable name="id" select="ancestor::*[local-name() = 'table'][1]/@id"/>
 						<xsl:if test="count(//*[local-name()='note'][ancestor::*[@id = $id]]) &gt; 1">
@@ -3673,9 +4015,9 @@
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" 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']" mode="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="fn_display">
+	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
 				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -3695,6 +4037,7 @@
 					<fo:inline font-size="80%" padding-right="5mm" id="{@id}">
@@ -3714,7 +4057,7 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="fn_name_display">
+	</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}">
@@ -3730,7 +4073,7 @@
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="fn_display_figure">
+	</xsl:template><xsl:template name="fn_display_figure">
 		<xsl:variable name="key_iso">
 			true <!-- and (not(@class) or @class !='pseudocode') -->
 		</xsl:variable>
@@ -3741,6 +4084,36 @@
 				</fn>
 			</xsl:for-each>
 		</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="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">
 			<fo:block>
 				<fo:table width="95%" table-layout="fixed">
@@ -3748,8 +4121,19 @@
 						<xsl:attribute name="font-size">10pt</xsl:attribute>
 					</xsl:if>
-					<fo:table-column column-width="15%"/>
-					<fo:table-column column-width="85%"/>
+					<xsl:choose>
+						<!-- if there 'dl', then set same columns width -->
+						<xsl:when test="xalan:nodeset($following_dl_colwidths)//column">
+							<xsl:call-template name="setColumnWidth_dl">
+								<xsl:with-param name="colwidths" select="$following_dl_colwidths"/>
+								<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="15%"/>
+							<fo:table-column column-width="85%"/>
+						</xsl:otherwise>
+					</xsl:choose>
 					<fo:table-body>
 						<xsl:for-each select="xalan:nodeset($references)//fn">
 							<xsl:variable name="reference" select="@reference"/>
@@ -3781,7 +4165,7 @@
 			</fo:block>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='fn']">
+	</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">
@@ -3799,11 +4183,11 @@
 				<xsl:value-of select="@reference"/>
 			</fo:basic-link>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='fn']/*[local-name()='p']">
+	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
 		<fo:inline>
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dl']">
+	</xsl:template><xsl:template match="*[local-name()='dl']">
 		<xsl:variable name="parent" select="local-name(..)"/>
 		<xsl:variable name="key_iso">
@@ -3819,8 +4203,13 @@
 					<fo:block margin-bottom="12pt" text-align="left">
 							<xsl:attribute name="margin-bottom">0</xsl:attribute>
-						<xsl:text>where </xsl:text>
+						<xsl:variable name="title-where">
+							<xsl:call-template name="getTitle">
+								<xsl:with-param name="name" select="'title-where'"/>
+							</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"/>
@@ -3835,18 +4224,28 @@
-					<xsl:text>where</xsl:text>
+					<xsl:variable name="title-where">
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-where'"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:value-of select="$title-where"/>
 				</fo:block>
 			</xsl:when>
 			<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')">
-				<fo:block font-weight="bold" text-align="left" margin-bottom="12pt">
+				<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 						<xsl:attribute name="font-size">10pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">0</xsl:attribute>
-					<xsl:text>Key</xsl:text>
+					<xsl:variable name="title-key">
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-key'"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:value-of select="$title-key"/>
 				</fo:block>
 			</xsl:when>
 		</xsl:choose>
@@ -3862,26 +4261,11 @@
 				<fo:block>
-					<!-- create virtual html table for dl/[dt and dd] -->
-					<xsl:variable name="html-table">
-						<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
-						<xsl:element name="{$ns}:table">
-							<tbody>
-								<xsl:apply-templates mode="dl"/>
-							</tbody>
-						</xsl:element>
-					</xsl:variable>
-					<!-- html-table<xsl:copy-of select="$html-table"/> -->
-					<xsl:variable name="colwidths">
-						<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:variable>
-					<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
 					<fo:table width="95%" table-layout="fixed">
@@ -3894,42 +4278,30 @@
 							</xsl:when>
 						</xsl:choose>
-						<xsl:choose>
-							<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
-								<fo:table-column column-width="50%"/>
-								<fo:table-column column-width="50%"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:choose>
-									<!-- <xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.7">
-										<fo:table-column column-width="60%"/>
-										<fo:table-column column-width="40%"/>
-									</xsl:when> -->
-									<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.3">
-										<fo:table-column column-width="50%"/>
-										<fo:table-column column-width="50%"/>
-									</xsl:when>
-									<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 0.5">
-										<fo:table-column column-width="40%"/>
-										<fo:table-column column-width="60%"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<xsl:for-each select="xalan:nodeset($colwidths)//column">
-											<xsl:choose>
-												<xsl:when test=". = 1">
-													<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>
-									</xsl:otherwise>
-								</xsl:choose>
-								<!-- <fo:table-column column-width="15%"/>
-								<fo:table-column column-width="85%"/> -->
-							</xsl:otherwise>
-						</xsl:choose>
+						<!-- create virtual html table for dl/[dt and dd] -->
+						<xsl:variable name="html-table">
+							<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
+							<xsl:element name="{$ns}:table">
+								<tbody>
+									<xsl:apply-templates mode="dl"/>
+								</tbody>
+							</xsl:element>
+						</xsl:variable>
+						<!-- html-table<xsl:copy-of select="$html-table"/> -->
+						<xsl:variable name="colwidths">
+							<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:variable>
+						<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
+						<xsl:variable name="maxlength_dt">
+							<xsl:call-template name="getMaxLength_dt"/>
+						</xsl:variable>
+						<xsl:call-template name="setColumnWidth_dl">
+							<xsl:with-param name="colwidths" select="$colwidths"/>
+							<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+						</xsl:call-template>
 						<fo:table-body>
 							<xsl:apply-templates>
 								<xsl:with-param name="key_iso" select="normalize-space($key_iso)"/>
@@ -3939,7 +4311,61 @@
 				</fo:block>
 			</fo:block>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dl']/*[local-name()='note']">
+	</xsl:template><xsl:template name="setColumnWidth_dl">
+		<xsl:param name="colwidths"/>
+		<xsl:param name="maxlength_dt"/>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
+				<fo:table-column column-width="50%"/>
+				<fo:table-column column-width="50%"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 2"> <!-- if dt contains short text like t90, a, etc -->
+						<fo:table-column column-width="5%"/>
+						<fo:table-column column-width="95%"/>
+					</xsl:when>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like t90, a, etc -->
+						<fo:table-column column-width="10%"/>
+						<fo:table-column column-width="90%"/>
+					</xsl:when>
+					<!-- <xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.7">
+						<fo:table-column column-width="60%"/>
+						<fo:table-column column-width="40%"/>
+					</xsl:when> -->
+					<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.3">
+						<fo:table-column column-width="50%"/>
+						<fo:table-column column-width="50%"/>
+					</xsl:when>
+					<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 0.5">
+						<fo:table-column column-width="40%"/>
+						<fo:table-column column-width="60%"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<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>
+					</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">
+		<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:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']">
 		<xsl:param name="key_iso"/>
 		<!-- <tr>
@@ -3955,7 +4381,12 @@
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="margin-top">0</xsl:attribute>
 					</xsl:if>
-					NOTE
+					<xsl:variable name="title-note">
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-note'"/>
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:value-of select="$title-note"/>
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
@@ -3964,7 +4395,7 @@
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dt']" mode="dl">
+	</xsl:template><xsl:template match="*[local-name()='dt']" mode="dl">
 		<tr>
 			<td>
 				<xsl:apply-templates/>
@@ -3977,11 +4408,12 @@
 			</td>
 		</tr>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dt']">
+	</xsl:template><xsl:template match="*[local-name()='dt']">
 		<xsl:param name="key_iso"/>
 		<fo:table-row>
 			<fo:table-cell>
 				<fo:block margin-top="6pt">
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
@@ -3993,8 +4425,15 @@
 					</xsl:if>
-					<xsl:apply-templates/>
+					<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>
@@ -4008,37 +4447,37 @@
 			</fo:table-cell>
 		</fo:table-row>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="dl"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="dl_process">
+	</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 xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
+	</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 xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='em']">
+	</xsl:template><xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='strong']">
+	</xsl:template><xsl:template match="*[local-name()='strong']">
 		<fo:inline font-weight="bold">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='sup']">
+	</xsl:template><xsl:template match="*[local-name()='sup']">
 		<fo:inline font-size="80%" vertical-align="super">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='sub']">
+	</xsl:template><xsl:template match="*[local-name()='sub']">
 		<fo:inline font-size="80%" vertical-align="sub">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tt']">
-		<fo:inline font-family="Courier" font-size="10pt">
+	</xsl:template><xsl:template match="*[local-name()='tt']">
+		<fo:inline font-family="Courier" font-size="10pt">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='del']">
+	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="text()[ancestor::*[local-name()='smallcap']]">
+	</xsl:template><xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<xsl:variable name="text" select="normalize-space(.)"/>
 		<fo:inline font-size="75%">
 				<xsl:if test="string-length($text) &gt; 0">
@@ -4047,10 +4486,11 @@
 					</xsl:call-template>
 				</xsl:if>
 			</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="recursiveSmallCaps">
+	</xsl:template><xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
-    <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/>
+    <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
+		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
         <fo:inline font-size="{100 div 0.75}%">
@@ -4066,7 +4506,7 @@
         <xsl:with-param name="text" select="substring($text,2)"/>
       </xsl:call-template>
     </xsl:if>
-  </xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="tokenize">
+  </xsl:template><xsl:template name="tokenize">
 		<xsl:param name="text"/>
 		<xsl:param name="separator" select="' '"/>
 		<xsl:choose>
@@ -4114,7 +4554,7 @@
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="max_length">
+	</xsl:template><xsl:template name="max_length">
 		<xsl:param name="words"/>
 		<xsl:for-each select="$words//word">
 				<xsl:sort select="." data-type="number" order="descending"/>
@@ -4122,7 +4562,11 @@
 						<xsl:value-of select="."/>
 				</xsl:if>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="add-zero-spaces">
+	</xsl:template><xsl:template name="add-zero-spaces-java">
+		<xsl:param name="text" select="."/>
+		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1')"/>
+	</xsl:template><xsl:template name="add-zero-spaces">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-chars">-</xsl:variable>
 		<xsl:variable name="zero-space-after-dot">.</xsl:variable>
@@ -4175,7 +4619,7 @@
 				<xsl:value-of select="$text"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="add-zero-spaces-equal">
+	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
@@ -4201,7 +4645,7 @@
 				<xsl:value-of select="$text"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="getSimpleTable">
+	</xsl:template><xsl:template name="getSimpleTable">
 		<xsl:variable name="simple-table">
 			<!-- Step 1. colspan processing -->
@@ -4228,9 +4672,9 @@
 			</xsl:choose> -->
 		</xsl:variable>
 		<xsl:copy-of select="$simple-table"/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
 		<xsl:apply-templates mode="simple-table-colspan"/>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
 		<xsl:choose>
 			<xsl:when test="@colspan">
 				<xsl:variable name="td">
@@ -4252,16 +4696,16 @@
 				</xsl:element>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="@colspan" mode="simple-table-colspan"/><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='tr']" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="@colspan" mode="simple-table-colspan"/><xsl:template match="*[local-name()='tr']" mode="simple-table-colspan">
 		<xsl:element name="tr">
 			<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
 			<xsl:apply-templates mode="simple-table-colspan"/>
 		</xsl:element>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="@*|node()" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="@*|node()" mode="simple-table-colspan">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="simple-table-colspan"/>
 		</xsl:copy>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="repeatNode">
+	</xsl:template><xsl:template name="repeatNode">
 		<xsl:param name="count"/>
 		<xsl:param name="node"/>
@@ -4272,18 +4716,18 @@
 			</xsl:call-template>
 			<xsl:copy-of select="$node"/>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="@*|node()" mode="simple-table-rowspan">
+	</xsl:template><xsl:template match="@*|node()" mode="simple-table-rowspan">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="simple-table-rowspan"/>
 		</xsl:copy>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="tbody" mode="simple-table-rowspan">
+	</xsl:template><xsl:template match="tbody" mode="simple-table-rowspan">
 		<xsl:copy>
 				<xsl:copy-of select="tr[1]"/>
 				<xsl:apply-templates select="tr[2]" mode="simple-table-rowspan">
 						<xsl:with-param name="previousRow" select="tr[1]"/>
 				</xsl:apply-templates>
 		</xsl:copy>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="tr" mode="simple-table-rowspan">
+	</xsl:template><xsl:template match="tr" mode="simple-table-rowspan">
 		<xsl:param name="previousRow"/>
 		<xsl:variable name="currentRow" select="."/>
@@ -4317,43 +4761,53 @@
 		<xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="getLang">
+	</xsl:template><xsl:template name="getLang">
 		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
 		<xsl:choose>
 			<xsl:when test="$language = 'English'">en</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" name="capitalizeWords">
+	</xsl:template><xsl:template name="capitalizeWords">
 		<xsl:param name="str"/>
 		<xsl:variable name="str2" select="translate($str, '-', ' ')"/>
 		<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: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>
 				<xsl:text> </xsl:text>
 				<xsl:call-template name="capitalizeWords">
 					<xsl:with-param name="str" select="substring-after($str2, ' ')"/>
 				</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: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>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="mathml:math">
+	</xsl:template><xsl:template name="capitalize">
+		<xsl:param name="str"/>
+		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
+		<xsl:value-of select="substring($str, 2)"/>
+	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX2Math">
 			<fo:instream-foreign-object fox:alt-text="Math">
 				<xsl:copy-of select="."/>
 			</fo:instream-foreign-object>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='localityStack']">
+	</xsl:template><xsl:template match="*[local-name()='localityStack']">
 		<xsl:for-each select="*[local-name()='locality']">
 			<xsl:if test="position() =1"><xsl:text>, </xsl:text></xsl:if>
 			<xsl:apply-templates select="."/>
 			<xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:itu="https://www.metanorma.org/ns/itu" xmlns:nist="https://www.metanorma.org/ns/nist" xmlns:un="https://www.metanorma.org/ns/un" xmlns:csd="https://www.metanorma.org/ns/csd" xmlns:ogc="https://www.metanorma.org/ns/ogc" match="*[local-name()='link']" name="link">
+	</xsl:template><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
@@ -4383,4 +4837,246 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
+		<fo:block xsl:use-attribute-sets="sourcecode-style">
+			<!-- <xsl:choose>
+				<xsl:when test="@lang = 'en'"></xsl:when>
+				<xsl:otherwise> -->
+					<xsl:attribute name="white-space">pre</xsl:attribute>
+					<xsl:attribute name="wrap-option">wrap</xsl:attribute>
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name()='bookmark']">
+		<fo:inline id="{@id}"/>
+	</xsl:template><xsl:template match="*[local-name()='appendix']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
+			<xsl:variable name="title-appendix">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-appendix'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<fo:inline padding-right="5mm"><xsl:value-of select="$title-appendix"/> <xsl:number/></fo:inline>
+			<xsl:apply-templates select="*[local-name()='title']" mode="process"/>
+		</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">
+		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']">
+		<fo:block xsl:use-attribute-sets="appendix-example-style">
+			<xsl:variable name="claims_id" select="ancestor::*[local-name()='clause'][1]/@id"/>
+			<xsl:variable name="title-example">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-example'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:value-of select="$title-example"/>
+			<xsl:if test="count(ancestor::*[local-name()='clause'][1]//*[local-name()='example']) &gt; 1">
+					<xsl:number count="*[local-name()='example'][ancestor::*[local-name()='clause'][@id = $claims_id]]" level="any"/><xsl:text> </xsl:text>
+				</xsl:if>
+			<xsl:if test="*[local-name()='name']">
+				<xsl:text>— </xsl:text><xsl:apply-templates select="*[local-name()='name']" mode="process"/>
+			</xsl:if>
+		</fo:block>
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']/*[local-name()='name']"/><xsl:template match="*[local-name()='appendix']//*[local-name()='example']/*[local-name()='name']" mode="process">
+		<fo:inline><xsl:apply-templates/></fo:inline>
+	</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']">
+		<xsl:variable name="annotation-id" select="@id"/>
+		<xsl:variable name="callout" select="//*[@target = $annotation-id]/text()"/>
+		<fo:block id="{$annotation-id}" white-space="nowrap">
+			<fo:inline>
+				<xsl:apply-templates>
+					<xsl:with-param name="callout" select="concat('&lt;', $callout, '&gt; ')"/>
+				</xsl:apply-templates>
+			</fo:inline>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'annotation']/*[local-name() = 'p']">
+		<xsl:param name="callout"/>
+		<fo:inline id="{@id}">
+			<!-- for first p in annotation, put <x> -->
+			<xsl:if test="not(preceding-sibling::*[local-name() = 'p'])"><xsl:value-of select="$callout"/></xsl:if>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'modification']">
+		<xsl:variable name="title-modified">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-modified'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
+		</xsl:choose>
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template name="convertDate">
+		<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'">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:variable>
+		<xsl:variable name="result">
+			<xsl:choose>
+				<xsl:when test="$format = 'short' or $day = ''">
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:value-of select="$result"/>
+	</xsl:template><xsl:template name="insertKeywords">
+		<xsl:param name="sorting" select="'true'"/>
+		<xsl:param name="charAtEnd" select="'.'"/>
+		<xsl:param name="charDelim" select="', '"/>
+		<xsl:choose>
+			<xsl:when test="$sorting = 'true' or $sorting = 'yes'">
+				<xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
+					<xsl:sort data-type="text" order="ascending"/>
+					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
+						<xsl:with-param name="charDelim" select="$charDelim"/>
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
+					<xsl:call-template name="insertKeyword">
+						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
+						<xsl:with-param name="charDelim" select="$charDelim"/>
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="insertKeyword">
+		<xsl:param name="charAtEnd"/>
+		<xsl:param name="charDelim"/>
+		<xsl:apply-templates/>
+		<xsl:choose>
+			<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
+			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="addPDFUAmeta">
+		<fo:declarations>
+			<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
+					<pdf:dictionary type="normal" key="ViewerPreferences">
+						<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
+					</pdf:dictionary>
+				</pdf:catalog>
+			<x:xmpmeta xmlns:x="adobe:ns:meta/">
+				<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+					<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
+					<!-- Dublin Core properties go here -->
+						<dc:title>
+							<xsl:variable name="title">
+									<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en' and @type = 'main']"/>
+							</xsl:variable>
+							<xsl:choose>
+								<xsl:when test="normalize-space($title) != ''">
+									<xsl:value-of select="$title"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:text> </xsl:text>
+								</xsl:otherwise>
+							</xsl:choose>
+						</dc:title>
+						<dc:creator>
+								<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']/*[local-name() = 'organization']/*[local-name() = 'name']"/>
+						</dc:creator>
+						<dc:description>
+							<xsl:variable name="abstract">
+									<xsl:copy-of select="/*/*[local-name() = 'bibliography']/*[local-name() = 'references']/*[local-name() = 'bibitem']/*[local-name() = 'abstract']//text()"/>
+							</xsl:variable>
+							<xsl:value-of select="normalize-space($abstract)"/>
+						</dc:description>
+						<pdf:Keywords>
+							<xsl:call-template name="insertKeywords"/>
+						</pdf:Keywords>
+					</rdf:Description>
+					<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
+						<!-- XMP properties go here -->
+						<xmp:CreatorTool/>
+					</rdf:Description>
+				</rdf:RDF>
+			</x:xmpmeta>
+		</fo:declarations>
+	</xsl:template><xsl:template name="getId">
+		<xsl:choose>
+			<xsl:when test="../@id">
+				<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>
+	</xsl:template><xsl:template name="getLevel">
+		<xsl:variable name="level_total" select="count(ancestor::*)"/>
+		<xsl:variable name="level">
+			<xsl:choose>
+				<xsl:when test="ancestor::*[local-name() = 'preface']">
+					<xsl:value-of select="$level_total - 2"/>
+				</xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'sections']">
+					<xsl:value-of select="$level_total - 2"/>
+				</xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'bibliography']">
+					<xsl:value-of select="$level_total - 2"/>
+				</xsl:when>
+				<xsl:when test="local-name(ancestor::*[1]) = 'annex'">1</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$level_total - 1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:value-of select="$level"/>
+	</xsl:template><xsl:template name="getSubSection">
+		<xsl:number format=".1" level="multiple" count="*[local-name() = 'clause']/*[local-name() = 'clause'] |                  *[local-name() = 'clause']/*[local-name() = 'terms'] |                  *[local-name() = 'terms']/*[local-name() = 'term'] |                  *[local-name() = 'clause']/*[local-name() = 'term'] |                   *[local-name() = 'terms']/*[local-name() = 'clause'] |                 *[local-name() = 'terms']/*[local-name() = 'definitions'] |                 *[local-name() = 'definitions']/*[local-name() = 'clause'] |                 *[local-name() = 'clause']/*[local-name() = 'definitions'] |                 *[local-name() = 'definitions']/*[local-name() = 'definitions'] |                 *[local-name() = 'clause']/*[local-name() = 'references']"/>
+	</xsl:template><xsl:template name="split">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<xsl:if test="string-length($pText) &gt;0">
+		<item>
+			<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
+		</item>
+		<xsl:call-template name="split">
+			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
+			<xsl:with-param name="sep" select="$sep"/>
+		</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template name="getDocumentId">
+		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
 	</xsl:template></xsl:stylesheet>