metanorma-iec 1.4.5 → 2.0.0

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

@@ -502,24 +502,34 @@
 								<fo:block font-size="9pt" color="{$color_blue}" line-height="150%">
 									<fo:block-container width="40mm">
 										<fo:block>
-											<!-- <xsl:variable name="publisher" select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:contributor[iec:role/@type = 'publisher']/iec:organization/iec:name))"/> -->
-											<!-- <xsl:value-of select="$publisher"/> -->
-											<xsl:value-of select="(//iec:iec-standard)[1]/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang]"/>
+											<xsl:call-template name="getLocalizedString">
+												<xsl:with-param name="key">IEC</xsl:with-param>
+												<xsl:with-param name="lang"><xsl:value-of select="$lang"/></xsl:with-param>
+											</xsl:call-template>
 										</fo:block>
 									</fo:block-container>
 								</fo:block>
-								<xsl:if test="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang_second]">
+								
+								<xsl:variable name="IEC_lang_second">
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">IEC</xsl:with-param>
+										<xsl:with-param name="lang"><xsl:value-of select="$lang_second"/></xsl:with-param>
+									</xsl:call-template>
+								</xsl:variable>
+								
+								<xsl:if test="normalize-space($IEC_lang_second) != ''">
 									<fo:block font-size="9pt" line-height="150%" margin-top="8pt">
 										<fo:block-container width="40mm">
 											<fo:block>
 												<!-- <xsl:value-of select="'COMMISSION ELECTROTECHNIQUE INTERNATIONALE'"/> -->
-												<xsl:value-of select="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang_second]"/>
+												<xsl:value-of select="$IEC_lang_second"/>
 											</fo:block>
 										</fo:block-container>
 									</fo:block>
 								</xsl:if>
 							</fo:block-container>
 							
+							<xsl:variable name="price_code_value" select="//iec:iec-standard/iec:bibdata/iec:ext/iec:price-code"/>
 							<fo:table table-layout="fixed" width="102%" margin-top="-9mm" margin-bottom="2mm">
 								<fo:table-column column-width="148mm"/>
 								<fo:table-column column-width="16mm"/>
@@ -527,29 +537,34 @@
 									<fo:table-row border-bottom="0.5pt solid {$color_gray}" height="16mm">
 										<fo:table-cell font-size="8pt" text-align="right" display-align="center">
 											<fo:block>
-												<fo:block color="{$color_blue}" margin-bottom="3pt">
-													<!-- PRICE CODE -->
-													<xsl:variable name="price_code">
-														<!-- <xsl:call-template name="getLocalizedString">
-															<xsl:with-param name="key">price-code</xsl:with-param>																			
-														</xsl:call-template> -->
-														<xsl:value-of select="(//iec:iec-standard)[1]/iec:localized-strings/iec:localized-string[@key='price-code' and @language=$lang]"/>
-													</xsl:variable>
-													<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
-												</fo:block>
-												<!-- <xsl:if test="$lang != 'fr'">
-													<fo:block>CODE PRIX</fo:block>
-												</xsl:if> -->
-												<fo:block>
-													<xsl:variable name="price_code">
-														<xsl:value-of select="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='price-code' and @language=$lang_second]"/>
-													</xsl:variable>
-													<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
-												</fo:block>
+												<xsl:if test="normalize-space($price_code_value) != ''">
+													<fo:block color="{$color_blue}" margin-bottom="3pt">
+														<!-- PRICE CODE -->
+														<xsl:variable name="price_code">
+															<xsl:call-template name="getLocalizedString">
+																<xsl:with-param name="key">price-code</xsl:with-param>
+																<xsl:with-param name="lang"><xsl:value-of select="$lang"/></xsl:with-param>
+															</xsl:call-template>
+														</xsl:variable>
+														<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
+													</fo:block>
+													<!-- <xsl:if test="$lang != 'fr'">
+														<fo:block>CODE PRIX</fo:block>
+													</xsl:if> -->
+													<fo:block>
+														<xsl:variable name="price_code">
+															<xsl:call-template name="getLocalizedString">
+																<xsl:with-param name="key">price-code</xsl:with-param>
+																<xsl:with-param name="lang"><xsl:value-of select="$lang_second"/></xsl:with-param>
+															</xsl:call-template>
+														</xsl:variable>
+														<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($price_code))"/>
+													</fo:block>
+												</xsl:if>
 											</fo:block>
 										</fo:table-cell>
 										<fo:table-cell font-size="25pt" font-weight="bold" color="{$color_gray}" text-align="right" display-align="center">
