RubyGems - metanorma-iho - Versions diffs - 0.1.2 → 0.2.4 - Mend

metanorma-iho 0.1.2 → 0.2.4

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

Files changed (22) hide show

checksums.yaml +4 -4
data/.github/workflows/ubuntu.yml +1 -1
data/lib/asciidoctor/iho/basicdoc.rng +23 -0
data/lib/asciidoctor/iho/converter.rb +12 -4
data/lib/asciidoctor/iho/iho.rng +37 -6
data/lib/asciidoctor/iho/isodoc.rng +137 -21
data/lib/isodoc/iho/base_convert.rb +121 -10
data/lib/isodoc/iho/html/iho.css +16 -4
data/lib/isodoc/iho/html/iho.scss +18 -4
data/lib/isodoc/iho/html_convert.rb +14 -12
data/lib/isodoc/iho/i18n-en.yaml +2 -0
data/lib/isodoc/iho/iho.specification.xsl +2216 -1464
data/lib/isodoc/iho/iho.standard.xsl +2216 -1464
data/lib/isodoc/iho/init.rb +25 -0
data/lib/isodoc/iho/pdf_convert.rb +0 -1
data/lib/isodoc/iho/presentation_xml_convert.rb +2 -1
data/lib/isodoc/iho/word_convert.rb +3 -1
data/lib/isodoc/iho/xref.rb +12 -2
data/lib/metanorma/iho/version.rb +1 -1
data/metanorma-iho.gemspec +2 -3
data/metanorma.yml +1 -0
metadata +8 -20

data/lib/isodoc/iho/iho.standard.xsl CHANGED

@@ -7,7 +7,8 @@
-	<xsl:key name="kfn" match="iho:fn[local-name(..) = 'p' or local-name(..) = 'title']" use="@reference"/>
+	<!-- <xsl:key name="kfn" match="iho:fn[local-name(..) = 'p' or local-name(..) = 'title']" use="@reference"/> -->
+	<xsl:key name="kfn" match="iho:fn[local-name(..) = 'p' or ancestor::*[local-name() = 'title']]" use="@reference"/>
@@ -29,27 +30,8 @@
 	-->
 	<xsl:variable name="contents">
 		<contents>
-			<xsl:apply-templates select="/iho:iho-standard/iho:preface/*" mode="contents"/>
-				<!-- <xsl:with-param name="sectionNum" select="'0'"/>
-			</xsl:apply-templates> -->
-			<xsl:apply-templates select="/iho:iho-standard/iho:sections/*" mode="contents"> <!-- iho:clause[1] [@id = '_scope'] -->
-				<!-- <xsl:with-param name="sectionNum" select="'1'"/> -->
-			</xsl:apply-templates>
-			<!-- [@id = '_normative_references'] -->
-			<!-- <xsl:apply-templates select="/iho:iho-standard/iho:bibliography/iho:references[1]" mode="contents">
-				<xsl:with-param name="sectionNum" select="'2'"/>
-			</xsl:apply-templates> -->
-			<!-- @id != '_scope' -->
-		<!-- 	<xsl:apply-templates select="/iho:iho-standard/iho:sections/*[position() &gt; 1]" mode="contents">
-				<xsl:with-param name="sectionNumSkew" select="'1'"/>
-			</xsl:apply-templates> -->
-			<xsl:apply-templates select="/iho:iho-standard/iho:annex" mode="contents"/>
-			<xsl:apply-templates select="/iho:iho-standard/iho:bibliography/iho:references[position() &gt; 1]" mode="contents"/> <!-- @id = '_bibliography' -->
-			<xsl:apply-templates select="//iho:figure" mode="contents"/>
-			<xsl:apply-templates select="//iho:table" mode="contents"/>
+			<xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
+			<xsl:call-template name="processMainSectionsDefault_Contents"/>
 		</contents>
 	</xsl:variable>
@@ -129,6 +111,10 @@
 				<xsl:call-template name="addPDFUAmeta"/>
+				<xsl:call-template name="addBookmarks">
+					<xsl:with-param name="contents" select="$contents"/>
+				</xsl:call-template>
 				<!-- =========================== -->
 				<!-- Cover Page -->
 				<fo:page-sequence master-reference="cover">
@@ -243,35 +229,26 @@
 										<fo:list-block>
 											<xsl:attribute name="provisional-distance-between-starts">
 												<xsl:choose>
-													<xsl:when test="@level &gt;= 1 and @display-section = 'true' and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
-													<xsl:when test="@level &gt;= 1 and @display-section = 'true' and not(@type = 'annex')">10mm</xsl:when>
-													<!-- <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:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
+													<xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
+													<xsl:when test="@level &gt;= 1 and not(@type = 'annex')">10mm</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') and not(@type = 'annex')"> <!-- output below   -->
+														<xsl:if test="@section != '' and not(@type = 'annex')"> <!-- 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()}">
-																<fo:inline>
-																	<xsl:if test="@type = 'annex'">
-																		<xsl:attribute name="font-weight">bold</xsl:attribute>
-																		<xsl:value-of select="@section"/><xsl:text>  </xsl:text>
-																	</xsl:if>
-																	<xsl:value-of select="text()"/>
-																</fo:inline>
+															<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
+																<xsl:apply-templates select="title"/>
 																<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>
@@ -288,7 +265,7 @@
 						</fo:block-container>
 						<!-- Foreword, Introduction -->
-						<xsl:apply-templates select="/iho:iho-standard/iho:preface/*"/>
+						<xsl:call-template name="processPrefaceSectionsDefault"/>
 					</fo:flow>
 				</fo:page-sequence>
@@ -313,9 +290,13 @@
 							<fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt"><xsl:value-of select="$title-en"/></fo:block>
-							<xsl:apply-templates select="/iho:iho-standard/iho:sections/*"/>
+							<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
+							<!-- Normative references  -->
+							<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
+							<!-- Terms and definitions -->
+							<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms']"/>
+							<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='definitions']"/>
+							<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and local-name() != 'definitions' and not(@type='scope')]"/>
 						</fo:block-container>
 					</fo:flow>
@@ -330,12 +311,32 @@
 						</fo:static-content>
 						<xsl:call-template name="insertHeaderFooter"/>
 						<fo:flow flow-name="xsl-region-body">
-							<fo:block-container>
-								<xsl:apply-templates select="/iho:iho-standard/iho:annex"/>
+							<fo:block-container>
+								<xsl:apply-templates select="/*/*[local-name()='annex']"/>
+							</fo:block-container>
+						</fo:flow>
+					</fo:page-sequence>
+				</xsl:if>
+				<xsl:if test="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]">
+					<fo:page-sequence master-reference="document">
+						<fo:static-content flow-name="xsl-footnote-separator">
+							<fo:block>
+								<fo:leader leader-pattern="rule" leader-length="30%"/>
+							</fo:block>
+						</fo:static-content>
+						<xsl:call-template name="insertHeaderFooter"/>
+						<fo:flow flow-name="xsl-region-body">
+							<fo:block-container>
+								<!-- Bibliography -->
+								<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
 							</fo:block-container>
 						</fo:flow>
 					</fo:page-sequence>
 				</xsl:if>
 				<!-- =========================== -->
 				<!-- End Document Pages -->
 				<!-- =========================== -->
@@ -351,194 +352,63 @@
 	<!-- ============================= -->
 	<!-- CONTENTS                                       -->
 	<!-- ============================= -->
-	<xsl:template match="node()" mode="contents">
-		<xsl:param name="sectionNum"/>
-		<xsl:param name="sectionNumSkew"/>
-		<xsl:apply-templates mode="contents">
-			<xsl:with-param name="sectionNum" select="$sectionNum"/>
-			<xsl:with-param name="sectionNumSkew" select="$sectionNumSkew"/>
-		</xsl:apply-templates>
-	</xsl:template>
-	<!-- calculate main section number (1,2,3) and pass it deep into templates -->
-	<!-- it's necessary, because there is itu:bibliography/itu:references from other section, but numbering should be sequental -->
-	<xsl:template match="iho:iho-standard/iho:sections/*" mode="contents">
-		<xsl:param name="sectionNum"/>
-		<xsl:param name="sectionNumSkew" select="0"/>
-		<xsl:variable name="sectionNum_">
-			<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="*"/></xsl:variable>
-					<xsl:value-of select="$number + $sectionNumSkew"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:number count="*"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:apply-templates mode="contents">
-			<xsl:with-param name="sectionNum" select="$sectionNum_"/>
-		</xsl:apply-templates>
-	</xsl:template>
-	<xsl:template match="iho:annex" mode="contents">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="id" select="@id"/>
-		<xsl:variable name="level">1</xsl:variable>
-		<xsl:variable name="section">
-			<xsl:choose>
-				<xsl:when test="@obligation = 'informative'">
-					<xsl:variable name="title-appendix">
-						<xsl:call-template name="getTitle">
-							<xsl:with-param name="name" select="'title-appendix'"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<xsl:value-of select="$title-appendix"/>
-					<xsl:number format="1" level="any" count="iho:annex[@obligation = 'informative']"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<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:number format="A" level="any" count="iho:annex[not(@obligation = 'informative')]"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:variable name="display">true</xsl:variable>
-		<xsl:variable name="display-section">true</xsl:variable>
-		<xsl:variable name="type"><xsl:value-of select="local-name()"/></xsl:variable>
-		<xsl:variable name="root">annex</xsl:variable>
-		<item id="{$id}" level="{$level}" section="{$section}" display-section="{$display-section}" display="{$display}" type="{$type}" root="{$root}">
-			<xsl:attribute name="addon">
-				<xsl:value-of select="../@obligation"/>
-			</xsl:attribute>
-			<xsl:value-of select="iho:title"/>
-		</item>
-		<xsl:apply-templates mode="contents">
-			<xsl:with-param name="sectionNum" select="$sectionNum"/>
-		</xsl:apply-templates>
+	<xsl:template match="node()" mode="contents">
+		<xsl:apply-templates mode="contents"/>
 	</xsl:template>
-	<!-- Any node with title element - clause, definition,... except annex ! (see processing above) -->
-	<xsl:template match="iho:title[not(parent::iho:annex)] | iho:preferred" mode="contents">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="id">
-			<xsl:call-template name="getId"/>
-		</xsl:variable>
+	<!-- element with title -->
+	<xsl:template match="*[iho:title]" mode="contents">
 		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<xsl:variable name="section">
-			<xsl:call-template name="getSection">
-				<xsl:with-param name="sectionNum" select="$sectionNum"/>
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="depth" select="iho:title/@depth"/>
 			</xsl:call-template>
 		</xsl:variable>
 		<xsl:variable name="display">
-			<xsl:choose>
-				<xsl:when test="ancestor::iho:bibitem">false</xsl:when>
-				<xsl:when test="ancestor::iho:term">false</xsl:when>
-				<xsl:when test="ancestor::iho:annex and $level &gt;= 3">false</xsl:when>
+			<xsl:choose>
 				<xsl:when test="$level &lt;= 2">true</xsl:when>
 				<xsl:otherwise>false</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="display-section">
+		<xsl:variable name="skip">
 			<xsl:choose>
-				<xsl:when test="ancestor::iho:preface">false</xsl:when>
-				<!-- <xsl:when test="ancestor::iho:annex">false</xsl:when> -->
-				<xsl:otherwise>true</xsl:otherwise>
+				<xsl:when test="ancestor-or-self::iho:bibitem">true</xsl:when>
+				<xsl:when test="ancestor-or-self::iho:term">true</xsl:when>
+				<xsl:otherwise>false</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:variable name="type">
-			<xsl:value-of select="local-name(..)"/>
-		</xsl:variable>
-		<xsl:variable name="root">
-			<xsl:choose>
-				<xsl:when test="ancestor::iho:annex">annex</xsl:when>
-			</xsl:choose>
-		</xsl:variable>
+		<xsl:if test="$skip = 'false'">
-		<item id="{$id}" level="{$level}" section="{$section}" display-section="{$display-section}" display="{$display}" type="{$type}" root="{$root}">
-			<xsl:attribute name="addon">
-				<xsl:if test="local-name(..) = 'annex'"><xsl:value-of select="../@obligation"/></xsl:if>
-			</xsl:attribute>
-			<xsl:value-of select="."/>
-		</item>
+			<xsl:variable name="section">
+				<xsl:call-template name="getSection"/>
+			</xsl:variable>
+			<xsl:variable name="title">
+				<xsl:call-template name="getName"/>
+			</xsl:variable>
+			<xsl:variable name="type">
+				<xsl:value-of select="local-name()"/>
+			</xsl:variable>
+			<xsl:variable name="root">
+				<xsl:if test="ancestor-or-self::iho:preface">preface</xsl:if>
+				<xsl:if test="ancestor-or-self::iho:annex">annex</xsl:if>
+			</xsl:variable>
+			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
+				<title>
+					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+				</title>
+				<xsl:apply-templates mode="contents"/>
+			</item>
+		</xsl:if>
-		<xsl:apply-templates mode="contents">
-			<xsl:with-param name="sectionNum" select="$sectionNum"/>
-		</xsl:apply-templates>
-	</xsl:template>
-	<xsl:template match="iho:figure" mode="contents">
-		<item level="" id="{@id}" display="false">
-			<xsl:attribute name="section">
-				<xsl:call-template name="getFigureNumber"/>
-			</xsl:attribute>
-		</item>
-	</xsl:template>
-	<xsl:template match="iho:table" mode="contents">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="annex-id" select="ancestor::iho:annex/@id"/>
-		<item level="" id="{@id}" display="false" type="table">
-			<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="iho:name/text()"/>
-		</item>
-	</xsl:template>
-	<xsl:template match="iho:formula" mode="contents">
-		<item level="" id="{@id}" display="false">
-			<xsl:attribute name="section">
-				<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:number format="(A.1)" level="multiple" count="iho:annex | iho:formula"/>
-			</xsl:attribute>
-		</item>
 	</xsl:template>