-											<fo:block padding-top="1mm"><xsl:value-of select="//iec:iec-standard/iec:bibdata/iec:ext/iec:price-code"/></fo:block>
+											<fo:block padding-top="1mm"><xsl:value-of select="$price_code_value"/></fo:block>
 										</fo:table-cell>
 									</fo:table-row>
 								</fo:table-body>
@@ -1378,7 +1393,13 @@
 						<xsl:text> — </xsl:text>
 						<xsl:value-of select="$linebreak"/>
 						<xsl:if test="$part != ''">
-							<xsl:variable name="localized_part" select="(//iec:iec-standard)[1]/iec:localized-strings/iec:localized-string[@key='locality.part' and @language=$lang]"/>
+							<xsl:variable name="localized_part">
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">locality.part</xsl:with-param>
+									<xsl:with-param name="lang"><xsl:value-of select="$lang"/></xsl:with-param>
+								</xsl:call-template>
+							</xsl:variable>
+							
 							<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($localized_part),'#',$part)"/> -->
 							<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
 							<!-- <xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
@@ -1404,10 +1425,17 @@
 						<xsl:value-of select="$linebreak"/>
 						<xsl:if test="$part != ''">
 							
+							<xsl:variable name="locality_part_lang_second">
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">locality.part</xsl:with-param>
+									<xsl:with-param name="lang"><xsl:value-of select="$lang_second"/></xsl:with-param>
+								</xsl:call-template>
+							</xsl:variable>
+							
 							<xsl:choose>
-								<xsl:when test="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='locality.part' and @language=$lang_second]">
+								<xsl:when test="normalize-space($locality_part_lang_second)">
 									<xsl:variable name="localized_part">
-										<xsl:value-of select="(//iec:iec-standard)[2]/iec:localized-strings/iec:localized-string[@key='locality.part' and @language=$lang_second]"/>
+										<xsl:value-of select="$locality_part_lang_second"/>
 									</xsl:variable>
 									<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
 								</xsl:when>
@@ -1434,8 +1462,8 @@
 			<fo:block role="TOC">
 				<fo:block font-size="12pt" text-align="center" margin-bottom="22pt" role="H1">
 					<xsl:variable name="title-toc">
-						<xsl:call-template name="getTitle">
-							<xsl:with-param name="name" select="'title-toc'"/>
+						<xsl:call-template name="getLocalizedString">
+							<xsl:with-param name="key">table_of_contents</xsl:with-param>
 						</xsl:call-template>
 					</xsl:variable>
 					<xsl:call-template name="addLetterSpacing">
@@ -1459,6 +1487,9 @@
 						<xsl:if test="@type = 'indexsect'">
 							<xsl:attribute name="space-before">16pt</xsl:attribute>
 						</xsl:if>
+						<xsl:if test="@type = 'references'">
+							<xsl:attribute name="space-before">5pt</xsl:attribute>
+						</xsl:if>
 						<!-- <xsl:if test="@level &gt;= 2 and @section != ''">
 							<xsl:attribute name="margin-left">5mm</xsl:attribute>
 						</xsl:if> -->
@@ -1468,6 +1499,7 @@
 								<fo:list-block>
 									<xsl:attribute name="margin-left">
 										<xsl:choose>
+											<xsl:when test="title/@variant-title = 'true'">0mm</xsl:when>
 											<xsl:when test="@level = 2">8mm</xsl:when>
 											<xsl:when test="@level &gt;= 3"><xsl:value-of select="(@level - 2) * 23"/>mm</xsl:when>
 											<xsl:otherwise>0mm</xsl:otherwise>
@@ -1547,8 +1579,12 @@
 		<xsl:param name="lang" select="$lang"/>
 		<fo:block break-after="page"/>
 		<fo:block-container font-size="12pt" text-align="center" margin-bottom="18pt">