-	<xsl:template match="iho:li" mode="contents">
-		<xsl:param name="sectionNum"/>
-		<item level="" id="{@id}" display="false" type="li">
-			<xsl:attribute name="section">
-				<xsl:call-template name="getListItemFormat"/>
-			</xsl:attribute>
-			<xsl:attribute name="parent_section">
-				<xsl:for-each select="ancestor::*[not(local-name() = 'p' or local-name() = 'ol')][1]">
-					<xsl:call-template name="getSection">
-						<xsl:with-param name="sectionNum" select="$sectionNum"/>
-					</xsl:call-template>
-				</xsl:for-each>
-			</xsl:attribute>
-		</item>
-		<xsl:apply-templates mode="contents">
-			<xsl:with-param name="sectionNum" select="$sectionNum"/>
-		</xsl:apply-templates>
-	</xsl:template>
 	<xsl:template match="iho:references/iho:bibitem" mode="contents"/>
 	<!-- ============================= -->
@@ -564,110 +434,38 @@
 	</xsl:template>
-	<!-- for pass the paremeter 'sectionNum' over templates, like 'tunnel' parameter in XSLT 2.0 -->
-	<xsl:template match="node()">
-		<xsl:param name="sectionNum"/>
-		<xsl:param name="sectionNumSkew"/>
-		<xsl:apply-templates>
-			<xsl:with-param name="sectionNum" select="$sectionNum"/>
-			<xsl:with-param name="sectionNumSkew" select="$sectionNumSkew"/>
-		</xsl:apply-templates>
-	</xsl:template>
-<!-- clause, terms, clause, ...-->
-	<xsl:template match="iho:iho-standard/iho:sections/*">
-		<xsl:param name="sectionNum"/>
-		<xsl:param name="sectionNumSkew" select="0"/>
-		<fo:block>
-			<!-- iho:sections/iho:clause | iho:sections/iho:terms | iho:sections/iho:definitions -->
-			<!-- <xsl:variable name="pos"><xsl:number count="*"/></xsl:variable>
-			<xsl:if test="$pos &gt;= 2">
-				<xsl:attribute name="space-before">18pt</xsl:attribute>
-			</xsl:if> -->
-			<!-- pos=<xsl:value-of select="$pos" /> -->
-			<xsl:variable name="sectionNum_">
-				<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="*"/></xsl:variable> <!--iho:sections/iho:clause | iho:sections/iho:terms | iho:sections/iho:definitions -->
-						<xsl:value-of select="$number + $sectionNumSkew"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:number count="*"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			<!-- <xsl:if test="not(iho:title)">
-				<fo:block margin-top="3pt" margin-bottom="12pt">
-					<xsl:value-of select="$sectionNum_"/><xsl:number format=".1 " level="multiple" count="iho:clause" />
-				</fo:block>
-			</xsl:if> -->
-			<xsl:apply-templates>
-				<xsl:with-param name="sectionNum" select="$sectionNum_"/>
-			</xsl:apply-templates>
-		</fo:block>
+	<xsl:template match="node()">
+		<xsl:apply-templates/>
 	</xsl:template>
+	<!-- ====== -->
+	<!-- title      -->
+	<!-- ====== -->
-	<!-- Foreword, Introduction -->
-	<xsl:template match="iho:iho-standard/iho:preface/*">
-		<fo:block break-after="page"/>
-		<xsl:apply-templates/>
+	<xsl:template match="iho:annex/iho:title">
+		<fo:block font-size="13pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
-	<xsl:template match="iho:clause//iho:clause[not(iho:title)]">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="section">
-			<xsl:call-template name="getSection">
-				<xsl:with-param name="sectionNum" select="$sectionNum"/>
-			</xsl:call-template>
-		</xsl:variable>
-		<fo:block margin-top="3pt"><!-- margin-bottom="6pt" -->
-			<fo:inline font-weight="bold" padding-right="3mm">
-				<xsl:value-of select="$section"/><!-- <xsl:number format=".1 "  level="multiple" count="iho:clause/iho:clause" /> -->
-			</fo:inline>
-			<xsl:apply-templates>
-				<xsl:with-param name="sectionNum" select="$sectionNum"/>
-				<xsl:with-param name="inline" select="'true'"/>
-			</xsl:apply-templates>
+	<xsl:template match="iho:bibliography/iho:references[not(@normative='true')]/iho:title">
+		<fo:block font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always">
+			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
 	<xsl:template match="iho:title">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="parent-name" select="local-name(..)"/>
-		<xsl:variable name="references_num_current">
-			<xsl:number level="any" count="iho:references"/>
-		</xsl:variable>
-		<xsl:variable name="id">
-			<xsl:call-template name="getId"/>
-		</xsl:variable>
 		<xsl:variable name="level">
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
-		<xsl:variable name="section">
-			<xsl:call-template name="getSection">
-				<xsl:with-param name="sectionNum" select="$sectionNum"/>
-			</xsl:call-template>
-		</xsl:variable>
 		<xsl:variable name="font-size">
 			<xsl:choose>
 				<xsl:when test="$level = 1">13pt</xsl:when>
 				<xsl:when test="$level = 2">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 3">11pt</xsl:when>
-				<!-- <xsl:when test="ancestor::iho:annex and $level = 2">13pt</xsl:when>
-				<xsl:when test="ancestor::iho:annex and $level = 3">12pt</xsl:when>
-				<xsl:when test="ancestor::iho:preface">16pt</xsl:when>
-				<xsl:when test="$level = 2">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 3">11pt</xsl:when> -->
+				<xsl:when test="$level &gt;= 3">11pt</xsl:when>
 				<xsl:otherwise>12pt</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -679,75 +477,37 @@
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:choose>
-			<xsl:when test="$parent-name = 'annex'">
-				<fo:block id="{$id}" font-size="13pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always">
-					<xsl:value-of select="$section"/>
-					<xsl:value-of select="$linebreak"/>
-					<!-- <xsl:if test=" ../@obligation">
-						<xsl:value-of select="$linebreak"/>
-						<fo:inline font-weight="normal">(<xsl:value-of select="../@obligation"/>)</fo:inline>
-					</xsl:if> -->
-					<xsl:apply-templates/>
-				</fo:block>
-			</xsl:when>
-			<xsl:when test="$parent-name = 'references' and $references_num_current != 1"> <!-- Bibliography -->
-				<fo:block id="{$id}" font-size="16pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="36pt" keep-with-next="always">
-					<xsl:apply-templates/>
-				</fo:block>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:element name="{$element-name}">
-					<xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
-					<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-					<!-- <xsl:attribute name="font-weight">bold</xsl:attribute> -->
-					<xsl:attribute name="space-before"> <!-- margin-top -->
-						<xsl:choose>
-							<xsl:when test="$level = 1">13.5pt</xsl:when>
-							<xsl:when test="$level &gt;= 2">3pt</xsl:when>
-							<xsl:when test="ancestor::iho:preface">8pt</xsl:when>
-							<xsl:when test="$level = 2 and ancestor::iho:annex">18pt</xsl:when>
-							<xsl:when test="$level = 1">18pt</xsl:when>
-							<xsl:when test="$level = ''">6pt</xsl:when><!-- 13.5pt -->
-							<xsl:otherwise>12pt</xsl:otherwise>
-						</xsl:choose>
-					</xsl:attribute>
-					<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-					<xsl:attribute name="keep-with-next">always</xsl:attribute>
-						<!-- DEBUG level=<xsl:value-of select="$level"/>x -->
-						<!-- section=<xsl:value-of select="$sectionNum"/> -->
-						<!-- <xsl:if test="$sectionNum"> -->
-						<xsl:value-of select="$section"/>
-						<xsl:if test="$section != ''">
-							<xsl:choose>
-								<xsl:when test="$level = 2">
-									<fo:inline padding-right="2mm"> </fo:inline>
-								</xsl:when>
-								<xsl:when test="$level = 3">
-									<fo:inline padding-right="2mm"> </fo:inline>
-								</xsl:when>
-								<xsl:otherwise>
-									<fo:inline padding-right="3mm"> </fo:inline>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:if>
-						<xsl:apply-templates/>
-				</xsl:element>
+		<xsl:element name="{$element-name}">
+			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
+			<xsl:attribute name="space-before">
+				<xsl:choose>
+					<xsl:when test="$level = 1">13.5pt</xsl:when>
+					<xsl:when test="$level &gt;= 2">3pt</xsl:when>
+					<xsl:when test="ancestor::iho:preface">8pt</xsl:when>
+					<xsl:when test="$level = 2 and ancestor::iho:annex">18pt</xsl:when>
+					<xsl:when test="$level = 1">18pt</xsl:when>
+					<xsl:when test="$level = ''">6pt</xsl:when><!-- 13.5pt -->
+					<xsl:otherwise>12pt</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-				<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iho:p)">
-					<fo:block> <!-- margin-bottom="12pt" -->
-						<xsl:value-of select="$linebreak"/>
-					</fo:block>
-				</xsl:if>
-			</xsl:otherwise>
-		</xsl:choose>
+			<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:apply-templates/>
+		</xsl:element>
+		<xsl:if test="$element-name = 'fo:inline' and not(following-sibling::iho:p)">
+			<fo:block> <!-- margin-bottom="12pt" -->
+				<xsl:value-of select="$linebreak"/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template>
+	<!-- ====== -->
+	<!-- ====== -->
 	<xsl:template match="iho:p">
 		<xsl:param name="inline" select="'false'"/>
@@ -808,7 +568,7 @@
 	<xsl:variable name="p_fn">
 		<!-- <xsl:for-each select="//iho:p/iho:fn[generate-id(.)=generate-id(key('kfn',@reference)[1])]"> -->
-		<xsl:for-each select="//iho:fn[local-name(..) = 'p' or local-name(..) = 'title'][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
+		<xsl:for-each select="//iho:fn[local-name(..) = 'p' or ancestor::*[local-name() = 'title']][generate-id(.)=generate-id(key('kfn',@reference)[1])]">
 			<!-- copy unique fn -->
 			<fn gen_id="{generate-id(.)}">
 				<xsl:copy-of select="@*"/>
@@ -818,7 +578,7 @@
 	</xsl:variable>
 	<!-- iho:p/iho:fn -->
-	<xsl:template match="iho:fn[local-name(..) = 'p' or local-name(..) = 'title']" priority="2">
+	<xsl:template match="iho:fn[local-name(..) = 'p' or ancestor::*[local-name() = 'title']]" priority="2">
 		<xsl:variable name="gen_id" select="generate-id(.)"/>
 		<xsl:variable name="reference" select="@reference"/>
 		<xsl:variable name="number">
@@ -831,13 +591,13 @@
 					<fo:inline font-size="70%" keep-with-previous.within-line="always" vertical-align="super"> <!--  -->
 						<fo:basic-link internal-destination="footnote_{@reference}_{$number}" fox:alt-text="footnote {@reference} {$number}">
 							<!-- <xsl:value-of select="@reference"/> -->
-							<xsl:value-of select="$number + count(//iho:bibitem[ancestor::iho:references[@id='_normative_references']]/iho:note)"/>
+							<xsl:value-of select="$number + count(//iho:bibitem[ancestor::iho:references[@normative='true']]/iho:note)"/>
 						</fo:basic-link>
 					</fo:inline>
 					<fo:footnote-body>
 						<fo:block font-size="10pt" margin-bottom="12pt">
 							<fo:inline id="footnote_{@reference}_{$number}" font-size="60%" vertical-align="super" keep-with-next.within-line="always" padding-right="1mm"> <!-- font-size="60%"  alignment-baseline="hanging" -->
-								<xsl:value-of select="$number + count(//iho:bibitem[ancestor::iho:references[@id='_normative_references']]/iho:note)"/>
+								<xsl:value-of select="$number + count(//iho:bibitem[ancestor::iho:references[@normative='true']]/iho:note)"/>
 							</fo:inline>
 							<xsl:for-each select="iho:p">
 									<xsl:apply-templates/>
@@ -860,122 +620,34 @@
 		<xsl:apply-templates/>
 	</xsl:template>
-	<xsl:template match="iho:figure">
-		<fo:block-container id="{@id}">
-			<fo:block>
-				<xsl:apply-templates/>
-			</fo:block>
-			<xsl:call-template name="fn_display_figure"/>
-			<xsl:for-each select="iho:note//iho:p">
-				<xsl:call-template name="note"/>
-			</xsl:for-each>
-			<fo:block font-size="11pt" font-weight="bold" text-align="center" margin-top="6pt" margin-bottom="6pt" keep-with-previous="always">
-				<xsl:call-template name="getFigureNumber"/>
-				<xsl:if test="iho:name">
-					<xsl:if test="not(local-name(..) = 'figure') and not(ancestor::iho:example)">
-						<xsl:text> — </xsl:text>
-					</xsl:if>
-					<xsl:apply-templates select="iho:name" mode="figure_name"/>
-				</xsl:if>
-			</fo:block>
-		</fo:block-container>
-	</xsl:template>
-	<xsl:template match="iho:figure/iho:name" mode="figure_name">
-		<xsl:apply-templates/>
+	<xsl:template match="iho:ul | iho:ol" mode="ul_ol">
+		<fo:list-block provisional-distance-between-starts="6mm">
+			<xsl:apply-templates/>
+		</fo:list-block>
+		<xsl:for-each select="./iho:note">
+			<xsl:call-template name="note"/>
+		</xsl:for-each>
 	</xsl:template>
-	<xsl:template match="iho:figure/iho:name"/>
-	<xsl:template match="iho:figure/iho:fn" priority="2"/>
-	<xsl:template match="iho:figure/iho:note"/>
-	<xsl:template match="iho:image">
-		<fo:block text-align="center">
-			<xsl:variable name="src">
-				<xsl:choose>
-					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
-						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="@src"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:variable>
-			<fo:external-graphic src="{$src}" width="100%" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>  <!-- src="{@src}" -->
+	<xsl:template match="iho:ul//iho:note |  iho:ol//iho:note" priority="2"/>
+	<xsl:template match="iho:ul//iho:note  | iho:ol//iho:note" mode="process">
+		<fo:block id="{@id}">
+			<xsl:apply-templates select="iho:name" mode="presentation"/>
+			<xsl:apply-templates mode="process"/>
 		</fo:block>
 	</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="ancestor::iho:annex">
-				<xsl:choose>
-					<xsl:when test="local-name(..) = 'figure'">
-						<xsl:number format="a) "/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="$title-figure"/>
-						<xsl:variable name="annex_id" select="ancestor::iho:annex[1]/@id"/>
-						<xsl:choose>
-							<xsl:when test="ancestor::iho:annex/@obligation = 'informative'">
-								<xsl:number format="1." count="iho:annex[@obligation = 'informative']"/>
-								<xsl:number format="1" level="any" count="iho:figure[ancestor::iho:annex[@id = $annex_id]]"/>
-								<!-- <xsl:number format="1.1" level="multiple" count="iho:annex[@obligation = 'informative'] | iho:figure"/>								 -->
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:number format="A." level="any" count="iho:annex[not(@obligation = 'informative')]"/>
-								<xsl:number format="1" level="any" count="iho:figure[ancestor::iho:annex[@id = $annex_id]]"/>
-								<!-- <xsl:number format="A.1" level="multiple" count="iho:annex[not(@obligation = 'informative')] | iho:figure"/>								 -->
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:otherwise>
-				</xsl:choose>
-			</xsl:when>
-			<xsl:when test="ancestor::iho:example"/>
-			<xsl:otherwise>
-				<xsl:value-of select="$title-figure"/><xsl:number format="1" level="any" count="iho:figure"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-	<xsl:template match="iho:note/iho:p" name="note">
-		<fo:block font-size="11pt" margin-top="8pt" margin-bottom="12pt" text-align="justify">
-			<xsl:if test="ancestor::iho:td">
-				<xsl:attribute name="font-size">12pt</xsl:attribute>
-			</xsl:if>
-			<xsl:variable name="claims_id" select="ancestor::iho:clause[1]/@id"/>
-			<fo:inline font-size="11pt" padding-right="2mm">
-				<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::iho:clause[1]//iho:note) &gt; 1">
-					<xsl:number count="iho:note[ancestor::iho:clause[@id = $claims_id]]" level="any"/>
-				</xsl:if>
-			</fo:inline>
+	<xsl:template match="iho:ul//iho:note/iho:name  | iho:ol//iho:note/iho:name" mode="process" priority="2"/>
+	<xsl:template match="iho:ul//iho:note/iho:p  | iho:ol//iho:note/iho:p" mode="process" priority="2">
+		<fo:block font-size="11pt" margin-top="4pt">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="iho:ul | iho:ol">
-		<fo:list-block provisional-distance-between-starts="6mm">
-			<xsl:apply-templates/>
-		</fo:list-block>
-		<xsl:for-each select="./iho:note//iho:p">
-			<xsl:call-template name="note"/>
-		</xsl:for-each>
+	<xsl:template match="iho:ul//iho:note/* | iho:ol//iho:note/*" mode="process">
+		<xsl:apply-templates select="."/>
 	</xsl:template>
-	<xsl:template match="iho:ul//iho:note |  iho:ol//iho:note"/>
 	<xsl:template match="iho:li">
 		<fo:list-item id="{@id}" margin-bottom="12pt">
@@ -985,8 +657,10 @@
 				</fo:block>
 			</fo:list-item-label>
 			<fo:list-item-body start-indent="body-start()">
-				<xsl:apply-templates/>
-				<xsl:apply-templates select=".//iho:note" mode="process"/>
+				<fo:block>
+					<xsl:apply-templates/>
+					<xsl:apply-templates select=".//iho:note" mode="process"/>
+				</fo:block>
 			</fo:list-item-body>
 		</fo:list-item>
 	</xsl:template>
@@ -1002,27 +676,7 @@
 		</xsl:choose>
 	</xsl:template>
-	<xsl:template match="iho:termsource">
-		<fo:block margin-bottom="12pt">
-			<!-- Example:[SOURCE: [3]] -->
-			<fo:basic-link internal-destination="{iho:origin/@bibitemid}" fox:alt-text="{iho:origin/@citeas}">
-				<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>
-				<fo:inline color="blue" text-decoration="underline"><xsl:value-of select="iho:origin/@citeas"/></fo:inline>
-				<xsl:apply-templates select="iho:origin/iho:localityStack"/>
-			</fo:basic-link>
-			<xsl:apply-templates select="iho:modification"/>
-			<xsl:text>]</xsl:text>
-		</fo:block>
-	</xsl:template>
 	<xsl:template match="iho:admonition">
 		<fo:block-container border="0.5pt solid rgb(79, 129, 189)" color="rgb(79, 129, 189)" margin-left="16mm" margin-right="16mm" margin-bottom="12pt">
@@ -1037,130 +691,28 @@
 		</fo:block-container>
 	</xsl:template>
-	<xsl:template match="iho:formula">
-		<fo:block id="{@id}">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="iho:formula/iho:dt/iho:stem">
-		<fo:inline>
-			<xsl:apply-templates/>
-		</fo:inline>
-	</xsl:template>
 	<xsl:template match="iho:formula/iho:stem">
 		<fo:block margin-top="6pt" margin-bottom="12pt" text-align="center">
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="iho:quote">
-		<fo:block margin-left="12.5mm" margin-right="14mm">
-			<xsl:apply-templates select=".//iho:p"/>
-		</fo:block>
-		<xsl:if test="iho:author or iho:source">
-			<fo:block text-align="right">
-				<xsl:if test="iho:author">
-					<!-- — ISO, ISO 7301:2011, Clause 1 -->
-					<xsl:text>— </xsl:text><xsl:value-of select="iho:author"/>
-				</xsl:if>
-				<xsl:if test="iho:source">
-					<xsl:text>, </xsl:text>
-					<xsl:apply-templates select="iho:source"/>
-				</xsl:if>
-			</fo:block>
-		</xsl:if>
-	</xsl:template>
-	<xsl:template match="iho:source">
-		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:value-of select="@citeas"/> <!--  disable-output-escaping="yes" -->
-			<xsl:apply-templates select="iho:localityStack"/>
-		</fo:basic-link>
-	</xsl:template>
-	<xsl:template match="iho:xref">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="target" select="normalize-space(@target)"/>
-		<fo:basic-link internal-destination="{$target}" fox:alt-text="{$target}">
-			<xsl:variable name="section" select="xalan:nodeset($contents)//item[@id = $target]/@section"/>
-			<!-- <xsl:if test="not(starts-with($section, 'Figure') or starts-with($section, 'Table'))"> -->
-				<xsl:attribute name="color">blue</xsl:attribute>
-				<xsl:attribute name="text-decoration">underline</xsl:attribute>
-			<!-- </xsl:if> -->
-			<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:choose>
-				<xsl:when test="$type = 'clause' and $root != 'annex' and $level = 1 and normalize-space(.) = ''"><!--     and not (ancestor::annex) -->
-					<xsl:variable name="title-clause">
-						<xsl:call-template name="getTitle">
-							<xsl:with-param name="name" select="'title-clause'"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<xsl:value-of select="$title-clause"/>
-				</xsl:when>
-				<xsl:when test="$type = 'li'">
-					<xsl:attribute name="color">black</xsl:attribute>
-					<xsl:attribute name="text-decoration">none</xsl:attribute>
-					<xsl:variable name="parent_section" select="xalan:nodeset($contents)//item[@id =$target]/@parent_section"/>
-					<xsl:variable name="currentSection">
-						<xsl:call-template name="getSection"/>
-					</xsl:variable>
-					<xsl:if test="not(contains($parent_section, $currentSection))">
-						<fo:basic-link internal-destination="{$target}" fox:alt-text="{$target}">
-							<xsl:attribute name="color">blue</xsl:attribute>
-							<xsl:attribute name="text-decoration">underline</xsl:attribute>
-							<xsl:value-of select="$parent_section"/><xsl:text> </xsl:text>
-						</fo:basic-link>
-					</xsl:if>
-				</xsl:when>
-				<xsl:otherwise/> <!-- <xsl:value-of select="$type"/> -->
-			</xsl:choose>
-			<xsl:choose>
-				<xsl:when test="normalize-space(.) != ''">
-					<xsl:apply-templates/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$section"/>
-				</xsl:otherwise>
-			</xsl:choose>
-      </fo:basic-link>
-	</xsl:template>
-	<xsl:template match="iho:annex">
-		<fo:block break-after="page"/>
-		<xsl:if test="not(iho:title)">
-			<fo:block id="{@id}" font-size="13pt" font-weight="bold" text-align="center" margin-bottom="12pt" keep-with-next="always">
-				<xsl:choose>
-					<xsl:when test="@obligation = 'informative'">
-						<xsl:variable name="title-appendix">
-							<xsl:call-template name="getTitle">
-								<xsl:with-param name="name" select="'title-appendix'"/>
-							</xsl:call-template>
-						</xsl:variable>
-						<xsl:value-of select="$title-appendix"/>
-						<xsl:number format="1" level="any" count="iho:annex[@obligation = 'informative']"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<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:number format="A" level="any" count="iho:annex[not(@obligation = 'informative')]"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</fo:block>
-		</xsl:if>
-		<xsl:apply-templates/>
+	<xsl:template match="iho:references"><!-- [position() &gt; 1] -->
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
-	<!-- Example: [1]	IHO S-100, Universal Hydrographic Data Model v4.0.0, December 2018 (Encoding, Feature Catalogue) -->
+	<!-- IHO documents:
+			"[1] S57 edition 3.1: IHO Transfer Standard for Digital Hydrographic Data, International Hydrographic Organization (www.iho.int)”
+			[{number}] {docID} edition {edition}: {title}, {author/organization}
+			Non-IHO documents:
+			Provide title and publisher -->
 	<xsl:template match="iho:bibitem">
 		<fo:list-block margin-bottom="12pt" provisional-distance-between-starts="12mm" line-height="115%">
 			<fo:list-item>