-			<!-- <fo:block><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:contributor/iec:organization/iec:name))"/></fo:block> -->
-			<fo:block><xsl:value-of select="/iec:iec-standard/iec:localized-strings/iec:localized-string[@key='IEC' and @language=$lang]"/></fo:block>
+			<fo:block>
+				<xsl:call-template name="getLocalizedString">
+					<xsl:with-param name="key">IEC</xsl:with-param>
+					<xsl:with-param name="lang"><xsl:value-of select="$lang"/></xsl:with-param>
+				</xsl:call-template>
+			</fo:block>
 			<fo:block>___________</fo:block>
 			<fo:block> </fo:block>
 			<fo:block font-weight="bold" role="H1">				
@@ -1563,9 +1599,13 @@
 					<fo:block>
 						<xsl:if test="$part != ''">
 							<!-- Example: Part 1: Riz -->
-							<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang]),'#',$part)"/>							 -->
-							<xsl:variable name="localized_part" select="//iec:iec-standard/iec:localized-strings/iec:localized-string[@key='locality.part' and @language = $lang]"/>
-							<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
+							<xsl:variable name="localized_part">
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">Part.sg</xsl:with-param>
+									<xsl:with-param name="lang" select="$lang"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="concat($localized_part ,' ', $part, ': ')"/>
 						</xsl:if>
 						<xsl:value-of select="$title-part"/>
 					</fo:block>
@@ -1608,8 +1648,12 @@
 							<fo:block>
 								<xsl:if test="$part != ''">
 									<!-- Example: Part 1: Rice -->
-									<!-- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang = $lang]),'#',$part)"/> -->
-									<xsl:variable name="localized_part" select="//iec:iec-standard/iec:localized-strings/iec:localized-string[@key='locality.part' and @language = $lang]"/>
+									<xsl:variable name="localized_part">
+										<xsl:call-template name="getLocalizedString">
+											<xsl:with-param name="key">Part.sg</xsl:with-param>
+											<xsl:with-param name="lang" select="$lang"/>
+										</xsl:call-template>
+									</xsl:variable>
 									<xsl:value-of select="concat($localized_part ,' ',$part, ': ')"/>
 								</xsl:if>
 								<xsl:value-of select="$title-part"/>
@@ -1751,6 +1795,10 @@
 				<xsl:call-template name="getName"/>
 			</xsl:variable>
 			
+			<xsl:variable name="variant_title">
+				<xsl:copy-of select="iec:variant-title/node()"/>
+			</xsl:variable>
+			
 			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" display="{$display}">
 				<xsl:if test="$type ='appendix'">
 					<xsl:attribute name="section"/>
@@ -1763,6 +1811,10 @@
 						<!-- <xsl:when test="$type = 'foreword' or $type = 'introduction'">
 							<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($title))"/>
 						</xsl:when> -->
+						<xsl:when test="normalize-space($variant_title) != ''">
+							<xsl:attribute name="variant-title">true</xsl:attribute>
+							<xsl:apply-templates select="xalan:nodeset($variant_title)" mode="contents_item"/>
+						</xsl:when>
 						<xsl:when test="$type = 'indexsect'">
 							<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($title))"/>
 						</xsl:when>
@@ -2099,25 +2151,7 @@
 	
 	<xsl:template match="iec:bibitem">
 		<fo:block id="{@id}" margin-top="5pt" margin-bottom="10pt"> <!-- letter-spacing="0.4pt" -->
-				<!-- iec:docidentifier -->
-			<xsl:if test="iec:docidentifier">
-				<xsl:choose>
-					<xsl:when test="iec:docidentifier/@type = 'metanorma'"/>
-					<xsl:otherwise><fo:inline><xsl:value-of select="iec:docidentifier"/></fo:inline></xsl:otherwise>
-				</xsl:choose>
-			</xsl:if>
-			<xsl:apply-templates select="iec:note"/>
-			<xsl:if test="iec:docidentifier">, </xsl:if>
-			<fo:inline font-style="italic">
-				<xsl:choose>
-					<xsl:when test="iec:title[@type = 'main' and @language = 'en']">
-						<xsl:value-of select="iec:title[@type = 'main' and @language = 'en']"/>
-					</xsl:when>
-					<xsl:otherwise>
-						<xsl:value-of select="iec:title"/>
-					</xsl:otherwise>
-				</xsl:choose>
-			</fo:inline>
+			<xsl:call-template name="processBibitem"/>
 		</fo:block>
 	</xsl:template>
 	