@@ -1173,39 +725,35 @@
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:variable name="docidentifier">
-							<xsl:if test="iho:docidentifier">
-								<xsl:choose>
-									<xsl:when test="iho:docidentifier/@type = 'metanorma'"/>
-									<xsl:otherwise><xsl:value-of select="iho:docidentifier"/></xsl:otherwise>
-								</xsl:choose>
-							</xsl:if>
-						</xsl:variable>
-						<xsl:value-of select="$docidentifier"/>
-						<xsl:apply-templates select="iho:note"/>
-						<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
-						<xsl:choose>
-							<xsl:when test="iho:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="iho:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="iho:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:apply-templates select="iho:formattedref"/>
+						<xsl:call-template name="processBibitem"/>
 					</fo:block>
 				</fo:list-item-body>
 			</fo:list-item>
 		</fo:list-block>
 	</xsl:template>
+	<xsl:template match="iho:bibitem/iho:edition">
+		<xsl:text> edition </xsl:text>
+		<xsl:value-of select="."/>
+	</xsl:template>
 	<xsl:template match="iho:bibitem/iho:title">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
-	<xsl:template match="iho:bibitem/iho:note">
+	<xsl:template match="iho:bibitem/iho:uri">
+		<xsl:text> (</xsl:text>
+		<fo:inline xsl:use-attribute-sets="link-style">
+			<fo:basic-link external-destination="." fox:alt-text=".">
+				<xsl:value-of select="."/>
+			</fo:basic-link>
+		</fo:inline>
+		<xsl:text>)</xsl:text>
+	</xsl:template>
+	<xsl:template match="iho:bibitem/iho:note" priority="2">
 		<fo:footnote>
 			<xsl:variable name="number">
 				<xsl:number level="any" count="iho:bibitem/iho:note"/>
@@ -1226,38 +774,10 @@
 		</fo:footnote>
 	</xsl:template>
-	<xsl:template match="iho:example">
-		<fo:block font-size="11pt" margin-top="8pt" margin-bottom="12pt">
-			<xsl:variable name="claims_id" select="ancestor::iho:clause[1]/@id"/>
-			<fo:block margin-bottom="12pt" font-weight="bold">
-				<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:choose>
-						<xsl:when test="iho:name">
-							<xsl:text>— </xsl:text><xsl:apply-templates select="iho:name" mode="example"/>
-						</xsl:when>
-						<!-- <xsl:when test="count(ancestor::iho:clause[1]//iho:example) &gt; 1">
-							<xsl:number count="iho:example[ancestor::iho:clause[@id = $claims_id]]" level="any"/>
-						</xsl:when> -->
-					</xsl:choose>
-				</fo:inline>
-			</fo:block>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="iho:example/iho:name"/>
-	<xsl:template match="iho:example/iho:name" mode="example">
-		<fo:inline><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-	<xsl:template match="iho:example/iho:p">
-			<fo:block-container font-size="11pt" margin-left="12.7mm">
+	<xsl:template match="iho:example/iho:p" priority="2">
+			<fo:block-container xsl:use-attribute-sets="example-p-style">
 				<fo:block-container margin-left="0mm">
 					<fo:block>
 						<xsl:apply-templates/>
@@ -1266,32 +786,7 @@
 			</fo:block-container>
 	</xsl:template>
-	<!-- <eref type="inline" bibitemid="iso-19115-1" citeas="ISO 19115-1:2014/Amd 1">...<localityStack><locality type="clause"><referenceFrom>113-01-12</referenceFrom></locality></localityStack></eref> -->
-	<xsl:template match="iho:eref">
-		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}"> <!-- font-size="9pt" color="blue" vertical-align="super" -->
-			<xsl:if test="@type = 'footnote'">
-				<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
-				<xsl:attribute name="font-size">80%</xsl:attribute>
-				<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-				<xsl:attribute name="vertical-align">super</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="@type = 'inline'">
-				<xsl:attribute name="color">blue</xsl:attribute>
-				<xsl:attribute name="text-decoration">underline</xsl:attribute>
-			</xsl:if>
-			<xsl:choose>
-				<xsl:when test="@citeas and normalize-space(text()) = ''">
-					<xsl:value-of select="@citeas"/> <!--  disable-output-escaping="yes" -->
-				</xsl:when>
-				<xsl:when test="@bibitemid and normalize-space(text()) = ''">
-					<xsl:value-of select="//iho:bibitem[@id = current()/@bibitemid]/iho:docidentifier"/>
-				</xsl:when>
-				<xsl:otherwise/>
-			</xsl:choose>
-			<xsl:apply-templates select="iho:localityStack"/>
-			<xsl:apply-templates select="text()"/>
-		</fo:basic-link>
-	</xsl:template>
 	<xsl:template match="iho:pagebreak">
 		<xsl:copy-of select="."/>
@@ -1300,30 +795,12 @@
 	<!-- https://github.com/metanorma/mn-native-pdf/issues/214 -->
 	<xsl:template match="iho:index"/>
-	<xsl:template match="iho:review"/>
-	<xsl:template match="iho:term">
-		<xsl:param name="sectionNum"/>
-		<fo:block id="{@id}" margin-bottom="10pt">
-			<xsl:apply-templates>
-				<xsl:with-param name="sectionNum" select="$sectionNum"/>
-			</xsl:apply-templates>
-		</fo:block>
-	</xsl:template>
 	<xsl:template match="iho:preferred">
-		<xsl:param name="sectionNum"/>
 		<fo:block line-height="1.1">
 			<fo:block font-weight="bold" keep-with-next="always">
-				<fo:inline>
-					<xsl:variable name="section">
-						<xsl:call-template name="getSection">
-							<xsl:with-param name="sectionNum" select="$sectionNum"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<xsl:value-of select="$section"/>
-					<!-- <xsl:value-of select="$sectionNum"/>.<xsl:number count="iho:term"/> -->
-				</fo:inline>
+				<xsl:apply-templates select="ancestor::iho:term/iho:name" mode="presentation"/>
 			</fo:block>
 			<fo:block font-weight="bold" keep-with-next="always">
 				<xsl:apply-templates/>
@@ -1331,122 +808,9 @@
 		</fo:block>
 	</xsl:template>
-	<xsl:template match="iho:admitted">
-		<fo:block>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="iho:deprecates">
-		<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="iho:definition[preceding-sibling::iho:domain]">
-		<xsl:apply-templates/>
-	</xsl:template>
-	<xsl:template match="iho:definition[preceding-sibling::iho:domain]/iho:p">
-		<fo:inline> <xsl:apply-templates/></fo:inline>
-		<fo:block> </fo:block>
-	</xsl:template>
-	<xsl:template match="iho:definition">
-		<fo:block margin-bottom="6pt">
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="iho:termexample">
-		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt" text-align="justify">
-			<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::iho:term[1]//iho:termexample) &gt; 1">
-					<xsl:number/>
-				</xsl:if>
-			</fo:inline>
-			<xsl:apply-templates/>
-		</fo:block>
-	</xsl:template>
-	<xsl:template match="iho:termexample/iho:p">
-		<fo:inline><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-	<xsl:template match="iho:domain">
-		<fo:inline>&lt;<xsl:apply-templates/>&gt;</fo:inline><xsl:text> </xsl:text>
-	</xsl:template>
-	<xsl:template match="iho:termnote">
-		<fo:block font-size="10pt" margin-top="8pt" margin-bottom="8pt" text-align="justify">
-			<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>
-	<xsl:template match="iho:termnote/iho:p">
-		<fo:inline><xsl:apply-templates/></fo:inline>
-		<!-- <xsl:if test="following-sibling::* and not(following-sibling::iho:p)">
-			<xsl:value-of select="$linebreak"/>
-			<xsl:value-of select="$linebreak"/>
-		</xsl:if> -->
-	</xsl:template>
-	<xsl:template match="iho:modification/iho:p">
-		<fo:inline><xsl:apply-templates/></fo:inline>
-	</xsl:template>
-	<xsl:template match="iho: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-appendix">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-appendix'"/>
-			</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::iho:termsource"/>
-			<xsl:when test="@type ='clause' and ancestor::iho:eref"/>
-			<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 ='appendix'"><xsl:value-of select="$title-appendix"/></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="iho:referenceFrom"/>
-	</xsl:template>
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="font-weight" select="'bold'"/>
 		<fo:static-content flow-name="header-odd">
@@ -1491,127 +855,6 @@
 		</fo:static-content>
 	</xsl:template>
-	<xsl:template name="getSection">
-		<xsl:param name="sectionNum"/>
-		<xsl:variable name="level">
-			<xsl:call-template name="getLevel"/>
-		</xsl:variable>
-		<xsl:variable name="section">
-			<xsl:choose>
-				<xsl:when test="ancestor::iho:bibliography">
-					<xsl:value-of select="$sectionNum"/>
-				</xsl:when>
-				<xsl:when test="ancestor::iho:sections">
-					<!-- 1, 2, 3, 4, ... from main section (not annex, bibliography, ...) -->
-					<xsl:choose>
-						<xsl:when test="$level = 1">
-							<xsl:value-of select="$sectionNum"/><xsl:text>.</xsl:text>
-						</xsl:when>
-						<xsl:when test="$level &gt;= 2">
-							<xsl:variable name="num">
-								<xsl:call-template name="getSubSection"/>
-							</xsl:variable>
-							<xsl:value-of select="concat($sectionNum, $num)"/><xsl:text>.</xsl:text>
-						</xsl:when>
-						<xsl:otherwise>
-							<!-- z<xsl:value-of select="$sectionNum"/>z -->
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				<!-- <xsl:when test="ancestor::iho:annex[@obligation = 'informative']">
-					<xsl:choose>
-						<xsl:when test="$level = 1">
-							<xsl:text>Annex  </xsl:text>
-							<xsl:number format="I" level="any" count="iho:annex[@obligation = 'informative']"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:number format="I.1" level="multiple" count="iho:annex[@obligation = 'informative'] | iho:clause"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when> -->
-				<xsl:when test="ancestor::iho:annex">
-					<xsl:variable name="annexid" select="normalize-space(/iho:iho-standard/iho:bibdata/iho:ext/iho:structuredidentifier/iho:annexid)"/>
-					<xsl:choose>
-						<xsl:when test="$level = 1">
-							<xsl:choose>
-								<xsl:when test="ancestor::iho:annex/@obligation = 'informative'">
-									<xsl:variable name="title-appendix">
-										<xsl:call-template name="getTitle">
-											<xsl:with-param name="name" select="'title-appendix'"/>
-										</xsl:call-template>
-									</xsl:variable>
-									<xsl:value-of select="$title-appendix"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<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:otherwise>
-							</xsl:choose>
-							<xsl:choose>
-								<xsl:when test="count(//iho:annex) = 1 and $annexid != ''">
-									<xsl:value-of select="$annexid"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:choose>
-										<xsl:when test="ancestor::iho:annex/@obligation = 'informative'">
-											<xsl:number format="1" level="any" count="iho:annex[@obligation = 'informative']"/>
-										</xsl:when>
-										<xsl:otherwise>
-											<xsl:number format="A" level="any" count="iho:annex[not(@obligation = 'informative')]"/>
-											<!-- <xsl:number format="A" level="any" count="iho:annex"/> -->
-										</xsl:otherwise>
-									</xsl:choose>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:when>
-						<xsl:otherwise>
-							<xsl:choose>
-								<xsl:when test="count(//iho:annex) = 1 and $annexid != ''">
-									<xsl:value-of select="$annexid"/><xsl:number format=".1" level="multiple" count="iho:clause"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:choose>
-										<xsl:when test="ancestor::iho:annex/@obligation = 'informative'">
-											<xsl:number format="1.1." level="multiple" count="iho:annex[@obligation = 'informative'] | iho:clause"/>
-										</xsl:when>
-										<xsl:otherwise>
-											<xsl:number format="A.1." level="multiple" count="iho:annex[not(@obligation = 'informative')] | iho:clause"/>
-											<!-- <xsl:number format="A.1." level="multiple" count="iho:annex | iho:clause"/> -->
-										</xsl:otherwise>
-									</xsl:choose>
-								</xsl:otherwise>
-							</xsl:choose>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:when>
-				 <!-- if preface and there is clause(s) -->
-				<!-- <xsl:when test="ancestor::iho:preface">
-					<xsl:choose>
-						<xsl:when test="$level = 1 and  ..//iho:clause">0</xsl:when>
-						<xsl:when test="$level &gt;= 2">
-							<xsl:variable name="num">
-								<xsl:number format=".1" level="multiple" count="iho:clause"/>
-							</xsl:variable>
-							<xsl:value-of select="concat('0', $num)"/>
-						</xsl:when>
-						<xsl:otherwise></xsl:otherwise>
-					</xsl:choose>
-				</xsl:when> -->
-				<xsl:otherwise>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:value-of select="$section"/>
-	</xsl:template>
 	<xsl:template name="getListItemFormat">
 		<xsl:choose>
@@ -1709,46 +952,6 @@
 	</xsl:variable>
 <xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
-		<title-table lang="en">Table </title-table>
-		<title-table lang="fr">Tableau </title-table>
-			<title-table lang="zh">Table </title-table>
-		<title-note lang="en">NOTE </title-note>
-		<title-note lang="fr">NOTE </title-note>
-			<title-note lang="zh">NOTE </title-note>
-		<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>
@@ -1756,17 +959,7 @@
 			<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>
@@ -1774,9 +967,13 @@
 		</title-edition>
-		<title-formula lang="en">Formula </title-formula>
-		<title-formula lang="fr">Formula </title-formula>
+		<title-edition lang="fr">
+				<xsl:text>Édition </xsl:text>
+		</title-edition>
 		<title-toc lang="en">
 				<xsl:text>Contents</xsl:text>
@@ -1811,13 +1008,6 @@
 		</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>
@@ -1825,20 +1015,23 @@
-		<title-source lang="en">SOURCE</title-source>
+		<title-source lang="en">
+				<xsl:text>SOURCE</xsl:text>
+		</title-source>
 		<title-keywords lang="en">Keywords</title-keywords>
 		<title-deprecated lang="en">DEPRECATED</title-deprecated>
 		<title-deprecated lang="fr">DEPRECATED</title-deprecated>
-		<title-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-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -1848,8 +1041,6 @@
 		<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>
@@ -1872,7 +1063,11 @@
 		<title-warning lang="zh">警告</title-warning>
 		<title-amendment lang="en">AMENDMENT</title-amendment>
-	</xsl:variable><xsl:template name="getTitle">
+		<title-continued lang="en">(continued)</title-continued>
+		<title-continued lang="fr">(continué)</title-continued>
+	</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
 		<xsl:param name="name"/>
 		<xsl:variable name="lang">
 			<xsl:call-template name="getLang"/>
@@ -1886,13 +1081,18 @@
 				<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:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
+	</xsl:attribute-set><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="white-space">pre</xsl:attribute>
+		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
@@ -1901,162 +1101,462 @@
-			<xsl:attribute name="font-family">SFMono-Regular</xsl:attribute>
-			<xsl:attribute name="font-size">10pt</xsl:attribute>
+			<xsl:attribute name="font-family">SFMono-Regular</xsl:attribute>
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 			<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			<xsl:attribute name="line-height">113%</xsl:attribute>
-	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
+	</xsl:attribute-set><xsl:attribute-set name="permission-style">
+	</xsl:attribute-set><xsl:attribute-set name="permission-name-style">
+	</xsl:attribute-set><xsl:attribute-set name="permission-label-style">
-	</xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
+	</xsl:attribute-set><xsl:attribute-set name="requirement-style">
+	</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
+	</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
-	</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:attribute-set><xsl:attribute-set name="requirement-subject-style">
+	</xsl:attribute-set><xsl:attribute-set name="requirement-inherit-style">
+	</xsl:attribute-set><xsl:attribute-set name="recommendation-style">
-		<!-- <xsl:if test="$namespace = 'iso'">
-			<fo:block space-before="6pt">&#xA0;</fo:block>
-		</xsl:if> -->
-		<xsl:choose>
-			<xsl:when test="@unnumbered = 'true'"/>
-			<xsl:otherwise>
-					<fo:block font-weight="bold" text-align="center" margin-bottom="6pt" keep-with-next="always">
-							<xsl:attribute name="font-weight">normal</xsl:attribute>
-							<xsl:attribute name="font-size">11pt</xsl:attribute>
-						<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']">
-								<xsl:text> — </xsl:text>
-							<xsl:apply-templates select="*[local-name()='name']" mode="process"/>
-						</xsl:if>
-					</fo:block>
-					<xsl:call-template name="fn_name_display"/>
-			</xsl:otherwise>
-		</xsl:choose>
+	</xsl:attribute-set><xsl:attribute-set name="recommendation-name-style">
+	</xsl:attribute-set><xsl:attribute-set name="recommendation-label-style">
+	</xsl:attribute-set><xsl:attribute-set name="termexample-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 name="text-align">justify</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="example-style">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
+	</xsl:attribute-set><xsl:attribute-set name="example-name-style">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
-		<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
-		<!-- <xsl:variable name="cols-count">
-			<xsl:choose>
-				<xsl:when test="*[local-name()='thead']">
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable> -->
-		<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
-		<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
-		<xsl:variable name="colwidths">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-				<xsl:with-param name="table" select="$simple-table"/>
-			</xsl:call-template>
-		</xsl:variable>
-		<!-- <xsl:variable name="colwidths2">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-			</xsl:call-template>
-		</xsl:variable> -->
-		<!-- cols-count=<xsl:copy-of select="$cols-count"/>
-		colwidthsNew=<xsl:copy-of select="$colwidths"/>
-		colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
-		<xsl:variable name="margin-left">
-			<xsl:choose>
-				<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
-				<xsl:otherwise>0</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
-				<xsl:attribute name="space-after">18pt</xsl:attribute>
-				<xsl:attribute name="margin-left">0mm</xsl:attribute>
-				<xsl:attribute name="margin-right">0mm</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-set><xsl:attribute-set name="example-p-style">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="margin-left">12.7mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="termexample-name-style">
+			<xsl:attribute name="padding-right">5mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="font-weight">normal</xsl:attribute>
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
+	</xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
+	</xsl:attribute-set><xsl:attribute-set name="xref-style">
+			<xsl:attribute name="color">blue</xsl:attribute>
+			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="eref-style">
+	</xsl:attribute-set><xsl:attribute-set name="note-style">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+			<xsl:attribute name="text-align">justify</xsl:attribute>
+	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="padding-right">2mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
+			<xsl:attribute name="margin-top">8pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="termnote-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 name="text-align">justify</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
+	</xsl:attribute-set><xsl:attribute-set name="quote-style">
+			<xsl:attribute name="margin-left">12.5mm</xsl:attribute>
+			<xsl:attribute name="margin-right">14mm</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="quote-source-style">
+			<xsl:attribute name="text-align">right</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="termsource-style">
+			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="origin-style">
+			<xsl:attribute name="color">blue</xsl:attribute>
+			<xsl:attribute name="text-decoration">underline</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="term-style">
+			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="figure-name-style">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+			<xsl:attribute name="font-weight">bold</xsl:attribute>
+			<xsl:attribute name="text-align">center</xsl:attribute>
+			<xsl:attribute name="margin-top">6pt</xsl:attribute>
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+			<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="formula-style">
+	</xsl:attribute-set><xsl:attribute-set name="image-style">
+		<xsl:attribute name="text-align">center</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="figure-pseudocode-p-style">
+	</xsl:attribute-set><xsl:attribute-set name="image-graphic-style">
+			<xsl:attribute name="width">100%</xsl:attribute>
+			<xsl:attribute name="content-height">scale-to-fit</xsl:attribute>
+			<xsl:attribute name="scaling">uniform</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="tt-style">
+			<xsl:attribute name="font-family">Courier</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
+		<xsl:attribute name="font-size">11pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="text-align">center</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+	</xsl:attribute-set><xsl:attribute-set name="domain-style">
+	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
+	</xsl:attribute-set><xsl:attribute-set name="deprecates-style">
+	</xsl:attribute-set><xsl:attribute-set name="definition-style">
+			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+	</xsl:attribute-set><xsl:template name="processPrefaceSectionsDefault_Contents">
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
+	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>
+		<!-- Normative references  -->
+		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']" mode="contents"/>
+		<!-- Terms and definitions -->
+		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] |                       /*/*[local-name()='sections']/*[local-name()='definitions'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]" mode="contents"/>
+		<!-- Another main sections -->
+		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and                                                local-name() != 'definitions' and                                                not(@type='scope') and                                               not(local-name() = 'clause' and .//*[local-name()='terms']) and                                               not(local-name() = 'clause' and .//*[local-name()='definitions'])]" mode="contents"/>
+		<xsl:apply-templates select="/*/*[local-name()='annex']" mode="contents"/>
+		<!-- Bibliography -->
+		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]" mode="contents"/>
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
+		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
+	</xsl:template><xsl:template name="processMainSectionsDefault">
+		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
+		<!-- Normative references  -->
+		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']"/>
+		<!-- Terms and definitions -->
+		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='terms'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='terms']] |                       /*/*[local-name()='sections']/*[local-name()='definitions'] |                        /*/*[local-name()='sections']/*[local-name()='clause'][.//*[local-name()='definitions']]"/>
+		<!-- Another main sections -->
+		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name() != 'terms' and                                                local-name() != 'definitions' and                                                not(@type='scope') and                                               not(local-name() = 'clause' and .//*[local-name()='terms']) and                                               not(local-name() = 'clause' and .//*[local-name()='definitions'])]"/>
+		<xsl:apply-templates select="/*/*[local-name()='annex']"/>
+		<!-- Bibliography -->
+		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
+	</xsl:template><xsl:template 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:call-template name="getSimpleTable"/>
+		</xsl:variable>
+		<!-- $namespace = 'iso' or  -->
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:call-template name="fn_name_display"/>
+		<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
+		<!-- <xsl:variable name="cols-count">
+			<xsl:choose>
+				<xsl:when test="*[local-name()='thead']">
+					<xsl:call-template name="calculate-columns-numbers">
+						<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="calculate-columns-numbers">
+						<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
+					</xsl:call-template>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable> -->
+		<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
+		<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
+		<xsl:variable name="colwidths">
+			<xsl:call-template name="calculate-column-widths">
+				<xsl:with-param name="cols-count" select="$cols-count"/>
+				<xsl:with-param name="table" select="$simple-table"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<!-- <xsl:variable name="colwidths2">
+			<xsl:call-template name="calculate-column-widths">
+				<xsl:with-param name="cols-count" select="$cols-count"/>
+			</xsl:call-template>
+		</xsl:variable> -->
+		<!-- cols-count=<xsl:copy-of select="$cols-count"/>
+		colwidthsNew=<xsl:copy-of select="$colwidths"/>
+		colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
+		<xsl:variable name="margin-left">
+			<xsl:choose>
+				<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
+				<xsl:otherwise>0</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">
+				<xsl:attribute name="space-after">18pt</xsl:attribute>
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				<xsl:attribute name="margin-right">0mm</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="margin-left">0mm</xsl:attribute>
 					<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				<xsl:for-each select="xalan:nodeset($colwidths)//column">
 					<xsl:choose>
 						<xsl:when test=". = 1 or . = 0">
@@ -2081,32 +1581,16 @@
 		</fo:block-container>
-	</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:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:block xsl:use-attribute-sets="table-name-style">
-			</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:apply-templates/>
+			</fo:block>
+		</xsl:if>
 	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
 		<xsl:variable name="columns-count" select="count($table-row/*)"/>
@@ -2221,10 +1705,25 @@
 	</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>
 			<xsl:apply-templates/>
 		</fo:table-header>
+	</xsl:template><xsl:template name="table-header-title">
+		<xsl:param name="cols-count"/>
+		<!-- row for title -->
+		<fo:table-row>
+			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
+				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation"/>
+				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
+					<xsl:call-template name="fn_name_display"/>
+				</xsl:for-each>
+				<fo:block text-align="right" font-style="italic">
+					<xsl:text> </xsl:text>
+					<fo:retrieve-table-marker retrieve-class-name="table_continued"/>
+				</fo:block>
+			</fo:table-cell>
+		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">
 		<fo:table-body>
 			<xsl:apply-templates/>
@@ -2288,6 +1787,8 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:apply-templates select="../*[local-name()='thead']" mode="process">
 			<xsl:with-param name="cols-count" select="$cols-count"/>
 		</xsl:apply-templates>
@@ -2297,6 +1798,8 @@
 		</xsl:call-template>
 		<fo:table-body>
 			<xsl:apply-templates/>
 			<!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
@@ -2319,11 +1822,24 @@
 				</xsl:if>
 			<xsl:apply-templates/>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='th']">
 		<fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