@@ -2219,7 +2253,10 @@
 			<xsl:call-template name="getLevelTermName"/>
 		</xsl:variable>
 		<fo:block line-height="1.1" space-before="14pt" role="H{$levelTerm}">
-			<xsl:if test="parent::iec:term">
+			<xsl:if test="preceding-sibling::*[1][self::iec:preferred]">
+				<xsl:attribute name="space-before">1pt</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="parent::iec:term and not(preceding-sibling::iec:preferred)"> <!-- if first preffered in term, then display term's name -->
 				<fo:block font-weight="bold" keep-with-next="always">
 					<xsl:apply-templates select="ancestor::iec:term[1]/iec:name" mode="presentation"/>				
 				</fo:block>
@@ -2249,35 +2286,22 @@
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
 					<fo:block id="{@id}">
-							<xsl:number format="[1]"/>
+							<xsl:value-of select="iec:docidentifier[@type = 'metanorma-ordinal']"/>
+							<xsl:if test="not(iec:docidentifier[@type = 'metanorma-ordinal'])">
+								<xsl:number format="[1]"/>
+							</xsl:if>
 					</fo:block>
 				</fo:list-item-label>
 				<fo:list-item-body start-indent="body-start()">
 					<fo:block>
-						<xsl:if test="iec:docidentifier">
-							<xsl:choose>
-								<xsl:when test="iec:docidentifier/@type = 'metanorma'"/>
-								<xsl:otherwise><fo:inline><xsl:value-of select="iec:docidentifier"/>, </fo:inline></xsl:otherwise>
-							</xsl:choose>
-						</xsl:if>
-						<xsl:choose>
-							<xsl:when test="iec:title[@type = 'main' and @language = 'en']">
-								<xsl:apply-templates select="iec:title[@type = 'main' and @language = 'en']"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates select="iec:title"/>
-							</xsl:otherwise>
-						</xsl:choose>
-						<xsl:apply-templates select="iec:formattedref"/>
+						<xsl:call-template name="processBibitem"/>
 					</fo:block>
 				</fo:list-item-body>
 			</fo:list-item>
 		</fo:list-block>
 	</xsl:template>
 	
-	<xsl:template match="iec:references[not(@normative='true')]/iec:bibitem" mode="contents"/>
-	
-	<xsl:template match="iec:references[not(@normative='true')]/iec:bibitem/iec:title">
+	<xsl:template match="iec:references/iec:bibitem/iec:title">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -2557,13 +2581,6 @@
 	
 <xsl:variable name="titles" select="xalan:nodeset($titles_)"/><xsl:variable name="titles_">
 				
-		<title-annex lang="en">Annex </title-annex>
-		<title-annex lang="fr">Annexe </title-annex>
-		
-			<title-annex lang="zh">Annex </title-annex>
-		
-		
-				
 		<title-edition lang="en">
 			
 				<xsl:text>Edition </xsl:text>
@@ -2577,33 +2594,18 @@
 			
 		</title-edition>
 		
-
+		
+		<!-- These titles of Table of contents renders different than determined in localized-strings -->
 		<title-toc lang="en">
 			
-				<xsl:text>Contents</xsl:text>
-			
 			
 			
 		</title-toc>
 		<title-toc lang="fr">
 			
-				<xsl:text>Sommaire</xsl:text>
-			
-			
-			</title-toc>
-		
-			<title-toc lang="zh">Contents</title-toc>
-		
-		
+		</title-toc>
 		
-		<title-page lang="en">Page</title-page>
-		<title-page lang="fr">Page</title-page>
 		
-		<title-key lang="en">Key</title-key>
-		<title-key lang="fr">Légende</title-key>
-			
-		<title-where lang="en">where</title-where>
-		<title-where lang="fr">où</title-where>
 					
 		<title-descriptors lang="en">Descriptors</title-descriptors>
 		
@@ -2630,25 +2632,6 @@
 			
 		</title-subpart>
 		