+			<xsl:attribute name="text-align">
+				<xsl:choose>
+					<xsl:when test="@align">
+						<xsl:value-of select="@align"/>
+					</xsl:when>
+					<xsl:otherwise>center</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
@@ -2341,17 +1857,38 @@
 					<xsl:value-of select="@rowspan"/>
 				</xsl:attribute>
 			</xsl:if>
+			<xsl:call-template name="display-align"/>
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
+	</xsl:template><xsl:template name="display-align">
+		<xsl:if test="@valign">
+			<xsl:attribute name="display-align">
+				<xsl:choose>
+					<xsl:when test="@valign = 'top'">before</xsl:when>
+					<xsl:when test="@valign = 'middle'">center</xsl:when>
+					<xsl:when test="@valign = 'bottom'">after</xsl:when>
+					<xsl:otherwise>before</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='td']">
 		<fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
+			<xsl:attribute name="text-align">
+				<xsl:choose>
+					<xsl:when test="@align">
+						<xsl:value-of select="@align"/>
+					</xsl:when>
+					<xsl:otherwise>left</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
 			 <!--  and ancestor::*[local-name() = 'thead'] -->
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
@@ -2368,24 +1905,12 @@
 					<xsl:value-of select="@rowspan"/>
 				</xsl:attribute>
 			</xsl:if>
-			<fo:block>
+			<xsl:call-template name="display-align"/>
+			<fo:block>
 				<xsl:apply-templates/>
-			</fo:block>
-			<!-- <xsl:choose>
-				<xsl:when test="count(*) = 1 and *[local-name() = 'p']">
-					<xsl:apply-templates />
-				</xsl:when>
-				<xsl:otherwise>
-					<fo:block>
-						<xsl:apply-templates />
-					</fo:block>
-				</xsl:otherwise>
-			</xsl:choose> -->
+			</fo:block>
 		</fo:table-cell>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']" priority="2"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
 			<fo:block font-size="10pt" margin-bottom="12pt">
@@ -2398,29 +1923,18 @@
 				<fo:inline padding-right="2mm">
-						<xsl:attribute name="font-size">11pt</xsl:attribute>
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+						<xsl:attribute name="padding-right">3mm</xsl:attribute>
-					<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">
-							<xsl:number count="*[local-name()='note'][ancestor::*[@id = $id]]" level="any"/>
-						</xsl:if>
+					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 				</fo:inline>
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
-	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='name']" mode="process"/><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
@@ -2480,7 +1994,7 @@
 			 <!-- and (not(@class) or @class !='pseudocode') -->
 		</xsl:variable>
 		<xsl:variable name="references">
-			<xsl:for-each select=".//*[local-name()='fn']">
+			<xsl:for-each select=".//*[local-name()='fn'][not(parent::*[local-name()='name'])]">
 				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
 					<xsl:apply-templates/>
 				</fn>
@@ -2574,6 +2088,7 @@
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				<xsl:value-of select="@reference"/>
@@ -2584,119 +2099,133 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<xsl:variable name="parent" select="local-name(..)"/>
-		<xsl:variable name="key_iso">
-			 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
-		</xsl:variable>
-		<xsl:choose>
-			<xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">
+					<xsl:choose>
+						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</xsl:if>
+			<fo:block-container margin-left="0mm">
+				<xsl:variable name="parent" select="local-name(..)"/>
-					<fo:block margin-bottom="12pt" text-align="left">
-						<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"/>
-					</fo:block>
+				<xsl:variable name="key_iso">
+					 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
+				</xsl:variable>
-			</xsl:when>
-			<xsl:when test="$parent = 'formula'"> <!-- a few components -->
-				<fo:block margin-bottom="12pt" text-align="left">
-					<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" keep-with-next="always">
-					<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>
-		<!-- a few components -->
-		<xsl:if test="not($parent = 'formula' and count(*[local-name()='dt']) = 1)">
-			<fo:block>
-					<xsl:attribute name="margin-left">7mm</xsl:attribute>
+				<xsl:choose>
+					<xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
+							<fo:block margin-bottom="12pt" text-align="left">
+								<xsl: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"/>
+							</fo:block>
+					</xsl:when>
+					<xsl:when test="$parent = 'formula'"> <!-- a few components -->
+						<fo:block margin-bottom="12pt" text-align="left">
+							<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" keep-with-next="always">
+							<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>
-				<fo:block>
-						<xsl:attribute name="margin-left">-3.5mm</xsl:attribute>
-					<fo:table width="95%" table-layout="fixed">
+				<!-- a few components -->
+				<xsl:if test="not($parent = 'formula' and count(*[local-name()='dt']) = 1)">
+					<fo:block>
-						<xsl:choose>
-							<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
-								<!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
-							</xsl:when>
-							<xsl:when test="normalize-space($key_iso) = 'true'">
-								<xsl:attribute name="font-size">10pt</xsl:attribute>
+							<xsl:attribute name="margin-left">7mm</xsl:attribute>
+						<fo:block>
+								<xsl:attribute name="margin-left">-3.5mm</xsl:attribute>
+							<fo:table width="95%" table-layout="fixed">
-							</xsl:when>
-						</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)"/>
-							</xsl:apply-templates>
-						</fo:table-body>
-					</fo:table>
-				</fo:block>
-			</fo:block>
-		</xsl:if>
+								<xsl:choose>
+									<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
+										<!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
+									</xsl:when>
+									<xsl:when test="normalize-space($key_iso) = 'true'">
+										<xsl:attribute name="font-size">10pt</xsl:attribute>
+									</xsl:when>
+								</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)"/>
+									</xsl:apply-templates>
+								</fo:table-body>
+							</fo:table>
+						</fo:block>
+					</fo:block>
+				</xsl:if>
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>
 		<xsl:param name="maxlength_dt"/>
@@ -2751,7 +2280,7 @@
 				<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:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']" priority="2">
 		<xsl:param name="key_iso"/>
 		<!-- <tr>
@@ -2767,12 +2296,7 @@
 					<xsl:if test="normalize-space($key_iso) = 'true'">
 						<xsl:attribute name="margin-top">0</xsl:attribute>
 					</xsl:if>
-					<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:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
@@ -2798,6 +2322,7 @@
 		<xsl:param name="key_iso"/>
 		<fo:table-row>
 			<fo:table-cell>
 				<fo:block margin-top="6pt">
@@ -2826,14 +2351,36 @@
 			<fo:table-cell>
 				<fo:block>
+					<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
+						<xsl:if test="local-name(*[1]) != 'stem'">
+							<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
+						</xsl:if>
+					</xsl:if> -->
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
+		<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
+			<xsl:if test="local-name(*[1]) = 'stem'">
+				<fo:table-row>
+				<fo:table-cell>
+					<fo:block margin-top="6pt">
+						<xsl:if test="normalize-space($key_iso) = 'true'">
+							<xsl:attribute name="margin-top">0</xsl:attribute>
+						</xsl:if>
+						<xsl:text>&#xA0;</xsl:text>
+					</fo:block>
+				</fo:table-cell>
+				<fo:table-cell>
+					<fo:block>
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
+					</fo:block>
+				</fo:table-cell>
+			</fo:table-row>
+			</xsl:if>
+		</xsl:if> -->
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
@@ -2844,7 +2391,7 @@
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template match="*[local-name()='strong']">
+	</xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
 		<fo:inline font-weight="bold">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -2857,7 +2404,32 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='tt']">
-		<fo:inline font-family="Courier" font-size="10pt">
+		<fo:inline xsl:use-attribute-sets="tt-style">
+			<xsl:variable name="_font-size">
+				10
+			</xsl:variable>
+			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
+			<xsl:if test="$font-size != ''">
+				<xsl:attribute name="font-size">
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
@@ -3151,154 +2723,1282 @@
 	</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:when test="$language = 'English'">en</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