-		<title-modified lang="en">modified</title-modified>
-		<title-modified lang="fr">modifiée</title-modified>
-		
-			<title-modified lang="zh">modified</title-modified>
-		
-		
-		
-		<title-source lang="en">
-			
-				<xsl:text>SOURCE</xsl:text>
-						
-			 
-		</title-source>
-		
-		<title-keywords lang="en">Keywords</title-keywords>
-		
-		<title-deprecated lang="en">DEPRECATED</title-deprecated>
-		<title-deprecated lang="fr">DEPRECATED</title-deprecated>
-				
 		<title-list-tables lang="en">List of Tables</title-list-tables>
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
@@ -2657,37 +2640,8 @@
 		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
-		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
-		
-		<title-abstract lang="en">Abstract</title-abstract>
-		
 		<title-summary lang="en">Summary</title-summary>
 		
-		<title-in lang="en">in </title-in>
-		
-		<title-partly-supercedes lang="en">Partly Supercedes </title-partly-supercedes>
-		<title-partly-supercedes lang="zh">部分代替 </title-partly-supercedes>
-		
-		<title-completion-date lang="en">Completion date for this manuscript</title-completion-date>
-		<title-completion-date lang="zh">本稿完成日期</title-completion-date>
-		
-		<title-issuance-date lang="en">Issuance Date: #</title-issuance-date>
-		<title-issuance-date lang="zh"># 发布</title-issuance-date>
-		
-		<title-implementation-date lang="en">Implementation Date: #</title-implementation-date>
-		<title-implementation-date lang="zh"># 实施</title-implementation-date>
-
-		<title-obligation-normative lang="en">normative</title-obligation-normative>
-		<title-obligation-normative lang="zh">规范性附录</title-obligation-normative>
-		
-		<title-caution lang="en">CAUTION</title-caution>
-		<title-caution lang="zh">注意</title-caution>
-			
-		<title-warning lang="en">WARNING</title-warning>
-		<title-warning lang="zh">警告</title-warning>
-		
-		<title-amendment lang="en">AMENDMENT</title-amendment>
-		
 		<title-continued lang="en">(continued)</title-continued>
 		<title-continued lang="fr">(continué)</title-continued>
 		
@@ -2786,6 +2740,10 @@
 		
 		
 		
+			<xsl:attribute name="space-before">8pt</xsl:attribute>
+			<xsl:attribute name="space-after">8pt</xsl:attribute>
+		
+		
 		
 		
 		
@@ -2798,7 +2756,11 @@
 		
 		
 		
+			<xsl:attribute name="margin-left">10mm</xsl:attribute>
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-name-style">
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 		
 		
 		
@@ -2823,6 +2785,9 @@
 		
 		
 		
+			<xsl:attribute name="margin-top">5pt</xsl:attribute>
+		
+		
 		
 		
 		
@@ -3185,7 +3150,7 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents">
+	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:variable name="ace_tag">ace-tag_</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
@@ -4538,12 +4503,9 @@
 								
 								
 								<xsl:variable name="title-where">
-									
-									
-										<xsl:call-template name="getTitle">
-											<xsl:with-param name="name" select="'title-where'"/>
-										</xsl:call-template>
-									
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">where</xsl:with-param>
+									</xsl:call-template>
 								</xsl:variable>
 								<xsl:value-of select="$title-where"/>
 							</fo:block>
@@ -4566,12 +4528,9 @@
 							
 							
 							<xsl:variable name="title-where">
-								
-								
-									<xsl:call-template name="getTitle">
-										<xsl:with-param name="name" select="'title-where'"/>
-									</xsl:call-template>
-																
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">where</xsl:with-param>
+								</xsl:call-template>
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -4586,12 +4545,9 @@
 							
 							
 							<xsl:variable name="title-key">
-								
-								
-									<xsl:call-template name="getTitle">
-										<xsl:with-param name="name" select="'title-key'"/>
-									</xsl:call-template>
-								
+								<xsl:call-template name="getLocalizedString">
+									<xsl:with-param name="key">key</xsl:with-param>
+								</xsl:call-template>
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -4925,6 +4881,15 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='add']">
 		<xsl:choose>
+			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
+				<fo:inline>
+					<xsl:call-template name="insertTag">
+						<xsl:with-param name="type" select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end -->
+						<xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
+						<xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+					</xsl:call-template>
+				</fo:inline>
+			</xsl:when>
 			<xsl:when test="@amendment">
 				<fo:inline>
 					<xsl:call-template name="insertTag">
@@ -4959,7 +4924,6 @@
 				</fo:inline>
 			</xsl:otherwise>
 		</xsl:choose>
-		
 	</xsl:template><xsl:template name="insertTag">
 		<xsl:param name="type"/>
 		<xsl:param name="kind"/>
@@ -4975,14 +4939,14 @@
 				<xsl:attribute name="scaling">uniform</xsl:attribute>
 				<svg xmlns="http://www.w3.org/2000/svg" width="{$maxwidth + 32}" height="80">
 					<g>
-						<xsl:if test="$type = 'closing'">
+						<xsl:if test="$type = 'closing' or $type = 'end'">
 							<xsl:attribute name="transform">scale(-1 1) translate(-<xsl:value-of select="$maxwidth + 32"/>,0)</xsl:attribute>
 						</xsl:if>
 						<polyline points="0,0 {$maxwidth},0 {$maxwidth + 30},40 {$maxwidth},80 0,80 " stroke="black" stroke-width="5" fill="white"/>
 						<line x1="0" y1="0" x2="0" y2="80" stroke="black" stroke-width="20"/>
 					</g>
 					<text font-family="Arial" x="15" y="57" font-size="40pt">
-						<xsl:if test="$type = 'closing'">
+						<xsl:if test="$type = 'closing' or $type = 'end'">
 							<xsl:attribute name="x">25</xsl:attribute>
 						</xsl:if>
 						<xsl:value-of select="$kind"/><tspan dy="10" font-size="30pt"><xsl:value-of select="$value"/></tspan>
@@ -5479,9 +5443,9 @@
 		<fo:inline role="H{$level}"><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='appendix']//*[local-name()='example']" priority="2">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-example-style">			
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+			<xsl:apply-templates select="*[local-name()='name']"/>
 		</fo:block>
-		<xsl:apply-templates/>
+		<xsl:apply-templates select="node()[not(local-name()='name')]"/>
 	</xsl:template><xsl:template match="*[local-name() = 'callout']">		
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}">&lt;<xsl:apply-templates/>&gt;</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'annotation']">
@@ -6076,11 +6040,58 @@
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="node()" mode="contents">
 		<xsl:apply-templates mode="contents"/>