+		</xsl:choose>
+	</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: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:call-template name="capitalize">
+					<xsl:with-param name="str" select="$str2"/>
+				</xsl:call-template>
+			</xsl:otherwise>
+		</xsl:choose>
+	</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">
+			<xsl:variable name="mathml">
+				<xsl:apply-templates select="." mode="mathml"/>
+			</xsl:variable>
+			<fo:instream-foreign-object fox:alt-text="Math">
+				<!-- <xsl:copy-of select="."/> -->
+				<xsl:copy-of select="xalan:nodeset($mathml)"/>
+			</fo:instream-foreign-object>
+		</fo:inline>
+	</xsl:template><xsl:template match="@*|node()" mode="mathml">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="mathml"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="mathml:mtext" mode="mathml">
+		<xsl:copy>
+			<!-- replace start and end spaces to non-break space -->
+			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
+		<xsl:variable name="target">
+			<xsl:choose>
+				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
+					<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(@target)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:inline xsl:use-attribute-sets="link-style">
+			<xsl:choose>
+				<xsl:when test="$target = ''">
+					<xsl:apply-templates/>
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
+						<xsl:choose>
+							<xsl:when test="normalize-space(.) = ''">
+								<xsl:value-of select="$target"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</fo:basic-link>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:inline>
+	</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: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']" priority="2">
+		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+		</fo:block>
+		<xsl:apply-templates/>
+	</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 match="*[local-name() = 'xref']">
+		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+			<xsl:apply-templates/>
+		</fo:basic-link>
+	</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">
+					<xsl:choose>
+						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</xsl:if>
+			<fo:block-container margin-left="0mm">
+				<fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'dt']/*[local-name() = 'stem']">
+		<fo:inline>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'admitted']/*[local-name() = 'stem']">
+		<fo:inline>
+			<xsl:apply-templates/>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<xsl:text>(</xsl:text><xsl:apply-templates/><xsl:text>)</xsl:text>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'note']" name="note">
+		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style">
+			<fo:block-container margin-left="0mm">
+					<xsl:if test="ancestor::iho:td">
+						<xsl:attribute name="font-size">12pt</xsl:attribute>
+					</xsl:if>
+					<fo:block>
+						<fo:inline xsl:use-attribute-sets="note-name-style">
+							<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+						</fo:inline>
+						<xsl:apply-templates/>
+					</fo:block>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'p']">
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$num = 1">
+				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="note-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'termnote']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">
+			<fo:inline xsl:use-attribute-sets="termnote-name-style">
+				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+			</fo:inline>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name'] |               *[local-name() = 'termnote']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']" mode="presentation">
+		<xsl:param name="sfx"/>
+		<xsl:variable name="suffix">
+			<xsl:choose>
+				<xsl:when test="$sfx != ''">
+					<xsl:value-of select="$sfx"/>
+				</xsl:when>
+				<xsl:otherwise>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:if test="normalize-space() != ''">
+			<xsl:apply-templates/>
+			<xsl:value-of select="$suffix"/>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'name']" mode="presentation">
+		<xsl:param name="sfx"/>
+		<xsl:variable name="suffix">
+			<xsl:choose>
+				<xsl:when test="$sfx != ''">
+					<xsl:value-of select="$sfx"/>
+				</xsl:when>
+				<xsl:otherwise>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:if test="normalize-space() != ''">
+			<xsl:apply-templates/>
+			<xsl:value-of select="$suffix"/>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
+		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'terms']">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'term']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="term-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:inline>
+				<xsl:apply-templates/>
+				<!-- <xsl:if test="$namespace = 'gb' or $namespace = 'ogc'">
+					<xsl:text>.</xsl:text>
+				</xsl:if> -->
+			</fo:inline>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']">
+		<fo:block-container id="{@id}">
+			<fo:block>
+				<xsl:apply-templates/>
+			</fo:block>
+			<xsl:call-template name="fn_display_figure"/>
+			<xsl:for-each select="*[local-name() = 'note']">
+				<xsl:call-template name="note"/>
+			</xsl:for-each>
+			<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
+		<fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'image']">
+		<fo:block xsl:use-attribute-sets="image-style">
+			<xsl:variable name="src">
+				<xsl:choose>
+					<xsl:when test="@mimetype = 'image/svg+xml' and $images/images/image[@id = current()/@id]">
+						<xsl:value-of select="$images/images/image[@id = current()/@id]/@src"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="@src"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="contents" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template><xsl:template match="node()" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+	</xsl:template><xsl:template match="node()" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
+		<xsl:apply-templates select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template><xsl:template name="addBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:if test="xalan:nodeset($contents)//item">
+			<fo:bookmark-tree>
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($contents)/doc">
+						<xsl:choose>
+							<xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
+								<xsl:for-each select="xalan:nodeset($contents)/doc">
+									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
+										<fo:bookmark-title>
+											<xsl:variable name="bookmark-title_">
+												<xsl:choose>
+													<xsl:when test="@lang = 'en'">
+														</xsl:when>
+													<xsl:when test="@lang = 'fr'">
+													</xsl:when>
+													<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
+													<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
+											<xsl:choose>
+												<xsl:when test="normalize-space($bookmark-title_) != ''">
+													<xsl:value-of select="normalize-space($bookmark-title_)"/>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:choose>
+														<xsl:when test="@lang = 'en'">English</xsl:when>
+														<xsl:when test="@lang = 'fr'">Français</xsl:when>
+														<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
+														<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+													</xsl:choose>
+												</xsl:otherwise>
+											</xsl:choose>
+										</fo:bookmark-title>
+										<xsl:apply-templates select="contents/item" mode="bookmark"/>
+									</fo:bookmark>
+								</xsl:for-each>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:for-each select="xalan:nodeset($contents)/doc">
+									<xsl:apply-templates select="contents/item" mode="bookmark"/>
+								</xsl:for-each>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="xalan:nodeset($contents)/contents/item" mode="bookmark"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</fo:bookmark-tree>
+		</xsl:if>
+	</xsl:template><xsl:template match="item" mode="bookmark">
+		<fo:bookmark internal-destination="{@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:if test="@section != ''">
+						<xsl:value-of select="@section"/>
+						<xsl:text> </xsl:text>
+					</xsl:if>
+					<xsl:value-of select="normalize-space(title)"/>
+				</fo:bookmark-title>
+				<xsl:apply-templates mode="bookmark"/>
+		</fo:bookmark>
+	</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:block xsl:use-attribute-sets="figure-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/><xsl:template match="*[local-name() = 'title']" mode="contents_item">
+		<xsl:apply-templates mode="contents_item"/>
+		<!-- <xsl:text> </xsl:text> -->
+	</xsl:template><xsl:template name="getSection">
+		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+	</xsl:template><xsl:template name="getName">
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
+				<xsl:copy-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/following-sibling::node()"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="*[local-name() = 'title']/node()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="insertTitleAsListItem">
+		<xsl:param name="provisional-distance-between-starts" select="'9.5mm'"/>
+		<xsl:variable name="section">
+			<xsl:for-each select="..">
+				<xsl:call-template name="getSection"/>
+			</xsl:for-each>
+		</xsl:variable>
+		<fo:list-block provisional-distance-between-starts="{$provisional-distance-between-starts}">
+			<fo:list-item>
+				<fo:list-item-label end-indent="label-end()">
+					<fo:block>
+						<xsl:value-of select="$section"/>
+					</fo:block>
+				</fo:list-item-label>
+				<fo:list-item-body start-indent="body-start()">
+					<fo:block>
+						<xsl:choose>
+							<xsl:when test="*[local-name() = 'tab']">
+								<xsl:apply-templates select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</fo:block>
+				</fo:list-item-body>
+			</fo:list-item>
+		</fo:list-block>
+	</xsl:template><xsl:template name="extractTitle">
+		<xsl:choose>
+				<xsl:when test="*[local-name() = 'tab']">
+					<xsl:apply-templates select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+			</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">
+					<xsl:choose>
+						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</xsl:if>
+			<fo:block-container margin-left="0mm">
+				<fo:block xsl:use-attribute-sets="sourcecode-style">
+					<xsl:variable name="_font-size">
+						10
+				</xsl:variable>
+				<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
+				<xsl:if test="$font-size != ''">
+					<xsl:attribute name="font-size">
+						<xsl:choose>
+							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+				</xsl:if>
+					<xsl:apply-templates/>
+				</fo:block>
+				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
+		<xsl:variable name="text">
+			<xsl:call-template name="add-zero-spaces-equal"/>
+		</xsl:variable>
+		<xsl:call-template name="add-zero-spaces-java">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:block xsl:use-attribute-sets="sourcecode-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'permission']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="permission-style">
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:block xsl:use-attribute-sets="permission-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'permission']/*[local-name() = 'label']">
+		<fo:block xsl:use-attribute-sets="permission-label-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="requirement-style">
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:apply-templates select="*[local-name()='label']" mode="presentation"/>
+			<xsl:apply-templates select="@obligation" mode="presentation"/>
+			<xsl:apply-templates select="*[local-name()='subject']" mode="presentation"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:block xsl:use-attribute-sets="requirement-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'label']" mode="presentation">
+		<fo:block xsl:use-attribute-sets="requirement-label-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/@obligation" mode="presentation">
+			<fo:block>
+				<fo:inline padding-right="3mm">Obligation</fo:inline><xsl:value-of select="."/>
+			</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']"/><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'subject']" mode="presentation">
+		<fo:block xsl:use-attribute-sets="requirement-subject-style">
+			<xsl:text>Target Type </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'requirement']/*[local-name() = 'inherit']">
+		<fo:block xsl:use-attribute-sets="requirement-inherit-style">
+			<xsl:text>Dependency </xsl:text><xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'recommendation']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="recommendation-style">
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:block xsl:use-attribute-sets="recommendation-name-style">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'recommendation']/*[local-name() = 'label']">
+		<fo:block xsl:use-attribute-sets="recommendation-label-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
+			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+			<fo:block-container margin-left="0mm" margin-right="0mm">
+				<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
+					<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+						<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
+					</xsl:if>
+					<xsl:variable name="simple-table">
+						<xsl:call-template name="getSimpleTable"/>
+					</xsl:variable>
+					<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
+					<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
+						<!-- <fo:table-column column-width="35mm"/>
+						<fo:table-column column-width="115mm"/> -->
+						<fo:table-column column-width="30%"/>
+						<fo:table-column column-width="70%"/>
+					</xsl:if>
+					<xsl:apply-templates mode="requirement"/>
+				</fo:table>
+				<!-- fn processing -->
+				<xsl:if test=".//*[local-name() = 'fn']">
+					<xsl:for-each select="*[local-name() = 'tbody']">
+						<fo:block font-size="90%" border-bottom="1pt solid black">
+							<xsl:call-template name="fn_display"/>
+						</fo:block>
+					</xsl:for-each>
+				</xsl:if>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name()='thead']" mode="requirement">
+		<fo:table-header>
+			<xsl:apply-templates mode="requirement"/>
+		</fo:table-header>
+	</xsl:template><xsl:template match="*[local-name()='tbody']" mode="requirement">
+		<fo:table-body>
+			<xsl:apply-templates mode="requirement"/>
+		</fo:table-body>
+	</xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
+		<fo:table-row height="7mm" border-bottom="0.5pt solid grey">
+			<xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
+				<!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> -->
+				<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
+				<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="starts-with(*[local-name()='td'][1], 'Recommendation ')">
+				<xsl:attribute name="background-color">rgb(233, 235, 239)</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates mode="requirement"/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
+		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
+			<xsl:attribute name="text-align">
+				<xsl:choose>
+					<xsl:when test="@align">
+						<xsl:value-of select="@align"/>
+					</xsl:when>
+					<xsl:otherwise>left</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:if test="@colspan">
+				<xsl:attribute name="number-columns-spanned">
+					<xsl:value-of select="@colspan"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="@rowspan">
+				<xsl:attribute name="number-rows-spanned">
+					<xsl:value-of select="@rowspan"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="display-align"/>
+			<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
+				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+				<xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
+				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+				<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
+			</xsl:if> -->
+			<fo:block>
+				<xsl:apply-templates/>
+			</fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
+		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
+			<xsl:if test="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+				<xsl:attribute name="padding">0mm</xsl:attribute>
+				<xsl:attribute name="padding-left">0mm</xsl:attribute>
+			</xsl:if>
+			<xsl:attribute name="text-align">
+				<xsl:choose>
+					<xsl:when test="@align">
+						<xsl:value-of select="@align"/>
+					</xsl:when>
+					<xsl:otherwise>left</xsl:otherwise>
+				</xsl:choose>
+			</xsl:attribute>
+			<xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
+				<xsl:attribute name="font-weight">bold</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="@colspan">
+				<xsl:attribute name="number-columns-spanned">
+					<xsl:value-of select="@colspan"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="@rowspan">
+				<xsl:attribute name="number-rows-spanned">
+					<xsl:value-of select="@rowspan"/>
+				</xsl:attribute>
+			</xsl:if>
+			<xsl:call-template name="display-align"/>
+			<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
+				<xsl:attribute name="padding-left">0.5mm</xsl:attribute>
+				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
+				<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
+					<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>
+				</xsl:if>
+			</xsl:if> -->
+			<!-- 2nd line and below -->
+			<fo:block>
+				<xsl:apply-templates/>
+			</fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
+		<fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center"  -->
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
+		<fo:block> <!-- margin-bottom="10pt" -->
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'termexample']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'name']" mode="presentation">
+		<xsl:if test="normalize-space() != ''">
+			<fo:inline xsl:use-attribute-sets="termexample-name-style">
+				<xsl:apply-templates/>
+			</fo:inline>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
+		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'example']">
+		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
+			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:variable name="element">
+				block
+				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="contains(normalize-space($element), 'block')">
+					<fo:block xsl:use-attribute-sets="example-body-style">
+						<xsl:apply-templates/>
+					</fo:block>
+				</xsl:when>
+				<xsl:otherwise>
+					<fo:inline>
+						<xsl:apply-templates/>
+					</fo:inline>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']" mode="presentation">
+		<xsl:variable name="element">
+			block
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name() = 'appendix']">
+				<fo:inline>
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:when>
+			<xsl:when test="normalize-space($element) = 'block'">
+				<fo:block xsl:use-attribute-sets="example-name-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="example-name-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
+		<xsl:variable name="element">
+			block
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="normalize-space($element) = 'block'">
+				<fo:block xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']">
+		<fo:block xsl:use-attribute-sets="termsource-style">
+			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
+			<xsl:variable name="termsource_text">
+				<xsl:apply-templates/>
+			</xsl:variable>
+			<xsl:choose>
+				<xsl:when test="starts-with(normalize-space($termsource_text), '[')">
+					<xsl:apply-templates/>
+				</xsl:when>
+				<xsl:otherwise>
+						<xsl:text>[</xsl:text>
+					<xsl:apply-templates/>
+						<xsl:text>]</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
+		<xsl:if test="normalize-space() != ''">
+			<xsl:value-of select="."/>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'origin']">
+		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+				<fo:inline>
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-source'"/>
+					</xsl:call-template>
+					<xsl:text>: </xsl:text>
+				</fo:inline>
+			<fo:inline xsl:use-attribute-sets="origin-style">
+				<xsl:apply-templates/>
+			</fo:inline>
+			</fo:basic-link>
+	</xsl:template><xsl:template match="*[local-name() = 'modification']/*[local-name() = 'p']">
+		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'modification']/text()">
+		<xsl:if test="normalize-space() != ''">
+			<xsl:value-of select="."/>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'quote']">
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:if test="not(ancestor::*[local-name() = 'table'])">
+					<xsl:attribute name="margin-left">5mm</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+			<fo:block-container margin-left="0mm">
+				<fo:block xsl:use-attribute-sets="quote-style">
+					<xsl:apply-templates select=".//*[local-name() = 'p']"/>
+				</fo:block>
+				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
+					<fo:block xsl:use-attribute-sets="quote-source-style">
+						<!-- — ISO, ISO 7301:2011, Clause 1 -->
+						<xsl:apply-templates select="*[local-name() = 'author']"/>
+						<xsl:apply-templates select="*[local-name() = 'source']"/>
+					</fo:block>
+				</xsl:if>
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'source']">
+		<xsl:if test="../*[local-name() = 'author']">
+			<xsl:text>, </xsl:text>
+		</xsl:if>
+		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+			<xsl:apply-templates/>
+		</fo:basic-link>
+	</xsl:template><xsl:template match="*[local-name() = 'author']">
+		<xsl:text>— </xsl:text>
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+		<fo:inline xsl:use-attribute-sets="eref-style">
+			<xsl:if test="@type = 'footnote'">
+					<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+					<xsl:attribute name="font-size">80%</xsl:attribute>
+					<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+					<xsl:attribute name="vertical-align">super</xsl:attribute>
+			</xsl:if>
+			<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+				<xsl:if test="@type = 'inline'">
+						<xsl:attribute name="color">blue</xsl:attribute>
+						<xsl:attribute name="text-decoration">underline</xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates/>
+			</fo:basic-link>
+		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'tab']">
+		<!-- zero-space char -->
+		<xsl:variable name="depth">
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="depth" select="../@depth"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="padding">
+				<xsl:choose>
+					<xsl:when test="$depth = 2">3</xsl:when>
+					<xsl:when test="$depth = 3">3</xsl:when>
+					<xsl:otherwise>4</xsl:otherwise>
+				</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="padding-right">
+			<xsl:choose>
+				<xsl:when test="normalize-space($padding) = ''">0</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space($padding)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<xsl:choose>
+			<xsl:when test="$language = 'zh'">
+				<fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
+			</xsl:when>
+			<xsl:when test="../../@inline-header = 'true'">
+				<fo:inline font-size="90%">
+					<xsl:call-template name="insertNonBreakSpaces">
+						<xsl:with-param name="count" select="$padding-right"/>
+					</xsl:call-template>
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline padding-right="{$padding-right}mm"></fo:inline>
+			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template name="capitalizeWords">
-		<xsl:param name="str"/>
-		<xsl:variable name="str2" select="translate($str, '-', ' ')"/>
+	</xsl:template><xsl:template name="insertNonBreakSpaces">
+		<xsl:param name="count"/>
+		<xsl:if test="$count &gt; 0">
+			<xsl:text> </xsl:text>
+			<xsl:call-template name="insertNonBreakSpaces">
+				<xsl:with-param name="count" select="$count - 1"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'domain']">
+		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'admitted']">
+		<fo:block xsl:use-attribute-sets="admitted-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
+		<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:use-attribute-sets="deprecates-style">
+			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'definition']">
+		<fo:block xsl:use-attribute-sets="definition-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'definition'][preceding-sibling::*[local-name() = 'domain']]/*[local-name() = 'p']">
+		<fo:inline> <xsl:apply-templates/></fo:inline>
+		<fo:block> </fo:block>
+	</xsl:template><xsl:template match="/*/*[local-name() = 'sections']/*" priority="2">
+		<fo:block>
+			<xsl:call-template name="setId"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="/*/*[local-name() = 'preface']/*" priority="2">
+		<fo:block break-after="page"/>
+		<fo:block>
+			<xsl:call-template name="setId"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'clause']">
+		<fo:block>
+			<xsl:call-template name="setId"/>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'annex']">
+		<fo:block break-after="page"/>
+		<fo:block id="{@id}">
+		</fo:block>
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'review']">
+		<!-- comment 2019-11-29 -->
+		<!-- <fo:block font-weight="bold">Review:</fo:block>
+		<xsl:apply-templates /> -->
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
+		<!-- 0xA0 to space replacement -->
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
 		<xsl:choose>
-			<xsl:when test="contains($str2, ' ')">
-				<xsl:variable name="substr" select="substring-before($str2, ' ')"/>
-				<!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
-				<xsl:value-of select="substring($substr, 2)"/> -->
-				<xsl:call-template name="capitalize">
-					<xsl:with-param name="str" select="$substr"/>
-				</xsl:call-template>
-				<xsl:text> </xsl:text>
-				<xsl:call-template name="capitalizeWords">
-					<xsl:with-param name="str" select="substring-after($str2, ' ')"/>
-				</xsl:call-template>
+			<xsl:when test="parent::*[local-name() = 'note']">
+				<fo:block-container>
+					<xsl:attribute name="margin-left">
+						<xsl:choose>
+							<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+							<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					<fo:block-container margin-left="0mm">
+						<fo:block>
+							<xsl:apply-templates select="." mode="ul_ol"/>
+						</fo:block>
+					</fo:block-container>
+				</fo:block-container>
 			</xsl:when>
 			<xsl:otherwise>
-				<!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
-				<xsl:value-of select="substring($str2, 2)"/> -->
-				<xsl:call-template name="capitalize">
-					<xsl:with-param name="str" select="$str2"/>
-				</xsl:call-template>
+				<fo:block>
+					<xsl:apply-templates select="." mode="ul_ol"/>
+				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
-	</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 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 match="*[local-name()='link']" name="link">
-		<xsl:variable name="target">
-			<xsl:choose>
-				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
-					<xsl:value-of select="normalize-space(substring-after(@target, 'mailto:'))"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="normalize-space(@target)"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<fo:inline xsl:use-attribute-sets="link-style">
+	</xsl:template><xsl:template match="*[local-name() = 'errata']">
+		<!-- <row>
+					<date>05-07-2013</date>
+					<type>Editorial</type>
+					<change>Changed CA-9 Priority Code from P1 to P2 in <xref target="tabled2"/>.</change>
+					<pages>D-3</pages>
+				</row>
+		-->
+		<fo:table table-layout="fixed" width="100%" font-size="10pt" border="1pt solid black">
+			<fo:table-column column-width="20mm"/>
+			<fo:table-column column-width="23mm"/>
+			<fo:table-column column-width="107mm"/>
+			<fo:table-column column-width="15mm"/>
+			<fo:table-body>
+				<fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
+					<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
+					<fo:table-cell border="1pt solid black"><fo:block>Pages</fo:block></fo:table-cell>
+				</fo:table-row>
+				<xsl:apply-templates/>
+			</fo:table-body>
+		</fo:table>
+	</xsl:template><xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']">
+		<fo:table-row>
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name() = 'errata']/*[local-name() = 'row']/*">
+		<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
+			<fo:block><xsl:apply-templates/></fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template name="processBibitem">
+			<!-- start IHO bibtem processing -->
 			<xsl:choose>
-				<xsl:when test="$target = ''">
-					<xsl:apply-templates/>
+				<xsl:when test="iho:formattedref">
+					<xsl:apply-templates select="iho:formattedref"/>
 				</xsl:when>
 				<xsl:otherwise>
-					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
+					<xsl:choose>
+				<!-- IHO documents -->
+				<!-- {docID} edition {edition}: {title}, {author/organization} -->
+						<xsl:when test="iho:docidentifier[1]/@type='IHO'">
+							<xsl:value-of select="iho:docidentifier[1]"/>
+							<xsl:apply-templates select="iho:edition"/>
+							<xsl:if test="iho:title or iho:contributor or iho:url">
+								<xsl:text>: </xsl:text>
+							</xsl:if>
+						</xsl:when>
+						<!-- Non-IHO documents -->
+						<!-- title and publisher -->
+						<xsl:otherwise>
+							<xsl:variable name="docID">
+								<xsl:call-template name="processBibitemDocId"/>
+							</xsl:variable>
+							<xsl:value-of select="normalize-space($docID)"/>
+							<xsl:if test="normalize-space($docID) != ''"><xsl:text>: </xsl:text></xsl:if>
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:choose>
+						<xsl:when test="iho:title[@type = 'main' and @language = 'en']">
+							<xsl:apply-templates select="iho:title[@type = 'main' and @language = 'en']"/>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:apply-templates select="iho:title"/>
+						</xsl:otherwise>
+					</xsl:choose>
+					<xsl:if test="iho:title and iho:contributor">
+						<xsl:text>, </xsl:text>
+					</xsl:if>
+					<xsl:variable name="authors">
 						<xsl:choose>
-							<xsl:when test="normalize-space(.) = ''">
-								<xsl:value-of select="$target"/>
+							<xsl:when test="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+									<xsl:copy-of select="."/>
+								</xsl:for-each>
 							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates/>
+							<xsl:when test="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='editor']">
+								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='editor']">
+									<xsl:copy-of select="."/>
+								</xsl:for-each>
+							</xsl:when>
+							<xsl:when test="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='publisher'][*[local-name() = 'organization']]">
+								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='publisher'][*[local-name() = 'organization']]">
+									<xsl:copy>
+										<xsl:choose>
+											<xsl:when test="position() != 1 and position() != last()">, </xsl:when>
+											<xsl:when test="position() != 1 and position() = last()"> and </xsl:when>
+										</xsl:choose>
+										<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+									</xsl:copy>
+								</xsl:for-each>
+							</xsl:when>
+						</xsl:choose>
+					</xsl:variable>
+					<xsl:for-each select="xalan:nodeset($authors)/*">
+						<xsl:choose>
+							<xsl:when test="not(*[local-name() = 'role'])"><!-- publisher organisation -->
+								<xsl:value-of select="."/>
+							</xsl:when>
+							<xsl:otherwise> <!-- author, editor -->
+								<xsl:choose>
+									<xsl:when test="*[local-name() = 'organization']/*[local-name() = 'name']">
+										<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:for-each select="*[local-name() = 'person']">
+											<xsl:variable name="author">
+												<xsl:call-template name="processPersonalAuthor"/>
+											</xsl:variable>
+											<xsl:value-of select="xalan:nodeset($author)/author"/>
+										</xsl:for-each>
+									</xsl:otherwise>
+								</xsl:choose>
 							</xsl:otherwise>
 						</xsl:choose>
-					</fo:basic-link>
+						<xsl:if test="*[local-name() = 'organization']/*[local-name() = 'name'] and position() != last()">
+							<xsl:text>, </xsl:text>
+						</xsl:if>
+					</xsl:for-each>
+					<xsl:apply-templates select="*[local-name() = 'uri'][1]"/>
 				</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>
+			<!-- end IHO bibitem processing -->
+	</xsl:template><xsl:template name="processBibitemDocId">
+		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
+		<xsl:choose>
+			<xsl:when test="normalize-space($_doc_ident) != ''">
+				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
+				<xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
+					<xsl:value-of select="$type"/><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:value-of select="$_doc_ident"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
+				<xsl:if test="$type != ''">
+					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="processPersonalAuthor">
 		<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:when test="*[local-name() = 'name']/*[local-name() = 'completename']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'completename']"/>
+				</author>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'initial']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'initial']" mode="strip"/>
+				</author>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'forename']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'forename']" mode="strip"/>
+				</author>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
 		</xsl:choose>
-		<xsl:apply-templates/>
+	</xsl:template><xsl:template name="renderDate">
+			<xsl:if test="normalize-space(*[local-name() = 'on']) != ''">
+				<xsl:value-of select="*[local-name() = 'on']"/>
+			</xsl:if>
+			<xsl:if test="normalize-space(*[local-name() = 'from']) != ''">
+				<xsl:value-of select="concat(*[local-name() = 'from'], '–', *[local-name() = 'to'])"/>
+			</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'initial']/text()" mode="strip">
+		<xsl:value-of select="translate(.,'. ','')"/>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
+		<xsl:value-of select="substring(.,1,1)"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -3431,27 +4131,49 @@
 			</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:param name="depth"/>
+		<xsl:choose>
+			<xsl:when test="normalize-space(@depth) != ''">
+				<xsl:value-of select="@depth"/>
+			</xsl:when>
+			<xsl:when test="normalize-space($depth) != ''">
+				<xsl:value-of select="$depth"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="level_total" select="count(ancestor::*)"/>
+				<xsl:variable name="level">
+					<xsl:choose>
+						<xsl:when test="parent::*[local-name() = 'preface']">
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'preface']">
+							<xsl:value-of select="$level_total - 2"/>
+						</xsl:when>
+						<!-- <xsl:when test="parent::*[local-name() = 'sections']">
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when> -->
+						<xsl:when test="ancestor::*[local-name() = 'sections']">
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'bibliography']">
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
+						<xsl:when test="parent::*[local-name() = 'annex']">
+							<xsl:value-of select="$level_total - 1"/>
+						</xsl:when>
+						<xsl:when test="ancestor::*[local-name() = 'annex']">
+							<xsl:value-of select="$level_total"/>
+						</xsl:when>
+						<xsl:when test="local-name() = 'annex'">1</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:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
@@ -3482,7 +4204,9 @@
 				<xsl:value-of select="document('')//*/namespace::iho"/>
 		</xsl:variable>
 		<xsl:if test="$documentNS != $XSLNS">
 			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
@@ -3497,4 +4221,32 @@
 			<xsl:when test="$language = 'cn'">Chinese</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="setId">
+		<xsl:attribute name="id">
+			<xsl:choose>
+				<xsl:when test="@id">
+					<xsl:value-of select="@id"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="generate-id()"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
+	</xsl:template><xsl:template name="add-letter-spacing">
+		<xsl:param name="text"/>
+		<xsl:param name="letter-spacing" select="'0.15'"/>
+		<xsl:if test="string-length($text) &gt; 0">
+			<xsl:variable name="char" select="substring($text, 1, 1)"/>
+			<fo:inline padding-right="{$letter-spacing}mm">
+				<xsl:if test="$char = '®'">
+					<xsl:attribute name="font-size">58%</xsl:attribute>
+					<xsl:attribute name="baseline-shift">30%</xsl:attribute>
+				</xsl:if>
+				<xsl:value-of select="$char"/>
+			</fo:inline>
+			<xsl:call-template name="add-letter-spacing">
+				<xsl:with-param name="text" select="substring($text, 2)"/>
+				<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>