+	</xsl:template><xsl:template match="*[local-name() = 'p'][@type = 'floating-title']" priority="2" mode="contents">
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel">
+				<xsl:with-param name="depth" select="@depth"/>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:variable name="section">
+			<xsl:value-of select="*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+		</xsl:variable>
+		
+		<xsl:variable name="type">floating-title</xsl:variable>
+			
+		<xsl:variable name="display">
+			<xsl:choose>
+				<xsl:when test="normalize-space(@id) = ''">false</xsl:when>
+				<xsl:when test="$level &lt;= $toc_level">true</xsl:when>
+				<xsl:otherwise>false</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
+		<xsl:variable name="skip">false</xsl:variable>
+
+		<xsl:if test="$skip = 'false'">		
+		
+			<xsl:variable name="title">
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'tab']">
+						<xsl:copy-of select="*[local-name() = 'tab'][1]/following-sibling::node()"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:copy-of select="node()"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			
+			<xsl:variable name="root">
+				<xsl:if test="ancestor-or-self::*[local-name() = 'preface']">preface</xsl:if>
+				<xsl:if test="ancestor-or-self::*[local-name() = 'annex']">annex</xsl:if>
+			</xsl:variable>
+			
+			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
+				<title>
+					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+				</title>
+			</item>
+		</xsl:if>
 	</xsl:template><xsl:template match="node()" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template match="*[local-name() = 'title' or local-name() = 'name']//*[local-name() = 'stem']" mode="contents">
 		<xsl:apply-templates select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+	</xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'references']/*[local-name() = 'bibitem']" mode="contents"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
 		<xsl:apply-templates mode="bookmarks"/>
 	</xsl:template><xsl:template name="addBookmarks">
 		<xsl:param name="contents"/>
@@ -6251,7 +6262,10 @@
 			</fo:block>
 		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']"/><xsl:template match="*[local-name() = 'title']" mode="contents_item">
-		<xsl:apply-templates mode="contents_item"/>
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="mode" select="$mode"/>
+		</xsl:apply-templates>
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template><xsl:template name="getSection">
 		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
@@ -6324,6 +6338,18 @@
 		<xsl:copy-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'name']" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:apply-templates mode="contents_item">
+			<xsl:with-param name="mode" select="$mode"/>
+		</xsl:apply-templates>
+	</xsl:template><xsl:template match="*[local-name() = 'add'][starts-with(text(), $ace_tag)]" mode="contents_item">
+		<xsl:param name="mode">bookmarks</xsl:param>
+		<xsl:if test="$mode = 'contents'">
+			<xsl:copy>
+				<xsl:apply-templates mode="contents_item"/>
+			</xsl:copy>		
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
 	
 		<fo:block-container margin-left="0mm">
@@ -6660,42 +6686,54 @@
 		<fo:block id="{@id}" xsl:use-attribute-sets="example-style">
 			
 			
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-			
-			<xsl:variable name="element">
+			<xsl:variable name="fo_element">
+				<xsl:if test=".//*[local-name() = 'table'] or .//*[local-name() = 'dl']">block</xsl:if> 
 								
-				inline
-				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if> 
+				
+				
+					<xsl:choose>
+						<!-- if example contains only one (except 'name') element (paragraph for example), then display it on the same line as EXAMPLE title -->
+						<xsl:when test="count(*[not(local-name() = 'name')]) = 1">inline</xsl:when>
+						<xsl:otherwise>block</xsl:otherwise>
+					</xsl:choose>
+				
 			</xsl:variable>
 			
+			<!-- display 'EXAMPLE' -->
+			<xsl:apply-templates select="*[local-name()='name']">
+				<xsl:with-param name="fo_element" select="$fo_element"/>
+			</xsl:apply-templates>
+			
 			<xsl:choose>
-				<xsl:when test="contains(normalize-space($element), 'block')">
-					<fo:block xsl:use-attribute-sets="example-body-style">
-						<xsl:apply-templates/>
-					</fo:block>
+				<xsl:when test="contains(normalize-space($fo_element), 'block')">
+					<fo:block-container xsl:use-attribute-sets="example-body-style">
+						<fo:block-container margin-left="0mm" margin-right="0mm">
+							<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+								<xsl:with-param name="fo_element" select="$fo_element"/>
+							</xsl:apply-templates>
+						</fo:block-container>
+					</fo:block-container>
 				</xsl:when>
 				<xsl:otherwise>
 					<fo:inline>
-						<xsl:apply-templates/>
+						<xsl:apply-templates select="node()[not(local-name() = 'name')]">
+							<xsl:with-param name="fo_element" select="$fo_element"/>
+						</xsl:apply-templates>
 					</fo:inline>
 				</xsl:otherwise>
 			</xsl:choose>
 			
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']" mode="presentation">
-
-		<xsl:variable name="element">
-			
-			inline
-			<xsl:if test="following-sibling::*[1][local-name() = 'table']">block</xsl:if> 
-		</xsl:variable>		
+	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'name']">
+		<xsl:param name="fo_element">block</xsl:param>
+	
 		<xsl:choose>
 			<xsl:when test="ancestor::*[local-name() = 'appendix']">
 				<fo:inline>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
-			<xsl:when test="contains(normalize-space($element), 'block')">
+			<xsl:when test="contains(normalize-space($fo_element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
 					<xsl:apply-templates/>
 				</fo:block>
@@ -6708,14 +6746,15 @@
 		</xsl:choose>
 
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
+		<xsl:param name="fo_element">block</xsl:param>
+		
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
-			block
-			
 			
+			<xsl:value-of select="$fo_element"/>
 		</xsl:variable>		
 		<xsl:choose>			
-			<xsl:when test="normalize-space($element) = 'block'">
+			<xsl:when test="starts-with(normalize-space($element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-p-style">
 					
 					<xsl:apply-templates/>
@@ -6783,12 +6822,9 @@
 		</fo:basic-link>
 	</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:call-template name="getLocalizedString">
+				<xsl:with-param name="key">modified</xsl:with-param>
+			</xsl:call-template>
 		</xsl:variable>
 		
     <xsl:variable name="text"><xsl:apply-templates/></xsl:variable>
@@ -6979,12 +7015,9 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
-			
-				<xsl:call-template name="getLocalizedString">
-					<xsl:with-param name="key">deprecated</xsl:with-param>
-				</xsl:call-template>
-			
-			
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">deprecated</xsl:with-param>
+			</xsl:call-template>
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -6993,6 +7026,8 @@
 		<xsl:if test="*[local-name() = 'strong']">
 			<xsl:attribute name="font-weight">normal</xsl:attribute>
 		</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'preferred']/text()[contains(., ';')] | *[local-name() = 'preferred']/*[local-name() = 'strong']/text()[contains(., ';')]">
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.), ';', $linebreak)"/>
 	</xsl:template><xsl:template match="*[local-name() = 'definition']">
 		<fo:block xsl:use-attribute-sets="definition-style">
 			<xsl:apply-templates/>
@@ -7315,16 +7350,51 @@
 		
 		
 		
-		 
+		
+		
+		
+		
+		
+		
+		
+			<!-- start IEC bibtem processing -->
+			<xsl:variable name="docidentifier">
+				<xsl:choose>
+					<xsl:when test="*[local-name() = 'docidentifier']/@type = 'metanorma'"/>
+					<xsl:otherwise><xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma-ordinal')]"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:value-of select="$docidentifier"/>
+			<xsl:apply-templates select="iec:note"/>
+			<xsl:if test="normalize-space($docidentifier) != ''">, </xsl:if>
+			<xsl:choose>
+				<xsl:when test="iec:title[@type = 'main' and @language = 'en']">
+					<xsl:apply-templates select="iec:title[@type = 'main' and @language = 'en']"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="iec:title"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates select="iec:formattedref"/>
+			<!-- end IEC bibtem processing -->
 		
 		
 		 
 		
 		
+
+		
+
+		
+		<!-- end MPFD bibitem processing -->
 		
+		<!-- start M3D bibitem processing -->
+		
+		
+		 
 		
 	</xsl:template><xsl:template name="processBibitemDocId">
-		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
+		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'metanorma-ordinal' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
 		<xsl:choose>
 			<xsl:when test="normalize-space($_doc_ident) != ''">
 				<!-- <xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
@@ -7338,7 +7408,7 @@
 				<xsl:if test="$type != ''">
 					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
 				</xsl:if> -->
-				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
+				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma') and not(@type = 'metanorma-ordinal')]"/>
 			</xsl:otherwise>
 		</xsl:choose>
 	</xsl:template><xsl:template name="processPersonalAuthor">
@@ -7444,8 +7514,12 @@
 			<fo:block> </fo:block>
 		</fo:block-container>
 	</xsl:template><xsl:variable name="toc_level">
+		<!-- https://www.metanorma.org/author/ref/document-attributes/ -->
+		<xsl:variable name="htmltoclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'HTML TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- :htmltoclevels  Number of table of contents levels to render in HTML/PDF output; used to override :toclevels:-->
+		<xsl:variable name="toclevels" select="normalize-space(//*[local-name() = 'misc-container']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name']/text() = 'TOC Heading Levels']/*[local-name() = 'value'])"/> <!-- Number of table of contents levels to render -->
 		<xsl:choose>
-			<xsl:when test="1 = 2"/> <!-- to do https://github.com/metanorma/mn-native-pdf/issues/337: if there is value in xml -->
+			<xsl:when test="$htmltoclevels != ''"><xsl:value-of select="number($htmltoclevels)"/></xsl:when> <!-- if there is value in xml -->
+			<xsl:when test="$toclevels != ''"><xsl:value-of select="number($toclevels)"/></xsl:when>  <!-- if there is value in xml -->
 			<xsl:otherwise><!-- default value -->
 				
 				
@@ -7547,7 +7621,7 @@
 			</td>
 		</xsl:for-each>
 		<td>333</td> <!-- page number, just for fill -->
-	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
+	</xsl:template><xsl:template match="*[local-name() = 'variant-title']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
@@ -7919,9 +7993,15 @@
 	</xsl:template><xsl:template name="getLocalizedString">
 		<xsl:param name="key"/>
 		<xsl:param name="formatted">false</xsl:param>
+		<xsl:param name="lang"/>
 		
 		<xsl:variable name="curr_lang">
-			<xsl:call-template name="getLang"/>
+			<xsl:choose>
+				<xsl:when test="$lang != ''"><xsl:value-of select="$lang"/></xsl:when>
+				<xsl:otherwise>
+					<xsl:call-template name="getLang"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</xsl:variable>
 		
 		<xsl:variable name="data_value">