metanorma-iec 1.0.9 → 1.2.0

data/lib/isodoc/iec/html/wordstyle.scss

@@ -1852,4 +1852,3 @@ ol
 ul
 	{margin-bottom:0cm;
 	margin-left:18pt;}
-

data/lib/isodoc/iec/html_convert.rb

@@ -1,6 +1,7 @@
 require "isodoc"
 require "metanorma-iso"
 require_relative "base_convert"
+require_relative "init"
 
 module IsoDoc
   module Iec
@@ -36,6 +37,7 @@ module IsoDoc
       end
 
       include BaseConvert
+      include Init
     end
   end
 end

data/lib/isodoc/iec/i18n-en.yaml

@@ -2,4 +2,17 @@ introduction: INTRODUCTION
 introduction_iev: INTRODUCTION<br/>Principles and rules followed
 foreword: FOREWORD
 IEC: INTERNATIONAL ELECTROTECHNICAL COMMISSION
+formula: Equation
+inequality: Inequality
 section_iev: Section
+term_def_boilerplate: |
+      <p>ISO and IEC maintain terminological databases for use in
+      standardization at the following addresses:</p>
+
+      <ul>
+      <li> <p>IEC Electropedia: available at
+      <link target="http://www.electropedia.org"/>
+      </p> </li>
+      <li> <p>ISO Online browsing platform: available at
+        <link target="http://www.iso.org/obp"/></p> </li>
+      </ul>

data/lib/isodoc/iec/i18n-fr.yaml

@@ -1,5 +1,18 @@
 introduction: INTRODUCTION
 introduction_iev: INTRODUCTION<br/>Principes d’établissement et règles suivies
 foreword: AVANT-PROPOS
+formula: Equation
+inequality: Inégalité
 IEC: COMMISSION ELECTROTECHNIQUE INTERNATIONALE
 section_iev: Section
+term_def_boilerplate: |
+      <p>L'ISO et l'IEC tiennent à jour des bases de données terminologiques
+      destinées à être utilisées en normalisation, consultables aux adresses
+      suivantes:</p>
+      <ul>
+      <li> <p>IEC Electropedia: disponible à l'adresse
+        <link target="http://www.electropedia.org"/>
+      </p> </li>
+      <li> <p>ISO Online browsing platform: disponible à l'adresse
+        <link target="http://www.iso.org/obp"/></p> </li>
+      </ul>

data/lib/isodoc/iec/i18n-zh-Hans.yaml

@@ -1,3 +1,14 @@
 introduction: 引言
 foreword: 前言
 IEC: 国际电工委员会
+formula: 方程式
+inequality: 不等式
+term_def_boilerplate: |
+      <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
+      <ul>
+      <li> <p>IEC Electropedia:
+        位于<link target="http://www.electropedia.org"/>
+      </p> </li>
+      <li> <p>ISO在线浏览平台:
+        位于<link target="http://www.iso.org/obp"/></p></li>
+      </ul>

data/lib/isodoc/iec/i18n.rb

@@ -0,0 +1,19 @@
+module IsoDoc
+  module Iec
+    class I18n < IsoDoc::Iso::I18n
+      def load_yaml1(lang, script)
+        y = if lang == "en"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            elsif lang == "fr"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-fr.yaml"))
+            elsif lang == "zh" && script == "Hans"
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+            else
+              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
+            end
+        super.merge(y)
+      end
+    end
+  end
+end
+

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

@@ -1,9 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iec="https://www.metanorma.org/ns/iec" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
 
 	<xsl:output method="xml" encoding="UTF-8" indent="no"/>
 	
 	
 	
+	<xsl:param name="additionalXMLs" select="''"/> <!-- iec-rice.fr.xml  -->
+	
+	<xsl:variable name="additionalXMLsArray">
+		<xsl:call-template name="split">
+			<xsl:with-param name="pText" select="normalize-space($additionalXMLs)"/>
+		</xsl:call-template>
+	</xsl:variable>
+	
 	
 	
 	<xsl:variable name="debug">false</xsl:variable>
@@ -15,23 +23,18 @@
   <xsl:variable name="lang-1st-letter" select="''"/>
 	<xsl:variable name="ISOname" select="/iec:iec-standard/iec:bibdata/iec:docidentifier[@type='iso']"/>
 	
-	<!-- Information and documentation — Codes for transcription systems  -->
-	<xsl:variable name="title-en" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'en' and @type = 'main']"/>
-	<xsl:variable name="title-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'main']"/>
-
 	<xsl:variable name="title-intro" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'en' and @type = 'title-intro']"/>
 	<xsl:variable name="title-intro-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'title-intro']"/>
 	<xsl:variable name="title-main" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'en' and @type = 'title-main']"/>
 	<xsl:variable name="title-main-fr" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'fr' and @type = 'title-main']"/>
 	<xsl:variable name="part" select="/iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:project-number/@part"/>
 	
+	<xsl:variable name="doctype_uppercased" select="java:toUpperCase(java:java.lang.String.new(translate(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype,'-',' ')))"/>
+	 
 	
-	<xsl:variable name="doctype_uppercased" select="translate(translate(/iec:iec-standard/iec:bibdata/iec:ext/iec:doctype,'-',' '), $lower,$upper)"/>
-	
-	<xsl:variable name="organization" select="translate(/iec:iec-standard/iec:bibdata/iec:contributor/iec:organization/iec:name, $lower, $upper)"/>
-	
-	<xsl:variable name="publisher" select="translate(/iec:iec-standard/iec:bibdata/iec:contributor[iec:role/@type = 'publisher']/iec:organization/iec:name, $lower, $upper)"/>
-	
+	 	
+	<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:variable name="stage" select="number(/iec:iec-standard/iec:bibdata/iec:status/iec:stage)"/>
 	<xsl:variable name="substage" select="number(/iec:iec-standard/iec:bibdata/iec:status/iec:substage)"/>	
 	<xsl:variable name="stagename" select="normalize-space(/iec:iec-standard/iec:bibdata/iec:ext/iec:stagename)"/>
@@ -56,8 +59,8 @@
 	
 	<xsl:variable name="stage-fullname-uppercased">
 		<xsl:choose>
-			<xsl:when test="$stagename != ''">
-				<xsl:value-of select="translate($stagename, $lower, $upper)"/>
+			<xsl:when test="$stagename != ''">				
+				<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($stagename))"/>
 			</xsl:when>
 			<xsl:when test="$stage-abbreviation = 'NWIP' or                $stage-abbreviation = 'NP'">NEW WORK ITEM PROPOSAL</xsl:when>
 			<xsl:when test="$stage-abbreviation = 'PWI'">PRELIMINARY WORK ITEM</xsl:when>
@@ -77,33 +80,65 @@
 		<item id="term-script" display="false">3.2</item>
 	-->
 	<xsl:variable name="contents">
+		<xsl:variable name="docid">
+			<xsl:call-template name="getDocumentId"/>
+		</xsl:variable>
+		<doc id="{$docid}">
+			<xsl:call-template name="generateContents"/>
+		</doc>
+		
+		<xsl:for-each select="xalan:nodeset($additionalXMLsArray)/*">
+			<xsl:for-each select="document(.)">
+				<xsl:variable name="lang">
+					<xsl:call-template name="getLang"/>
+				</xsl:variable>	
+				<xsl:variable name="document">
+					<xsl:apply-templates mode="change_id">
+						<xsl:with-param name="lang" select="$lang"/>
+					</xsl:apply-templates>
+				</xsl:variable>						
+				<xsl:for-each select="xalan:nodeset($document)">
+					<xsl:variable name="docid">
+						<xsl:call-template name="getDocumentId"/>
+					</xsl:variable>
+					<doc id="{$docid}">
+						<xsl:call-template name="generateContents"/>
+					</doc>
+				</xsl:for-each>
+			</xsl:for-each>
+		</xsl:for-each>
+		
+		
+	</xsl:variable>
+
+	<xsl:template name="generateContents">
 		<contents>
 		
 			<xsl:apply-templates select="/iec:iec-standard/iec:preface/node()" mode="contents"/>
 				<!-- <xsl:with-param name="sectionNum" select="'0'"/>
 			</xsl:apply-templates> -->
-			<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:clause[@id='_scope']" mode="contents"> <!-- [@id = '_scope'] -->
+			<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]" mode="contents"> <!-- [@id = '_scope'] -->
 				<xsl:with-param name="sectionNum" select="'1'"/>
 			</xsl:apply-templates>
-			<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[@id = '_normative_references' or @id = '_references']" mode="contents"> <!-- [@id = '_normative_references'] -->
-				<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[@id='_scope']) + 1"/>
+			<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[starts-with(@id, '_normative_references') or starts-with(@id, '_references')]" mode="contents"> <!-- [@id = '_normative_references'] -->
+				<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]) + 1"/>
 			</xsl:apply-templates>
 			
 			<!-- Terms and definitions -->
 			<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:terms" mode="contents">
-				<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[@id='_scope']) +                                 count(/iec:iec-standard/iec:bibliography/iec:references[@id = '_normative_references' or @id = '_references']) + 1"/>
+				<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]) +                                 count(/iec:iec-standard/iec:bibliography/iec:references[starts-with(@id, '_normative_references') or starts-with(@id, '_references')]) + 1"/>
 			</xsl:apply-templates>
 			
-			<xsl:apply-templates select="/iec:iec-standard/iec:sections/*[local-name() != 'terms' and not(@id='_scope')]" mode="contents">
-				<xsl:with-param name="sectionNumSkew" select="count(/iec:iec-standard/iec:sections/iec:clause[@id='_scope']) +                                 count(/iec:iec-standard/iec:bibliography/iec:references[@id = '_normative_references' or @id = '_references']) +                                 count(/iec:iec-standard/iec:sections/iec:terms)"/>
+			<xsl:apply-templates select="/iec:iec-standard/iec:sections/*[local-name() != 'terms' and not(starts-with(@id, '_scope'))]" mode="contents">
+				<xsl:with-param name="sectionNumSkew" select="count(/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]) +                                 count(/iec:iec-standard/iec:bibliography/iec:references[starts-with(@id, '_normative_references') or starts-with(@id, '_references')]) +                                 count(/iec:iec-standard/iec:sections/iec:terms)"/>
 			</xsl:apply-templates>
 			
 			<xsl:apply-templates select="/iec:iec-standard/iec:annex" mode="contents"/>
-			<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[not(@id = '_normative_references' or @id = '_references')]" mode="contents"/> <!-- @id = '_bibliography' -->
+			<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[not(starts-with(@id, '_normative_references') or starts-with(@id, '_references'))]" mode="contents"/> <!-- @id = '_bibliography' -->
 			
 		</contents>
-	</xsl:variable>
-
+	</xsl:template>
+	
 	<xsl:variable name="color_blue">rgb(0, 90, 162)</xsl:variable>
 	<xsl:variable name="color_gray">rgb(157, 158, 160)</xsl:variable>
 	
@@ -167,46 +202,7 @@
 				</fo:simple-page-master>
 			</fo:layout-master-set>
 
-
-			
-			<fo:declarations>
-				<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
-						<pdf:dictionary type="normal" key="ViewerPreferences">
-							<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
-						</pdf:dictionary>
-					</pdf:catalog>
-				<x:xmpmeta xmlns:x="adobe:ns:meta/">
-					<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-						<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
-						<!-- Dublin Core properties go here -->
-							<dc:title>
-								<xsl:choose>
-									<xsl:when test="$title-en != ''">
-										<xsl:value-of select="$title-en"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<xsl:text> </xsl:text>
-									</xsl:otherwise>
-								</xsl:choose>
-							</dc:title>
-							<dc:creator/>
-							<dc:description>
-								<xsl:variable name="abstract">
-									<xsl:copy-of select="/iec:iec-standard/iec:bibliography/iec:references/iec:bibitem/iec:abstract[@language = 'en']//text()"/>
-								</xsl:variable>
-								<xsl:value-of select="normalize-space($abstract)"/>
-							</dc:description>
-							<pdf:Keywords>
-								<xsl:call-template name="insertKeywords"/>
-							</pdf:Keywords>
-						</rdf:Description>
-						<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
-							<!-- XMP properties go here -->
-							<xmp:CreatorTool/>
-						</rdf:Description>
-					</rdf:RDF>
-				</x:xmpmeta>
-			</fo:declarations>
+			<xsl:call-template name="addPDFUAmeta"/>
 
 			<!-- For 'Published' documents insert two cover pages -->
 			<xsl:if test="$stage &gt;= 60">
@@ -921,230 +917,77 @@
 				<xsl:call-template name="insertHeaderFooter"/>
 				<fo:flow flow-name="xsl-region-body">
 					
-					<fo:block-container>
-						<fo:block font-size="12pt" text-align="center" margin-bottom="22pt">
-							<xsl:call-template name="addLetterSpacing">
-								<xsl:with-param name="text" select="'CONTENTS'"/>
-							</xsl:call-template>
-						</fo:block>
-						
-						<xsl:if test="$debug = 'true'">
-							<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
-								DEBUG
-								contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
-							<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
-						</xsl:if>
-						
-						<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']                                              [@level &lt;= 3]                                              [not(@level = 2 and starts-with(@section, '0'))]"><!-- skip clause from preface -->
-							<fo:block text-align-last="justify">
-								<xsl:if test="@level = 1">
-									<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
-								</xsl:if>
-								<xsl:if test="@level = 2">
-									<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
-								</xsl:if>
-								<xsl:if test="@level = 3">
-									<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
-								</xsl:if>
-								<!-- <xsl:if test="@level &gt;= 2 and @section != ''">
-									<xsl:attribute name="margin-left">5mm</xsl:attribute>
-								</xsl:if> -->
-								
-								<!-- <xsl:choose>
-									<xsl:when test="@section != '' and not(@display-section = 'false')"> -->
-										<fo:list-block>
-											<xsl:attribute name="margin-left">
-												<xsl:choose>
-													<xsl:when test="@level = 2">8mm</xsl:when>
-													<xsl:when test="@level = 3">23mm</xsl:when>
-													<xsl:otherwise>0mm</xsl:otherwise>
-												</xsl:choose>
-											</xsl:attribute>
-											<xsl:attribute name="provisional-distance-between-starts">
-												<xsl:choose>
-													<xsl:when test="@display-section = 'false' or @section = ''">0mm</xsl:when>
-													<xsl:when test="@level = 1">8mm</xsl:when>
-													<xsl:when test="@level = 2">15mm</xsl:when>
-													<xsl:when test="@level = 3">19mm</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="not(@display-section = 'false')">
-															<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">
-														<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
-															<xsl:if test="@type = 'annex'">
-																<fo:inline><xsl:value-of select="@section"/></fo:inline>
-																	<xsl:if test="@addon != ''">
-																		<fo:inline> (<xsl:value-of select="@addon"/>) </fo:inline>
-																	</xsl:if>
-															</xsl:if>
-															<xsl:call-template name="addLetterSpacing">
-																<xsl:with-param name="text" select="text()"/>
-															</xsl:call-template>
-															<xsl:text> </xsl:text>
-															<fo:inline keep-together.within-line="always">
-																<fo:leader leader-pattern="dots"/>
-																<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
-															</fo:inline>
-														</fo:basic-link>
-													</fo:block>
-												</fo:list-item-body>
-											</fo:list-item>
-										</fo:list-block>
-							</fo:block>
-						</xsl:for-each>
-						
-						<xsl:if test="xalan:nodeset($contents)//item[@type = 'figure']">
-							<fo:block margin-bottom="5pt"> </fo:block>
-							<!-- <fo:block margin-top="5pt" margin-bottom="10pt">&#xA0;</fo:block> -->
-							<xsl:for-each select="xalan:nodeset($contents)//item[@type = 'figure']">
-								<fo:block text-align-last="justify" margin-bottom="5pt" margin-left="8mm" text-indent="-8mm">
-									<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
-										<xsl:value-of select="@section"/>
-										<xsl:if test="text() != ''">
-											<xsl:text> – </xsl:text>
-											<xsl:value-of select="text()"/><xsl:text> </xsl:text>
-										</xsl:if>
-										<fo:inline keep-together.within-line="always">
-											<fo:leader leader-pattern="dots"/>
-											<fo:page-number-citation ref-id="{@id}"/>
-										</fo:inline>
-									</fo:basic-link>
-								</fo:block>
-							</xsl:for-each>
-						</xsl:if>
-						
-						<xsl:if test="xalan:nodeset($contents)//item[@type = 'table']">
-							<fo:block margin-bottom="5pt"> </fo:block>
-							<!-- <fo:block margin-top="5pt" margin-bottom="10pt">&#xA0;</fo:block> -->
-							<xsl:for-each select="xalan:nodeset($contents)//item[@type = 'table' and @display = 'true']">
-								<fo:block text-align-last="justify" margin-bottom="5pt" margin-left="8mm" text-indent="-8mm">
-									<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
-										<xsl:value-of select="@section"/>
-										<xsl:if test="text() != ''">
-											<xsl:text> – </xsl:text>
-											<xsl:value-of select="text()"/><xsl:text> </xsl:text>
-										</xsl:if>
-										<fo:inline keep-together.within-line="always">
-											<fo:leader leader-pattern="dots"/>
-											<fo:page-number-citation ref-id="{@id}"/>
-										</fo:inline>
-									</fo:basic-link>
-								</fo:block>
-							</xsl:for-each>
-						</xsl:if>
-
-					</fo:block-container>
+					<xsl:variable name="docid">
+						<xsl:call-template name="getDocumentId"/>
+					</xsl:variable>
 					
-					<fo:block break-after="page"/>
+					<xsl:if test="$debug = 'true'">
+						<xsl:text disable-output-escaping="yes">&lt;!--</xsl:text>
+							DEBUG
+							contents=<xsl:copy-of select="xalan:nodeset($contents)"/>
+						<xsl:text disable-output-escaping="yes">--&gt;</xsl:text>
+					</xsl:if>
 					
-					<fo:block-container font-size="12pt" text-align="center" margin-bottom="18pt">
-						<fo:block><xsl:value-of select="$organization"/></fo:block>
-						<fo:block>___________</fo:block>
-						<fo:block> </fo:block>
-						<fo:block font-weight="bold">
-							<xsl:value-of select="translate($title-intro, $lower, $upper)"/>
-							<xsl:text> — </xsl:text>
-							<xsl:value-of select="translate($title-main, $lower, $upper)"/>
-							
-							<xsl:variable name="part-en" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'en' and @type = 'title-part']"/>
-							<xsl:if test="$part-en != ''">
-								<xsl:text> — </xsl:text>
-								<fo:block> </fo:block>
-								<fo:block>
-									<xsl:if test="$part != ''">
-										<xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
-										<xsl:text>: </xsl:text>
-									</xsl:if>
-									<xsl:value-of select="$part-en"/>
-								</fo:block>
-							</xsl:if>
-						</fo:block>
-					</fo:block-container>
+					<xsl:call-template name="insertTOCpages">
+						<xsl:with-param name="contents" select="xalan:nodeset($contents)/doc[@id = $docid]"/>
+					</xsl:call-template>
+					
+					<xsl:call-template name="insertPrefacepages"/>
 					
-					<!-- Foreword, Introduction -->
-					<xsl:apply-templates select="/iec:iec-standard/iec:preface/*"/>
-						
 				</fo:flow>
 			</fo:page-sequence>
 			
-			<!-- BODY -->
-			<fo:page-sequence master-reference="document" force-page-count="no-force">
-				<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 font-size="12pt" text-align="center" margin-bottom="36pt">
-						<!-- <fo:block><xsl:value-of select="$organization"/></fo:block>
-						<fo:block>____________</fo:block>
-						<fo:block>&#xa0;</fo:block> -->
-						<fo:block font-weight="bold">
-							<xsl:value-of select="translate($title-intro, $lower, $upper)"/>
-							<xsl:text> — </xsl:text>
-							<xsl:value-of select="translate($title-main, $lower, $upper)"/>
-							<xsl:variable name="part-en" select="/iec:iec-standard/iec:bibdata/iec:title[@language = 'en' and @type = 'title-part']"/>
-							<xsl:if test="$part-en != ''">
-								<xsl:text> — </xsl:text>
-								<fo:block> </fo:block>
-								<fo:block>
-									<xsl:if test="$part != ''">
-										<xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
-										<xsl:text>: </xsl:text>
-									</xsl:if>
-									<xsl:value-of select="$part-en"/>
-								</fo:block>
-							</xsl:if>
-							<fo:block> </fo:block>
-						</fo:block>
-					</fo:block-container>
-					
-					<!-- Clause(s) -->
-					<fo:block>
-					
-						
-						<!-- Scope -->
-						<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:clause[@id='_scope']">
-							<xsl:with-param name="sectionNum" select="'1'"/>
-						</xsl:apply-templates>
+			
+			<xsl:call-template name="insertBodypages"/>
+				
+				
+				
+			<!-- Test=<xsl:copy-of select="$additionalDocs"/> Test -->
+			<xsl:for-each select="xalan:nodeset($additionalXMLsArray)/*">
 
-						 <!-- Normative references  -->
-						<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[@id = '_normative_references' or @id = '_references']">
-							<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[@id='_scope']) + 1"/>
-						</xsl:apply-templates>
-						
-						<!-- Terms and definitions -->
-						<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:terms">
-							<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[@id='_scope']) +                                    count(/iec:iec-standard/iec:bibliography/iec:references[@id = '_normative_references' or @id = '_references']) + 1"/>
-						</xsl:apply-templates>
-						
-						 <!-- main sections -->
-						  <!-- *[position() &gt; 1] -->
-						<xsl:apply-templates select="/iec:iec-standard/iec:sections/*[local-name() != 'terms' and not(@id='_scope')]">
-							<xsl:with-param name="sectionNumSkew" select="count(/iec:iec-standard/iec:sections/iec:clause[@id='_scope']) +                                    count(/iec:iec-standard/iec:bibliography/iec:references[@id = '_normative_references' or @id = '_references']) +                                    count(/iec:iec-standard/iec:sections/iec:terms)"/>
+				<xsl:for-each select="document(.)">
+					<xsl:variable name="lang">
+						<xsl:call-template name="getLang"/>
+					</xsl:variable>	
+					<xsl:variable name="document">
+						<xsl:apply-templates mode="change_id">
+							<xsl:with-param name="lang" select="$lang"/>
 						</xsl:apply-templates>
+					</xsl:variable>
+					
+
+					<xsl:for-each select="xalan:nodeset($document)">
+					
+						<fo:page-sequence master-reference="document" force-page-count="no-force">
+							<xsl:call-template name="insertHeaderFooter"/>
+							<fo:flow flow-name="xsl-region-body">
+								
+								<xsl:variable name="docid">
+									<xsl:call-template name="getDocumentId"/>
+								</xsl:variable>
 						
-						<!-- Annex(s) -->
-						<xsl:apply-templates select="/iec:iec-standard/iec:annex"/>
-						
-						<!-- Bibliography -->
-						<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[not(@id = '_normative_references' or @id = '_references')]"/>
-						
-					</fo:block>
+								<xsl:call-template name="insertTOCpages">
+									<xsl:with-param name="contents" select="xalan:nodeset($contents)/doc[@id = $docid]"/>
+								</xsl:call-template>
+								
+								<xsl:call-template name="insertPrefacepages">
+									<xsl:with-param name="lang" select="$lang"/>
+								</xsl:call-template>
+								
+							</fo:flow>
+						</fo:page-sequence>
 					
-				</fo:flow>
-			</fo:page-sequence>
+						<xsl:call-template name="insertBodypages">
+							<xsl:with-param name="lang" select="$lang"/>
+						</xsl:call-template>
+					
+					
+					</xsl:for-each>
+				</xsl:for-each>
+			</xsl:for-each>
+			
+			
+			
 			
 			<xsl:if test="$stage &gt;= 60">
 				<fo:page-sequence master-reference="blank-page">
@@ -1200,8 +1043,13 @@
 			<fo:inline font-size="8pt" padding-left="0.5mm" color="rgb(88, 88, 90)">®</fo:inline>
 			<fo:inline keep-together.within-line="always" font-size="25pt" font-weight="bold" color="{$color_gray}" border-bottom="0.5pt solid {$color_gray}" padding-bottom="3.5mm" baseline-shift="5.5mm"><fo:leader leader-pattern="space"/><xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:docidentifier[@type = 'iso']"/></fo:inline>
 		</fo:block>
-		<fo:block font-size="10.5pt" text-align="right" margin-top="0.5mm">
-			<xsl:text>Edition </xsl:text>
+		<fo:block font-size="10.5pt" text-align="right" margin-top="0.5mm">			
+			<xsl:variable name="title-edition">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-edition'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:value-of select="$title-edition"/>
 			<fo:inline>
 				<xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:edition"/>
 				<xsl:if test="not(contains(/iec:iec-standard/iec:bibdata/iec:edition, '.'))">.0</xsl:if>
@@ -1290,8 +1138,9 @@
 						<xsl:text> — </xsl:text>
 						<xsl:value-of select="$linebreak"/>
 						<xsl:if test="$part != ''">
-							<xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
-							<xsl:text>: </xsl:text>
+							<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part)"/>
+							<!-- <xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
+							<xsl:text>: </xsl:text> -->
 						</xsl:if>
 						<xsl:value-of select="$part-en"/>
 					</xsl:if>
@@ -1310,8 +1159,9 @@
 						<xsl:text> — </xsl:text>
 						<xsl:value-of select="$linebreak"/>
 						<xsl:if test="$part != ''">
-							<xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
-							<xsl:text>: </xsl:text>
+							<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-part[@lang='en']),'#',$part)"/>
+							<!-- <xsl:text>Part </xsl:text><xsl:value-of select="$part"/>
+							<xsl:text>: </xsl:text> -->
 						</xsl:if>
 						<xsl:value-of select="$part-fr"/>
 					</xsl:if>
@@ -1320,6 +1170,235 @@
 		</fo:block-container>
 	</xsl:template>
 	
+	<xsl:template name="insertTOCpages">
+		<xsl:param name="contents"/>
+		<fo:block-container>
+			<fo:block font-size="12pt" text-align="center" margin-bottom="22pt">
+				<xsl:variable name="title-toc">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-toc'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:call-template name="addLetterSpacing">
+					<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
+				</xsl:call-template>
+			</fo:block>
+			
+			<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']                                           [@level &lt;= 3]                                           [not(@level = 2 and starts-with(@section, '0'))]"><!-- skip clause from preface -->
+				<fo:block text-align-last="justify">
+					<xsl:if test="@level = 1">
+						<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="@level = 2">
+						<xsl:attribute name="margin-bottom">3pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="@level = 3">
+						<xsl:attribute name="margin-bottom">2pt</xsl:attribute>
+					</xsl:if>
+					<!-- <xsl:if test="@level &gt;= 2 and @section != ''">
+						<xsl:attribute name="margin-left">5mm</xsl:attribute>
+					</xsl:if> -->
+					
+					<!-- <xsl:choose>
+						<xsl:when test="@section != '' and not(@display-section = 'false')"> -->
+							<fo:list-block>
+								<xsl:attribute name="margin-left">
+									<xsl:choose>
+										<xsl:when test="@level = 2">8mm</xsl:when>
+										<xsl:when test="@level = 3">23mm</xsl:when>
+										<xsl:otherwise>0mm</xsl:otherwise>
+									</xsl:choose>
+								</xsl:attribute>
+								<xsl:attribute name="provisional-distance-between-starts">
+									<xsl:choose>
+										<xsl:when test="@display-section = 'false' or @section = ''">0mm</xsl:when>
+										<xsl:when test="@level = 1">8mm</xsl:when>
+										<xsl:when test="@level = 2">15mm</xsl:when>
+										<xsl:when test="@level = 3">19mm</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="not(@display-section = 'false')">
+												<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">
+											<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
+												<xsl:if test="@type = 'annex'">
+													<fo:inline><xsl:value-of select="@section"/></fo:inline>
+														<xsl:if test="@addon != ''">
+															<fo:inline> (<xsl:value-of select="@addon"/>) </fo:inline>
+														</xsl:if>
+												</xsl:if>
+												<xsl:call-template name="addLetterSpacing">
+													<xsl:with-param name="text" select="text()"/>
+												</xsl:call-template>
+												<xsl:text> </xsl:text>
+												<fo:inline keep-together.within-line="always">
+													<fo:leader leader-pattern="dots"/>
+													<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
+												</fo:inline>
+											</fo:basic-link>
+										</fo:block>
+									</fo:list-item-body>
+								</fo:list-item>
+							</fo:list-block>
+				</fo:block>
+			</xsl:for-each>
+			
+			<xsl:if test="xalan:nodeset($contents)//item[@type = 'figure']">
+				<fo:block margin-bottom="5pt"> </fo:block>
+				<!-- <fo:block margin-top="5pt" margin-bottom="10pt">&#xA0;</fo:block> -->
+				<xsl:for-each select="xalan:nodeset($contents)//item[@type = 'figure']">
+					<fo:block text-align-last="justify" margin-bottom="5pt" margin-left="8mm" text-indent="-8mm">
+						<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
+							<xsl:value-of select="@section"/>
+							<xsl:if test="text() != ''">
+								<xsl:text> – </xsl:text>
+								<xsl:value-of select="text()"/><xsl:text> </xsl:text>
+							</xsl:if>
+							<fo:inline keep-together.within-line="always">
+								<fo:leader leader-pattern="dots"/>
+								<fo:page-number-citation ref-id="{@id}"/>
+							</fo:inline>
+						</fo:basic-link>
+					</fo:block>
+				</xsl:for-each>
+			</xsl:if>
+			
+			<xsl:if test="xalan:nodeset($contents)//item[@type = 'table']">
+				<fo:block margin-bottom="5pt"> </fo:block>
+				<!-- <fo:block margin-top="5pt" margin-bottom="10pt">&#xA0;</fo:block> -->
+				<xsl:for-each select="xalan:nodeset($contents)//item[@type = 'table' and @display = 'true']">
+					<fo:block text-align-last="justify" margin-bottom="5pt" margin-left="8mm" text-indent="-8mm">
+						<fo:basic-link internal-destination="{@id}" fox:alt-text="{@section}">
+							<xsl:value-of select="@section"/>
+							<xsl:if test="text() != ''">
+								<xsl:text> – </xsl:text>
+								<xsl:value-of select="text()"/><xsl:text> </xsl:text>
+							</xsl:if>
+							<fo:inline keep-together.within-line="always">
+								<fo:leader leader-pattern="dots"/>
+								<fo:page-number-citation ref-id="{@id}"/>
+							</fo:inline>
+						</fo:basic-link>
+					</fo:block>
+				</xsl:for-each>
+			</xsl:if>
+
+		</fo:block-container>
+	</xsl:template>
+	
+	<xsl:template name="insertPrefacepages">
+		<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>___________</fo:block>
+			<fo:block> </fo:block>
+			<fo:block font-weight="bold">				
+				<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-intro']))"/>
+				<xsl:text> — </xsl:text>
+				<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-main']))"/>
+				
+				<xsl:variable name="title-part" select="/iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-part']"/>
+				<xsl:if test="$title-part != ''">
+					<xsl:text> — </xsl:text>
+					<fo:block> </fo:block>
+					<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:if>
+						<xsl:value-of select="$title-part"/>
+					</fo:block>
+				</xsl:if>
+			</fo:block>
+		</fo:block-container>
+		
+		<!-- Foreword, Introduction -->
+		<xsl:apply-templates select="/iec:iec-standard/iec:preface/*"/>
+	</xsl:template>
+	
+	
+	<xsl:template name="insertBodypages">
+		<xsl:param name="lang" select="'en'"/>
+		<!-- BODY -->
+		<fo:page-sequence master-reference="document" force-page-count="no-force">
+			<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 font-size="12pt" text-align="center" margin-bottom="36pt">
+					<!-- <fo:block><xsl:value-of select="$organization"/></fo:block>
+					<fo:block>____________</fo:block>
+					<fo:block>&#xa0;</fo:block> -->
+					<fo:block font-weight="bold">						
+						<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-intro']))"/>
+						<xsl:text> — </xsl:text>
+						<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(/iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-main']))"/>
+						<xsl:variable name="title-part" select="/iec:iec-standard/iec:bibdata/iec:title[@language = $lang and @type = 'title-part']"/>
+						<xsl:if test="$title-part != ''">
+							<xsl:text> — </xsl:text>
+							<fo:block> </fo:block>
+							<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:if>
+								<xsl:value-of select="$title-part"/>
+							</fo:block>
+						</xsl:if>
+						<fo:block> </fo:block>
+					</fo:block>
+				</fo:block-container>
+				
+				<!-- Clause(s) -->
+				<fo:block>
+				
+					
+					<!-- Scope -->
+					<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]">
+						<xsl:with-param name="sectionNum" select="'1'"/>
+					</xsl:apply-templates>
+
+					 <!-- Normative references  -->
+					<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[starts-with(@id, '_normative_references') or starts-with(@id, '_references')]">
+						<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]) + 1"/>
+					</xsl:apply-templates>
+					
+					<!-- Terms and definitions -->
+					<xsl:apply-templates select="/iec:iec-standard/iec:sections/iec:terms">
+						<xsl:with-param name="sectionNum" select="count(/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]) +                                   count(/iec:iec-standard/iec:bibliography/iec:references[starts-with(@id, '_normative_references') or starts-with(@id, '_references')]) + 1"/>
+					</xsl:apply-templates>
+					
+					 <!-- main sections -->
+						<!-- *[position() &gt; 1] -->
+					<xsl:apply-templates select="/iec:iec-standard/iec:sections/*[local-name() != 'terms' and not(starts-with(@id, '_scope'))]">
+						<xsl:with-param name="sectionNumSkew" select="count(/iec:iec-standard/iec:sections/iec:clause[starts-with(@id, '_scope')]) +                                   count(/iec:iec-standard/iec:bibliography/iec:references[starts-with(@id, '_normative_references') or starts-with(@id, '_references')]) +                                   count(/iec:iec-standard/iec:sections/iec:terms)"/>
+					</xsl:apply-templates>
+					
+					<!-- Annex(s) -->
+					<xsl:apply-templates select="/iec:iec-standard/iec:annex"/>
+					
+					<!-- Bibliography -->
+					<xsl:apply-templates select="/iec:iec-standard/iec:bibliography/iec:references[not(starts-with(@id, '_normative_references') or starts-with(@id, '_references'))]"/>
+					
+				</fo:block>
+				
+			</fo:flow>
+		</fo:page-sequence>
+	</xsl:template>
+	
 	<!-- for pass the paremeter 'sectionNum' over templates, like 'tunnel' parameter in XSLT 2.0 -->
 	<xsl:template match="node()">
 		<xsl:param name="sectionNum"/>
@@ -1352,7 +1431,7 @@
 			<xsl:choose>
 				<xsl:when test="$sectionNum"><xsl:value-of select="$sectionNum"/></xsl:when>
 				<xsl:when test="$sectionNumSkew != 0">					
-					<xsl:variable name="number"><xsl:number count="iec:sections/*[local-name() != 'terms' and not(@id='_scope')]"/></xsl:variable><!-- <xsl:number count="*"/> -->
+					<xsl:variable name="number"><xsl:number count="iec:sections/*[local-name() != 'terms' and not(starts-with(@id, '_scope'))]"/></xsl:variable><!-- <xsl:number count="*"/> -->
 					<xsl:value-of select="$number + $sectionNumSkew"/>
 				</xsl:when>
 				<xsl:otherwise>
@@ -1416,8 +1495,8 @@
 				<xsl:if test="local-name(..) = 'annex'"><xsl:value-of select="../@obligation"/></xsl:if>
 			</xsl:attribute>
 			<xsl:choose>
-				<xsl:when test="ancestor::iec:preface">
-					<xsl:value-of select="translate(., $lower, $upper)"/>
+				<xsl:when test="ancestor::iec:preface">					
+					<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:value-of select="."/>
@@ -1439,7 +1518,12 @@
 		</xsl:apply-templates>
 		<item level="" id="{@id}" display="false" type="figure">
 			<xsl:attribute name="section">
-				<xsl:text>Figure </xsl:text>
+				<xsl:variable name="title-figure">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-figure'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-figure"/>
 				<xsl:choose>
 					<xsl:when test="ancestor::iec:annex">
 						<xsl:choose>
@@ -1475,7 +1559,12 @@
 				<xsl:attribute name="display">false</xsl:attribute>
 			</xsl:if>
 			<xsl:attribute name="section">
-				<xsl:text>Table </xsl:text>
+				<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: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']"/>
@@ -1504,7 +1593,12 @@
 		<item level="" id="{@id}" display="false" type="formula">
 			<xsl:attribute name="section">
 				<!-- Formula -->
-				<xsl:text>Equation (</xsl:text><xsl:number format="A.1" level="multiple" count="iec:annex | iec:formula"/><xsl:text>)</xsl:text>
+				<xsl:variable name="title-equation">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-equation'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-equation"/><xsl:number format="(A.1)" level="multiple" count="iec:annex | iec:formula"/>
 			</xsl:attribute>
 			<xsl:attribute name="parentsection">
 				<xsl:for-each select="parent::*[1]/iec:title">
@@ -1574,7 +1668,7 @@
 	<xsl:template match="iec:iec-standard/iec:preface/iec:foreword" priority="2">
 		<fo:block id="{@id}" margin-bottom="12pt" font-size="12pt" text-align="center">
 			<xsl:call-template name="addLetterSpacing">
-				<xsl:with-param name="text" select="translate(iec:title, $lower, $upper)"/>
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(iec:title))"/>
 			</xsl:call-template>
 		</fo:block>
 		<fo:block font-size="8.2pt" text-align="justify"> <!--  margin-left="6.3mm" -->
@@ -1589,7 +1683,7 @@
 		<fo:block break-after="page"/>
 		<fo:block id="{@id}" margin-bottom="12pt" font-size="12pt" text-align="center">
 			<xsl:call-template name="addLetterSpacing">
-				<xsl:with-param name="text" select="translate(iec:title, $lower, $upper)"/>
+				<xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new(iec:title))"/>
 			</xsl:call-template>
 		</fo:block>
 		<fo:block>
@@ -1621,7 +1715,7 @@
 					<xsl:when test="$sectionNum"><xsl:value-of select="$sectionNum"/></xsl:when>
 					<xsl:when test="$sectionNumSkew != 0">
 						<!-- <xsl:variable name="number"><xsl:number count="iec:sections/iec:clause | iec:sections/iec:terms"/></xsl:variable> -->
-						<xsl:variable name="number"><xsl:number count="iec:sections/*[local-name() != 'terms' and not(@id='_scope')]"/></xsl:variable>
+						<xsl:variable name="number"><xsl:number count="iec:sections/*[local-name() != 'terms' and not(starts-with(@id, '_scope'))]"/></xsl:variable>
 						<xsl:value-of select="$number + $sectionNumSkew"/>
 					</xsl:when>
 				</xsl:choose>
@@ -1735,7 +1829,7 @@
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
-			<xsl:when test="$parent-name = 'references' and not(../@id = '_normative_references' or ../@id = '_references')"> <!-- Bibliography -->
+			<xsl:when test="$parent-name = 'references' and not(starts-with(../@id,  '_normative_references') or starts-with(../@id, '_references'))"> <!-- Bibliography -->
 				<fo:block id="{$id}" font-size="12pt" text-align="center" margin-bottom="12pt" keep-with-next="always">
 					<xsl:call-template name="addLetterSpacing">
 						<xsl:with-param name="text" select="."/>
@@ -1744,8 +1838,8 @@
 				</fo:block>
 			</xsl:when>
 			<xsl:when test="$parent-name = 'introduction'">
-				<fo:block id="{$id}" font-size="12pt" text-align="center" margin-bottom="10pt">
-					<xsl:value-of select="translate(text(), $lower, $upper)"/>
+				<fo:block id="{$id}" font-size="12pt" text-align="center" margin-bottom="10pt">					
+					<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(text()))"/>
 				</fo:block>
 			</xsl:when>
 			<xsl:otherwise>
@@ -1903,15 +1997,18 @@
 			<xsl:variable name="number">
 				<xsl:number level="any" count="iec:p/iec:fn"/>
 			</xsl:variable>
+			<xsl:variable name="lang">
+				<xsl:call-template name="getLang"/>
+			</xsl:variable>	
 			<fo:inline font-size="8pt" keep-with-previous.within-line="always" baseline-shift="15%"> <!-- font-size="80%"  vertical-align="super"-->
-				<fo:basic-link internal-destination="footnote_{@reference}" fox:alt-text="footnote {@reference}">
+				<fo:basic-link internal-destination="{$lang}_footnote_{@reference}" fox:alt-text="footnote {@reference}">
 					<!-- <xsl:value-of select="@reference"/> -->
 					<xsl:value-of select="$number + count(//iec:bibitem/iec:note)"/><!-- <xsl:text>)</xsl:text> -->
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="8pt" margin-bottom="5pt">
-					<fo:inline id="footnote_{@reference}" keep-with-next.within-line="always" baseline-shift="15%" padding-right="3mm"> <!-- padding-right="3mm" font-size="60%"  alignment-baseline="hanging" -->
+					<fo:inline id="{$lang}_footnote_{@reference}" keep-with-next.within-line="always" baseline-shift="15%" padding-right="3mm"> <!-- padding-right="3mm" font-size="60%"  alignment-baseline="hanging" -->
 						<xsl:value-of select="$number + count(//iec:bibitem/iec:note)"/><!-- <xsl:text>)</xsl:text> -->
 					</fo:inline>
 					<xsl:for-each select="iec:p">
@@ -1951,16 +2048,17 @@
 			<fo:block>
 				<fo:external-graphic src="{@src}" fox:alt-text="Image"/>
 			</fo:block>
-			<fo:block font-weight="bold" margin-top="12pt" margin-bottom="12pt">Figure <xsl:number format="1" level="any"/></fo:block>
+			<xsl:variable name="title-figure">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-figure'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<fo:block font-weight="bold" margin-top="12pt" margin-bottom="12pt"><xsl:value-of select="$title-figure"/><xsl:number format="1" level="any"/></fo:block>
 		</fo:block-container>
 		
 	</xsl:template>
 
-	<xsl:template match="iec:figure">
-		<xsl:variable name="title">
-			<xsl:text>Figure </xsl:text>
-		</xsl:variable>
-		
+	<xsl:template match="iec:figure">		
 		<fo:block-container id="{@id}">
 			<fo:block>
 				<xsl:apply-templates/>
@@ -1970,6 +2068,11 @@
 				<xsl:call-template name="note"/>
 			</xsl:for-each>
 			<fo:block font-weight="bold" text-align="center" margin-top="12pt" margin-bottom="12pt" keep-with-previous="always">
+				<xsl: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::iec:annex">
 						
@@ -1979,13 +2082,14 @@
 								<xsl:number format="a) "/>
 							</xsl:when>
 							<xsl:otherwise> -->
-								<xsl:value-of select="$title"/><xsl:number format="A.1-1" level="multiple" count="iec:annex | iec:figure"/>
+							
+								<xsl:value-of select="$title-figure"/><xsl:number format="A.1-1" level="multiple" count="iec:annex | iec:figure"/>
 							<!-- </xsl:otherwise>
 						</xsl:choose> -->
 						
 					</xsl:when>
 					<xsl:otherwise>
-						<xsl:value-of select="$title"/><xsl:number format="1" level="any"/>
+						<xsl:value-of select="$title-figure"/><xsl:number format="1" level="any"/>
 					</xsl:otherwise>
 				</xsl:choose>
 				<xsl:if test="iec:name">
@@ -2043,13 +2147,13 @@
 				<xsl:number level="any" count="iec:bibitem/iec:note"/>
 			</xsl:variable>
 			<fo:inline font-size="8pt" keep-with-previous.within-line="always" baseline-shift="15%"> <!--font-size="85%"  vertical-align="super"60% -->
-				<fo:basic-link internal-destination="footnote_{../@id}" fox:alt-text="footnote {$number}">
+				<fo:basic-link internal-destination="{generate-id()}" fox:alt-text="footnote {$number}">
 					<xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
 				</fo:basic-link>
 			</fo:inline>
 			<fo:footnote-body>
 				<fo:block font-size="8pt" margin-bottom="5pt">
-					<fo:inline id="footnote_{../@id}" keep-with-next.within-line="always" baseline-shift="15%" padding-right="3mm"><!-- padding-right="9mm" alignment-baseline="hanging"  font-size="60%"  -->
+					<fo:inline id="{generate-id()}" keep-with-next.within-line="always" baseline-shift="15%" padding-right="3mm"><!-- padding-right="9mm" alignment-baseline="hanging"  font-size="60%"  -->
 						<xsl:value-of select="$number"/><!-- <xsl:text>)</xsl:text> -->
 					</fo:inline>
 					<xsl:apply-templates/>
@@ -2118,11 +2222,20 @@
 		</fo:block>
 	</xsl:template>
 	
+	<xsl:template match="iec:term">
+		<xsl:param name="sectionNum"/>
+		<fo:block id="{@id}">
+			<xsl:apply-templates>
+				<xsl:with-param name="sectionNum" select="$sectionNum"/>
+			</xsl:apply-templates>
+		</fo:block>
+	</xsl:template>
+	
 	<xsl:template match="iec:preferred">
 		<xsl:param name="sectionNum"/>
 		<fo:block line-height="1.1" space-before="14pt">
 			<fo:block font-weight="bold" keep-with-next="always">
-				<fo:inline id="{../@id}">
+				<fo:inline>
 					<xsl:value-of select="$sectionNum"/>.<xsl:number count="iec:term"/>
 				</fo:inline>
 			</fo:block>
@@ -2139,7 +2252,12 @@
 	</xsl:template>
 	
 	<xsl:template match="iec:deprecates">
-		<fo:block font-size="8pt" margin-top="5pt" margin-bottom="5pt">DEPRECATED: <xsl:apply-templates/></fo:block>
+		<xsl:variable name="title-deprecated">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-deprecated'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<fo:block font-size="8pt" margin-top="5pt" margin-bottom="5pt"><xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/></fo:block>
 	</xsl:template>
 	
 	<xsl:template match="iec:definition[preceding-sibling::iec:domain]">
@@ -2160,7 +2278,14 @@
 		<fo:block margin-bottom="8pt" keep-with-previous="always">
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
 			<fo:basic-link internal-destination="{iec:origin/@bibitemid}" fox:alt-text="{iec:origin/@citeas}">
-				<xsl:text>[SOURCE: </xsl:text>
+				<xsl:text>[</xsl:text>
+				<xsl:variable name="title-source">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-source'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-source"/>
+				<xsl:text>: </xsl:text>
 				<xsl:value-of select="iec:origin/@citeas"/>
 				<xsl:apply-templates select="iec:origin/iec:localityStack"/>
 			</fo:basic-link>
@@ -2169,19 +2294,20 @@
 		</fo:block>
 	</xsl:template>
 	
-	<xsl:template match="iec:modification">
-		<xsl:text>, modified — </xsl:text>
-		<xsl:apply-templates/>
-	</xsl:template>
+
 	<xsl:template match="iec:modification/iec:p">
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 	
 	<xsl:template match="iec:termnote">
-		<fo:block font-size="8pt" margin-top="5pt" margin-bottom="5pt">
-			<xsl:text>Note </xsl:text>
-			<xsl:number/>
-			<xsl:text> to entry: </xsl:text>
+		<fo:block font-size="8pt" margin-top="5pt" margin-bottom="5pt">			
+			<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>
@@ -2197,7 +2323,12 @@
 	
 	<xsl:template match="iec:termexample">
 		<fo:block margin-top="14pt" margin-bottom="10pt">
-			<fo:inline padding-right="10mm">EXAMPLE</fo:inline>
+			<xsl:variable name="title-example">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-example'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<fo:inline padding-right="10mm"><xsl:value-of select="normalize-space($title-example)"/></fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -2214,7 +2345,7 @@
 
 	
 	<!-- <xsl:template match="iec:references[@id = '_bibliography']"> -->
-	<xsl:template match="iec:references[not(@id = '_normative_references' or @id = '_references')]">
+	<xsl:template match="iec:references[not(starts-with(@id, '_normative_references') or starts-with(@id, '_references'))]">
 		<fo:block break-after="page"/>
 		<xsl:apply-templates/>
 		<fo:block-container text-align="center" margin-top="10mm">
@@ -2225,7 +2356,7 @@
 
 	<!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
 	<!-- <xsl:template match="iec:references[@id = '_bibliography']/iec:bibitem"> -->
-	<xsl:template match="iec:references[not(@id = '_normative_references' or @id = '_references')]/iec:bibitem">
+	<xsl:template match="iec:references[not(starts-with(@id, '_normative_references') or starts-with(@id, '_references'))]/iec:bibitem">
 		<fo:list-block margin-top="5pt" margin-bottom="14pt" provisional-distance-between-starts="0mm"> <!-- provisional-distance-between-starts="12mm" -->
 			<fo:list-item>
 				<fo:list-item-label end-indent="label-end()">
@@ -2258,10 +2389,10 @@
 	</xsl:template>
 	
 	<!-- <xsl:template match="iec:references[@id = '_bibliography']/iec:bibitem" mode="contents"/> -->
-	<xsl:template match="iec:references[not(@id = '_normative_references' or @id = '_references')]/iec:bibitem" mode="contents"/>
+	<xsl:template match="iec:references[not(starts-with(@id, '_normative_references') or starts-with(@id, '_references'))]/iec:bibitem" mode="contents"/>
 	
 	<!-- <xsl:template match="iec:references[@id = '_bibliography']/iec:bibitem/iec:title"> -->
-	<xsl:template match="iec:references[not(@id = '_normative_references' or @id = '_references')]/iec:bibitem/iec:title">
+	<xsl:template match="iec:references[not(starts-with(@id, '_normative_references') or starts-with(@id, '_references'))]/iec:bibitem/iec:title">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
@@ -2283,20 +2414,34 @@
 	
 	<xsl:template match="iec:source">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-			<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
+			<xsl:value-of select="@citeas"/> <!--  disable-output-escaping="yes" -->
 			<xsl:apply-templates select="iec:localityStack"/>
 		</fo:basic-link>
 	</xsl:template>
 	
 	
 	<xsl:template match="iec:xref">
+	
+		<xsl:variable name="docid">
+			<xsl:call-template name="getDocumentId"/>
+		</xsl:variable>
+		<xsl:variable name="contents" select="xalan:nodeset($contents)/doc[@id = $docid]"/>
+		<!-- 	<xsl:call-template name="generateContents"/>
+		</xsl:variable>
+		 -->
+		
 		<xsl:variable name="section" select="xalan:nodeset($contents)//item[@id = current()/@target]/@section"/>
 		<fo:basic-link internal-destination="{@target}" fox:alt-text="{$section}">
 			<xsl:variable name="type" select="xalan:nodeset($contents)//item[@id = current()/@target]/@type"/>
 			<xsl:variable name="root" select="xalan:nodeset($contents)//item[@id = current()/@target]/@root"/>
 			<xsl:variable name="parentsection" select="xalan:nodeset($contents)//item[@id = current()/@target]/@parentsection"/>
+			<xsl:variable name="title-clause">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-clause'"/>
+				</xsl:call-template>
+			</xsl:variable>
 			<xsl:choose>
-				<xsl:when test="$type = 'clause' and $root != 'annex'">Clause </xsl:when><!-- and not (ancestor::annex) -->
+				<xsl:when test="$type = 'clause' and $root != 'annex'"><xsl:value-of select="$title-clause"/></xsl:when><!-- and not (ancestor::annex) -->
 				<xsl:otherwise/> <!-- <xsl:value-of select="$type"/> -->
 			</xsl:choose>
 			<xsl:variable name="currentsection">
@@ -2313,7 +2458,12 @@
 
 	<xsl:template match="iec:example/iec:p">
 		<fo:block>
-			<fo:inline padding-right="9mm">EXAMPLE</fo:inline>
+			<xsl:variable name="title-example">
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-example'"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<fo:inline padding-right="9mm"><xsl:value-of select="normalize-space($title-example)"/></fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -2324,7 +2474,12 @@
 				<xsl:attribute name="margin-bottom">9pt</xsl:attribute>
 			</xsl:if>
 			<fo:inline padding-right="6mm">
-				<xsl:text>NOTE </xsl:text>
+				<xsl:variable name="title-note">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-note'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-note"/>
 				<xsl:if test="ancestor::iec:figure">
 					<xsl:variable name="id" select="ancestor::iec:figure[1]/@id"/>
 					<xsl:if test="count(//iec:note[ancestor::*[@id = $id]]) &gt; 1">
@@ -2345,16 +2500,31 @@
 				<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
 				<xsl:attribute name="vertical-align">super</xsl:attribute>
 			</xsl:if>
-			<xsl:value-of select="@citeas" disable-output-escaping="yes"/>
+			<xsl:value-of select="@citeas"/> <!--  disable-output-escaping="yes" -->
 			<xsl:apply-templates select="iec:localityStack"/>
 		</fo:basic-link>
 	</xsl:template>
 	
 	<xsl:template match="iec:locality">
+		<xsl:variable name="title-clause">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-clause'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="title-annex">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-annex'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:variable name="title-table">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-table'"/>
+			</xsl:call-template>
+		</xsl:variable>
 		<xsl:choose>
-			<xsl:when test="@type ='clause'">Clause </xsl:when>
-			<xsl:when test="@type ='annex'">Annex </xsl:when>
-			<xsl:when test="@type ='table'">Table </xsl:when>
+			<xsl:when test="@type ='clause'"><xsl:value-of select="$title-clause"/></xsl:when>
+			<xsl:when test="@type ='annex'"><xsl:value-of select="$title-annex"/></xsl:when>
+			<xsl:when test="@type ='table'"><xsl:value-of select="$title-table"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="@type"/></xsl:otherwise>
 		</xsl:choose>
 		<xsl:text> </xsl:text><xsl:value-of select="iec:referenceFrom"/>
@@ -2364,7 +2534,7 @@
 		<fo:block-container border="0.5pt solid black" margin-left="-2mm" margin-right="-2mm" space-before="18pt" space-after="12pt">
 			<fo:block-container margin-left="0mm" margin-right="0mm" font-weight="bold" padding="1mm" padding-top="2mm">
 				<fo:block text-align="justify">
-					<fo:inline><xsl:value-of select="translate(@type, $lower, $upper)"/> – </fo:inline>
+					<fo:inline><xsl:value-of select="java:toUpperCase(java:java.lang.String.new(@type))"/> – </fo:inline>
 					<xsl:apply-templates/>
 				</fo:block>
 			</fo:block-container>
@@ -2383,6 +2553,12 @@
 		</xsl:call-template>
 	</xsl:template>
 	
+	<xsl:template match="iec:formula">
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	
 	<xsl:template match="iec:formula/iec:dt/iec:stem">
 		<fo:inline>
 			<xsl:apply-templates/>
@@ -2396,7 +2572,7 @@
 	</xsl:template>
 	
 	<xsl:template match="iec:formula/iec:stem">
-		<fo:block id="{../@id}" margin-top="6pt" margin-bottom="12pt">
+		<fo:block margin-top="6pt" margin-bottom="12pt">
 			<fo:table table-layout="fixed" width="100%">
 				<fo:table-column column-width="95%"/>
 				<fo:table-column column-width="5%"/>
@@ -2411,7 +2587,7 @@
 							<fo:block text-align="right" margin-right="-10mm">
 								<xsl:choose>
 									<xsl:when test="ancestor::iec:annex">
-										<xsl:text>(</xsl:text><xsl:number format="A.1" level="multiple" count="iec:annex | iec:formula"/><xsl:text>)</xsl:text>
+										<xsl:number format="(A.1)" level="multiple" count="iec:annex | iec:formula"/>
 									</xsl:when>
 									<xsl:otherwise> <!-- not(ancestor::iec:annex) -->
 										<xsl:text>(</xsl:text><xsl:number level="any" count="iec:formula"/><xsl:text>)</xsl:text>
@@ -2485,38 +2661,6 @@
 		</fo:static-content>
 	</xsl:template>
 
-	<xsl:template name="getId">
-		<xsl:choose>
-			<xsl:when test="../@id">
-				<xsl:value-of select="../@id"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="text()"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<xsl:template name="getLevel">
-		<xsl:variable name="level_total" select="count(ancestor::*)"/>
-		<xsl:variable name="level">
-			<xsl:choose>
-				<xsl:when test="ancestor::iec:preface">
-					<xsl:value-of select="$level_total - 2"/>
-				</xsl:when>
-				<xsl:when test="ancestor::iec:sections">
-					<xsl:value-of select="$level_total - 2"/>
-				</xsl:when>
-				<xsl:when test="ancestor::iec:bibliography">
-					<xsl:value-of select="$level_total - 2"/>
-				</xsl:when>
-				<xsl:when test="local-name(ancestor::*[1]) = 'annex'">1</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="$level_total - 1"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:value-of select="$level"/>
-	</xsl:template>
 
 	<xsl:template name="getSection">
 		<xsl:param name="sectionNum"/>
@@ -2536,7 +2680,7 @@
 						</xsl:when>
 						<xsl:when test="$level &gt;= 2">
 							<xsl:variable name="num">
-								<xsl:number format=".1" level="multiple" count="iec:clause/iec:clause | iec:clause/iec:terms | iec:terms/iec:term | iec:clause/iec:term"/>
+								<xsl:call-template name="getSubSection"/>								
 							</xsl:variable>
 							<xsl:value-of select="concat($sectionNum, $num)"/>
 						</xsl:when>
@@ -2559,7 +2703,12 @@
 				<xsl:when test="ancestor::iec:annex">
 					<xsl:choose>
 						<xsl:when test="$level = 1">
-							<xsl:text>Annex </xsl:text>
+							<xsl:variable name="title-annex">
+								<xsl:call-template name="getTitle">
+									<xsl:with-param name="name" select="'title-annex'"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="$title-annex"/>
 							<xsl:choose>
 								<xsl:when test="count(//iec:annex) = 1">
 									<xsl:value-of select="/iec:iec-standard/iec:bibdata/iec:ext/iec:structuredidentifier/iec:annexid"/>
@@ -2644,7 +2793,7 @@
 		<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)"/>
-			<xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/>
+			<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>			
 			<xsl:choose>
 				<xsl:when test="$char=$upperCase">
 					<fo:inline font-size="{100 div 0.75}%">
@@ -2676,47 +2825,227 @@
 		</fo:inline>
 	</xsl:template>
 	
-<xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-table">
+	<xsl:template match="node()" mode="change_id">
+		<xsl:param name="lang"/>
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="change_id">
+				<xsl:with-param name="lang" select="$lang"/>
+			</xsl:apply-templates>
+		</xsl:copy>
+	</xsl:template>
+	
+	<xsl:template match="@*" mode="change_id">
+		<xsl:param name="lang"/>
+		<xsl:choose>
+			<xsl:when test="local-name() = 'id' or                local-name() = 'bibitemid' or               (local-name() = 'target' and local-name(..) = 'xref')">
+				<xsl:attribute name="{local-name()}">
+					<xsl:value-of select="."/>_<xsl:value-of select="$lang"/>
+				</xsl:attribute>
+			</xsl:when>			
+			<xsl:otherwise>				
+				<xsl:copy>
+					<xsl:apply-templates select="@*" mode="change_id">
+						<xsl:with-param name="lang" select="$lang"/>
+					</xsl:apply-templates>
+				</xsl:copy>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	<!-- DEBUG ONLY -->
+	<!-- <xsl:template match="iec:title" mode="change_id">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="change_id">
+				<xsl:with-param name="lang" select="$lang"/>
+			</xsl:apply-templates>FR <xsl:apply-templates mode="change_id"/>
+		</xsl:copy>
+	</xsl:template> -->
+	
+<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>
+		
+			<title-annex lang="zh">Annex </title-annex>
+		
+		
 		
-			<xsl:text>Table </xsl:text>
+		<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>
 		
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-note">
 		
-			<xsl:text>NOTE </xsl:text>
+		<title-edition lang="en">
+			
+				<xsl:text>Edition </xsl:text>
+			
+			
+		</title-edition>
 		
+		<title-formula lang="en">Formula </title-formula>
+		<title-formula lang="fr">Formula </title-formula>
+		
+		<title-toc lang="en">
+			
+				<xsl:text>Contents</xsl:text>
+			
+			
+			
+		</title-toc>
+		<title-toc lang="fr">Sommaire</title-toc>
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-figure">
+			<title-toc lang="zh">Contents</title-toc>
 		
-			<xsl:text>Figure </xsl:text>
 		
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-example">
+		<title-page lang="en">Page</title-page>
+		<title-page lang="fr">Page</title-page>
 		
-			<xsl:text>EXAMPLE </xsl:text>
+		<title-key lang="en">Key</title-key>
+		<title-key lang="fr">Légende</title-key>
+			
+		<title-where lang="en">where</title-where>
+		<title-where lang="fr">où</title-where>
+					
+		<title-descriptors lang="en">Descriptors</title-descriptors>
 		
+		<title-part lang="en">
+			
+			
+				<xsl:text>Part #: </xsl:text>
+			
+		</title-part>
+		<title-part lang="fr">
+			
+			
+				<xsl:text>Partie #:  </xsl:text>
+			
+		</title-part>		
+		<title-part lang="zh">第 # 部分:</title-part>
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-inequality">Inequality </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-equation">Equation </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-annex">
+		<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>
 		
-			<xsl:text>Annex </xsl:text>
+			<title-note-to-entry lang="zh">Note # to entry: </title-note-to-entry>
 		
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-appendix">
-		<xsl:text>Appendix </xsl:text>
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-clause">
 		
-			<xsl:text>Clause </xsl:text>
+		<title-modified lang="en">modified</title-modified>
+		<title-modified lang="fr">modifiée</title-modified>
 		
+			<title-modified lang="zh">modified</title-modified>
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-edition">
-		<xsl:text>Edition </xsl:text>
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-toc">
 		
 		
-	</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-page">Page</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-key">Key</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-where">where</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-descriptors">Descriptors</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-part-en">Part </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-part-fr">Partie </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-note-to-entry">Note # to entry: </xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-modified">modified</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-source">SOURCE</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="title-keywords">Keywords</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable xmlns:java="http://xml.apache.org/xalan/java" name="linebreak" select="'&#8232;'"/><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="link-style">
+		<title-source lang="en">SOURCE</title-source>
 		
+		<title-keywords lang="en">Keywords</title-keywords>
 		
-	</xsl:attribute-set><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="sourcecode-style">
+		<title-deprecated lang="en">DEPRECATED</title-deprecated>
+		<title-deprecated lang="fr">DEPRECATED</title-deprecated>
+		
+		<title-submitting-organizations lang="en">Submitting Organizations</title-submitting-organizations>
+		
+		<title-list-tables lang="en">List of Tables</title-list-tables>
+		
+		<title-list-figures lang="en">List of Figures</title-list-figures>
+		
+		<title-recommendation lang="en">Recommendation </title-recommendation>
+		
+		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
+		
+		<title-abstract lang="en">Abstract</title-abstract>
+		
+		<title-summary lang="en">Summary</title-summary>
+		
+		<title-in lang="en">in </title-in>
+		
+		<title-box lang="en">Box </title-box>
+		
+		<title-partly-supercedes lang="en">Partly Supercedes </title-partly-supercedes>
+		<title-partly-supercedes lang="zh">部分代替 </title-partly-supercedes>
+		
+		<title-completion-date lang="en">Completion date for this manuscript</title-completion-date>
+		<title-completion-date lang="zh">本稿完成日期</title-completion-date>
+		
+		<title-issuance-date lang="en">Issuance Date: #</title-issuance-date>
+		<title-issuance-date lang="zh"># 发布</title-issuance-date>
+		
+		<title-implementation-date lang="en">Implementation Date: #</title-implementation-date>
+		<title-implementation-date lang="zh"># 实施</title-implementation-date>
+
+		<title-obligation-normative lang="en">normative</title-obligation-normative>
+		<title-obligation-normative lang="zh">规范性附录</title-obligation-normative>
+		
+		<title-caution lang="en">CAUTION</title-caution>
+		<title-caution lang="zh">注意</title-caution>
+			
+		<title-warning lang="en">WARNING</title-warning>
+		<title-warning lang="zh">警告</title-warning>
+		
+		<title-amendment lang="en">AMENDMENT</title-amendment>
+	</xsl:variable><xsl:template name="getTitle">
+		<xsl:param name="name"/>
+		<xsl:variable name="lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		<xsl:variable name="title_" select="$titles/*[local-name() = $name][@lang = $lang]"/>
+		<xsl:choose>
+			<xsl:when test="normalize-space($title_) != ''">
+				<xsl:value-of select="$title_"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="link-style">
+		
+		
+	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		
 		
 		
@@ -2730,7 +3059,7 @@
 				
 		
 		
-	</xsl:attribute-set><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="appendix-style">
+	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 					
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -2738,21 +3067,21 @@
 			<xsl:attribute name="margin-bottom">5pt</xsl:attribute>
 		
 		
-	</xsl:attribute-set><xsl:attribute-set xmlns:java="http://xml.apache.org/xalan/java" name="appendix-example-style">
+	</xsl:attribute-set><xsl:attribute-set name="appendix-example-style">
 		
 		
 			<xsl:attribute name="margin-top">14pt</xsl:attribute>
 			<xsl:attribute name="margin-bottom">14pt</xsl:attribute>
 		
 		
-	</xsl:attribute-set><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="text()">
+	</xsl:attribute-set><xsl:template match="text()">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='br']">
+	</xsl:template><xsl:template match="*[local-name()='br']">
 		<xsl:value-of select="$linebreak"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
+	</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 xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']">
+	</xsl:template><xsl:template match="*[local-name()='table']">
 	
 		<xsl:variable name="simple-table">
 			<!-- <xsl:copy> -->
@@ -2798,7 +3127,11 @@
 						
 						
 						
-						
+						<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"/>
@@ -2906,13 +3239,22 @@
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:for-each>
-				<xsl:apply-templates/>
+				
+				<xsl:choose>
+					<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
+						<xsl:apply-templates select="*[local-name()='thead']" mode="process_tbody"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates/>
+					</xsl:otherwise>
+				</xsl:choose>
+				
 			</fo:table>
 			
 			
 			
 		</fo:block-container>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="getTableNumber">
+	</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']"/>
@@ -2936,15 +3278,15 @@
 				
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='name']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='name']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='name']"/><xsl:template match="*[local-name()='table']/*[local-name()='name']" mode="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="calculate-columns-numbers">
+	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
 		<xsl:variable name="columns-count" select="count($table-row/*)"/>
 		<xsl:variable name="sum-colspans" select="sum($table-row/*/@colspan)"/>
 		<xsl:variable name="columns-with-colspan" select="count($table-row/*[@colspan])"/>
 		<xsl:value-of select="$columns-count + $sum-colspans - $columns-with-colspan"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="calculate-column-widths">
+	</xsl:template><xsl:template name="calculate-column-widths">
 		<xsl:param name="table"/>
 		<xsl:param name="cols-count"/>
 		<xsl:param name="curr-col" select="1"/>
@@ -3042,23 +3384,27 @@
 				<xsl:with-param name="table" select="$table"/>
 			</xsl:call-template>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="text()" mode="td_text">
+	</xsl:template><xsl:template match="text()" mode="td_text">
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:value-of select="translate(., $zero-space, ' ')"/><xsl:text> </xsl:text>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='termsource']" mode="td_text">
+	</xsl:template><xsl:template match="*[local-name()='termsource']" mode="td_text">
 		<xsl:value-of select="*[local-name()='origin']/@citeas"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='link']" mode="td_text">
+	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
 		<xsl:value-of select="@target"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table2']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='thead']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='thead']" mode="process">
+	</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>			
 			
 			<xsl:apply-templates/>
 		</fo:table-header>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tfoot']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tfoot']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
+		<fo:table-body>
+			<xsl:apply-templates/>
+		</fo:table-body>
+	</xsl:template><xsl:template match="*[local-name()='tfoot']"/><xsl:template match="*[local-name()='tfoot']" mode="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="insertTableFooter">
+	</xsl:template><xsl:template name="insertTableFooter">
 		<xsl:param name="cols-count"/>
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		<xsl:if test="../*[local-name()='tfoot'] or           $isNoteOrFnExist = 'true'">
@@ -3110,7 +3456,7 @@
 			</fo:table-footer>
 		
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tbody']">
+	</xsl:template><xsl:template match="*[local-name()='tbody']">
 		
 		<xsl:variable name="cols-count">
 			<xsl:choose>
@@ -3141,7 +3487,7 @@
 		
 		</fo:table-body>
 		
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tr']">
+	</xsl:template><xsl:template match="*[local-name()='tr']">
 		<xsl:variable name="parent-name" select="local-name(..)"/>
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
 		<fo:table-row min-height="4mm">
@@ -3167,7 +3513,7 @@
 				
 			<xsl:apply-templates/>
 		</fo:table-row>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='th']">
+	</xsl:template><xsl:template match="*[local-name()='th']">
 		<fo:table-cell text-align="{@align}" font-weight="bold" border="solid black 1pt" padding-left="1mm" display-align="center">
 			
 				<xsl:attribute name="padding-top">1mm</xsl:attribute>
@@ -3198,7 +3544,7 @@
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='td']">
+	</xsl:template><xsl:template match="*[local-name()='td']">
 		<fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
 			 <!--  and ancestor::*[local-name() = 'thead'] -->
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
@@ -3247,7 +3593,7 @@
 			
 			
 		</fo:table-cell>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='note']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='note']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']"/><xsl:template match="*[local-name()='table']/*[local-name()='note']" mode="process">
 		
 		
 			<fo:block font-size="10pt" margin-bottom="12pt">
@@ -3261,6 +3607,12 @@
 				<fo:inline 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:variable name="id" select="ancestor::*[local-name() = 'table'][1]/@id"/>
@@ -3275,9 +3627,9 @@
 				<xsl:apply-templates mode="process"/>
 			</fo:block>
 		
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name()='note']/*[local-name()='p']" mode="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="fn_display">
+	</xsl:template><xsl:template name="fn_display">
 		<xsl:variable name="references">
 			<xsl:for-each select="..//*[local-name()='fn'][local-name(..) != 'name']">
 				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -3320,7 +3672,7 @@
 				</fo:block>
 			</xsl:if>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="fn_name_display">
+	</xsl:template><xsl:template name="fn_name_display">
 		<!-- <xsl:variable name="references">
 			<xsl:for-each select="*[local-name()='name']//*[local-name()='fn']">
 				<fn reference="{@reference}" id="{@reference}_{ancestor::*[@id][1]/@id}">
@@ -3336,7 +3688,7 @@
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="fn_display_figure">
+	</xsl:template><xsl:template name="fn_display_figure">
 		<xsl:variable name="key_iso">
 			true <!-- and (not(@class) or @class !='pseudocode') -->
 		</xsl:variable>
@@ -3347,6 +3699,36 @@
 				</fn>
 			</xsl:for-each>
 		</xsl:variable>
+		
+		<!-- current hierarchy is 'figure' element -->
+		<xsl:variable name="following_dl_colwidths">
+			<xsl:if test="*[local-name() = 'dl']"><!-- if there is a 'dl', then set the same columns width as for 'dl' -->
+				<xsl:variable name="html-table">
+					<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
+					<xsl:element name="{$ns}:table">
+						<xsl:for-each select="*[local-name() = 'dl'][1]">
+							<tbody>
+								<xsl:apply-templates mode="dl"/>
+							</tbody>
+						</xsl:for-each>
+					</xsl:element>
+				</xsl:variable>
+				
+				<xsl:call-template name="calculate-column-widths">
+					<xsl:with-param name="cols-count" select="2"/>
+					<xsl:with-param name="table" select="$html-table"/>
+				</xsl:call-template>
+				
+			</xsl:if>
+		</xsl:variable>
+		
+		
+		<xsl:variable name="maxlength_dt">
+			<xsl:for-each select="*[local-name() = 'dl'][1]">
+				<xsl:call-template name="getMaxLength_dt"/>			
+			</xsl:for-each>
+		</xsl:variable>
+		
 		<xsl:if test="xalan:nodeset($references)//fn">
 			<fo:block>
 				<fo:table width="95%" table-layout="fixed">
@@ -3356,8 +3738,19 @@
 							<xsl:attribute name="font-size">8pt</xsl:attribute>
 						
 					</xsl:if>
-					<fo:table-column column-width="15%"/>
-					<fo:table-column column-width="85%"/>
+					<xsl:choose>
+						<!-- if there 'dl', then set same columns width -->
+						<xsl:when test="xalan:nodeset($following_dl_colwidths)//column">
+							<xsl:call-template name="setColumnWidth_dl">
+								<xsl:with-param name="colwidths" select="$following_dl_colwidths"/>								
+								<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>								
+							</xsl:call-template>
+						</xsl:when>
+						<xsl:otherwise>
+							<fo:table-column column-width="15%"/>
+							<fo:table-column column-width="85%"/>
+						</xsl:otherwise>
+					</xsl:choose>
 					<fo:table-body>
 						<xsl:for-each select="xalan:nodeset($references)//fn">
 							<xsl:variable name="reference" select="@reference"/>
@@ -3396,7 +3789,7 @@
 			</fo:block>
 		</xsl:if>
 		
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='fn']">
+	</xsl:template><xsl:template match="*[local-name()='fn']">
 		<!-- <xsl:variable name="namespace" select="substring-before(name(/*), '-')"/> -->
 		<fo:inline font-size="80%" keep-with-previous.within-line="always">
 			
@@ -3414,11 +3807,11 @@
 				<xsl:value-of select="@reference"/>
 			</fo:basic-link>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='fn']/*[local-name()='p']">
+	</xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
 		<fo:inline>
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dl']">
+	</xsl:template><xsl:template match="*[local-name()='dl']">
 		<xsl:variable name="parent" select="local-name(..)"/>
 		
 		<xsl:variable name="key_iso">
@@ -3435,6 +3828,11 @@
 							<xsl:attribute name="margin-bottom">15pt</xsl:attribute>
 						
 						
+						<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>
 					<fo:block>
@@ -3455,17 +3853,27 @@
 					
 					
 					
+					<xsl:variable name="title-where">
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-where'"/>
+						</xsl:call-template>
+					</xsl:variable>
 					<xsl:value-of select="$title-where"/>
 				</fo:block>
 			</xsl:when>
 			<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')">
-				<fo:block font-weight="bold" text-align="left" margin-bottom="12pt">
+				<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
 					
 					
 						<xsl:attribute name="font-size">8pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 					
 					
+					<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>
@@ -3482,23 +3890,6 @@
 					
 					
 					
-					<!-- create virtual html table for dl/[dt and dd] -->
-					<xsl:variable name="html-table">
-						<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
-						<xsl:element name="{$ns}:table">
-							<tbody>
-								<xsl:apply-templates mode="dl"/>
-							</tbody>
-						</xsl:element>
-					</xsl:variable>
-					<!-- html-table<xsl:copy-of select="$html-table"/> -->
-					<xsl:variable name="colwidths">
-						<xsl:call-template name="calculate-column-widths">
-							<xsl:with-param name="cols-count" select="2"/>
-							<xsl:with-param name="table" select="$html-table"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
 					
 					<fo:table width="95%" table-layout="fixed">
 						
@@ -3513,42 +3904,30 @@
 								
 							</xsl:when>
 						</xsl:choose>
-						<xsl:choose>
-							<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
-								<fo:table-column column-width="50%"/>
-								<fo:table-column column-width="50%"/>
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:choose>
-									<!-- <xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.7">
-										<fo:table-column column-width="60%"/>
-										<fo:table-column column-width="40%"/>
-									</xsl:when> -->
-									<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.3">
-										<fo:table-column column-width="50%"/>
-										<fo:table-column column-width="50%"/>
-									</xsl:when>
-									<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 0.5">
-										<fo:table-column column-width="40%"/>
-										<fo:table-column column-width="60%"/>
-									</xsl:when>
-									<xsl:otherwise>
-										<xsl:for-each select="xalan:nodeset($colwidths)//column">
-											<xsl:choose>
-												<xsl:when test=". = 1 or . = 0">
-													<fo:table-column column-width="proportional-column-width(2)"/>
-												</xsl:when>
-												<xsl:otherwise>
-													<fo:table-column column-width="proportional-column-width({.})"/>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</xsl:otherwise>
-								</xsl:choose>
-								<!-- <fo:table-column column-width="15%"/>
-								<fo:table-column column-width="85%"/> -->
-							</xsl:otherwise>
-						</xsl:choose>
+						<!-- 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)"/>
@@ -3558,7 +3937,61 @@
 				</fo:block>
 			</fo:block>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dl']/*[local-name()='note']">
+	</xsl:template><xsl:template name="setColumnWidth_dl">
+		<xsl:param name="colwidths"/>		
+		<xsl:param name="maxlength_dt"/>
+		<xsl:choose>
+			<xsl:when test="ancestor::*[local-name()='dl']"><!-- second level, i.e. inlined table -->
+				<fo:table-column column-width="50%"/>
+				<fo:table-column column-width="50%"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:choose>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 2"> <!-- if dt contains short text like t90, a, etc -->
+						<fo:table-column column-width="5%"/>
+						<fo:table-column column-width="95%"/>
+					</xsl:when>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like t90, a, etc -->
+						<fo:table-column column-width="10%"/>
+						<fo:table-column column-width="90%"/>
+					</xsl:when>
+					<!-- <xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.7">
+						<fo:table-column column-width="60%"/>
+						<fo:table-column column-width="40%"/>
+					</xsl:when> -->
+					<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 1.3">
+						<fo:table-column column-width="50%"/>
+						<fo:table-column column-width="50%"/>
+					</xsl:when>
+					<xsl:when test="xalan:nodeset($colwidths)/column[1] div xalan:nodeset($colwidths)/column[2] &gt; 0.5">
+						<fo:table-column column-width="40%"/>
+						<fo:table-column column-width="60%"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:for-each select="xalan:nodeset($colwidths)//column">
+							<xsl:choose>
+								<xsl:when test=". = 1 or . = 0">
+									<fo:table-column column-width="proportional-column-width(2)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<fo:table-column column-width="proportional-column-width({.})"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</xsl:otherwise>
+				</xsl:choose>
+				<!-- <fo:table-column column-width="15%"/>
+				<fo:table-column column-width="85%"/> -->
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="getMaxLength_dt">
+		<xsl:for-each select="*[local-name()='dt']">
+			<xsl:sort select="string-length(normalize-space(.))" data-type="number" order="descending"/>
+			<xsl:if test="position() = 1">
+				<xsl:value-of select="string-length(normalize-space(.))"/>
+			</xsl:if>
+		</xsl:for-each>
+	</xsl:template><xsl:template match="*[local-name()='dl']/*[local-name()='note']">
 		<xsl:param name="key_iso"/>
 		
 		<!-- <tr>
@@ -3574,6 +4007,11 @@
 					<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"/>
 				</fo:block>
 			</fo:table-cell>
@@ -3583,7 +4021,7 @@
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dt']" mode="dl">
+	</xsl:template><xsl:template match="*[local-name()='dt']" mode="dl">
 		<tr>
 			<td>
 				<xsl:apply-templates/>
@@ -3596,7 +4034,7 @@
 			</td>
 		</tr>
 		
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dt']">
+	</xsl:template><xsl:template match="*[local-name()='dt']">
 		<xsl:param name="key_iso"/>
 		
 		<fo:table-row>
@@ -3619,7 +4057,11 @@
 					
 					
 					<xsl:apply-templates/>
-					
+					<!-- <xsl:if test="$namespace = 'gb'">
+						<xsl:if test="ancestor::*[local-name()='formula']">
+							<xsl:text>—</xsl:text>
+						</xsl:if>
+					</xsl:if> -->
 				</fo:block>
 			</fo:table-cell>
 			<fo:table-cell>
@@ -3633,37 +4075,37 @@
 			</fo:table-cell>
 		</fo:table-row>
 		
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']" mode="dl"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']" mode="dl_process">
+	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']" mode="process">
+	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
+	</xsl:template><xsl:template match="*[local-name()='dd']/*[local-name()='p']" mode="inline">
 		<fo:inline><xsl:text> </xsl:text><xsl:apply-templates/></fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='em']">
+	</xsl:template><xsl:template match="*[local-name()='em']">
 		<fo:inline font-style="italic">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='strong']">
+	</xsl:template><xsl:template match="*[local-name()='strong']">
 		<fo:inline font-weight="bold">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='sup']">
+	</xsl:template><xsl:template match="*[local-name()='sup']">
 		<fo:inline font-size="80%" vertical-align="super">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='sub']">
+	</xsl:template><xsl:template match="*[local-name()='sub']">
 		<fo:inline font-size="80%" vertical-align="sub">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tt']">
+	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline font-family="Courier" font-size="10pt">			
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='del']">
+	</xsl:template><xsl:template match="*[local-name()='del']">
 		<fo:inline font-size="10pt" color="red" text-decoration="line-through">
 			<xsl:apply-templates/>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="text()[ancestor::*[local-name()='smallcap']]">
+	</xsl:template><xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<xsl:variable name="text" select="normalize-space(.)"/>
 		<fo:inline font-size="75%">
 				<xsl:if test="string-length($text) &gt; 0">
@@ -3672,10 +4114,11 @@
 					</xsl:call-template>
 				</xsl:if>
 			</fo:inline> 
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="recursiveSmallCaps">
+	</xsl:template><xsl:template name="recursiveSmallCaps">
     <xsl:param name="text"/>
     <xsl:variable name="char" select="substring($text,1,1)"/>
-    <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/>
+    <!-- <xsl:variable name="upperCase" select="translate($char, $lower, $upper)"/> -->
+		<xsl:variable name="upperCase" select="java:toUpperCase(java:java.lang.String.new($char))"/>
     <xsl:choose>
       <xsl:when test="$char=$upperCase">
         <fo:inline font-size="{100 div 0.75}%">
@@ -3691,7 +4134,7 @@
         <xsl:with-param name="text" select="substring($text,2)"/>
       </xsl:call-template>
     </xsl:if>
-  </xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="tokenize">
+  </xsl:template><xsl:template name="tokenize">
 		<xsl:param name="text"/>
 		<xsl:param name="separator" select="' '"/>
 		<xsl:choose>
@@ -3739,7 +4182,7 @@
 				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="max_length">
+	</xsl:template><xsl:template name="max_length">
 		<xsl:param name="words"/>
 		<xsl:for-each select="$words//word">
 				<xsl:sort select="." data-type="number" order="descending"/>
@@ -3747,11 +4190,11 @@
 						<xsl:value-of select="."/>
 				</xsl:if>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="add-zero-spaces-java">
+	</xsl:template><xsl:template name="add-zero-spaces-java">
 		<xsl:param name="text" select="."/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="add-zero-spaces">
+	</xsl:template><xsl:template name="add-zero-spaces">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-chars">-</xsl:variable>
 		<xsl:variable name="zero-space-after-dot">.</xsl:variable>
@@ -3804,7 +4247,7 @@
 				<xsl:value-of select="$text"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="add-zero-spaces-equal">
+	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
@@ -3830,7 +4273,7 @@
 				<xsl:value-of select="$text"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="getSimpleTable">
+	</xsl:template><xsl:template name="getSimpleTable">
 		<xsl:variable name="simple-table">
 		
 			<!-- Step 1. colspan processing -->
@@ -3857,9 +4300,9 @@
 			</xsl:choose> -->
 		</xsl:variable>
 		<xsl:copy-of select="$simple-table"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="*[local-name()='thead'] | *[local-name()='tbody']" mode="simple-table-colspan">
 		<xsl:apply-templates mode="simple-table-colspan"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="*[local-name()='fn']" mode="simple-table-colspan"/><xsl:template match="*[local-name()='th'] | *[local-name()='td']" mode="simple-table-colspan">
 		<xsl:choose>
 			<xsl:when test="@colspan">
 				<xsl:variable name="td">
@@ -3881,16 +4324,16 @@
 				</xsl:element>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="@colspan" mode="simple-table-colspan"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='tr']" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="@colspan" mode="simple-table-colspan"/><xsl:template match="*[local-name()='tr']" mode="simple-table-colspan">
 		<xsl:element name="tr">
 			<xsl:apply-templates select="@*" mode="simple-table-colspan"/>
 			<xsl:apply-templates mode="simple-table-colspan"/>
 		</xsl:element>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="@*|node()" mode="simple-table-colspan">
+	</xsl:template><xsl:template match="@*|node()" mode="simple-table-colspan">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="simple-table-colspan"/>
 		</xsl:copy>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="repeatNode">
+	</xsl:template><xsl:template name="repeatNode">
 		<xsl:param name="count"/>
 		<xsl:param name="node"/>
 		
@@ -3901,18 +4344,18 @@
 			</xsl:call-template>
 			<xsl:copy-of select="$node"/>
 		</xsl:if>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="@*|node()" mode="simple-table-rowspan">
+	</xsl:template><xsl:template match="@*|node()" mode="simple-table-rowspan">
 		<xsl:copy>
 				<xsl:apply-templates select="@*|node()" mode="simple-table-rowspan"/>
 		</xsl:copy>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="tbody" mode="simple-table-rowspan">
+	</xsl:template><xsl:template match="tbody" mode="simple-table-rowspan">
 		<xsl:copy>
 				<xsl:copy-of select="tr[1]"/>
 				<xsl:apply-templates select="tr[2]" mode="simple-table-rowspan">
 						<xsl:with-param name="previousRow" select="tr[1]"/>
 				</xsl:apply-templates>
 		</xsl:copy>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="tr" mode="simple-table-rowspan">
+	</xsl:template><xsl:template match="tr" mode="simple-table-rowspan">
 		<xsl:param name="previousRow"/>
 		<xsl:variable name="currentRow" select="."/>
 	
@@ -3946,43 +4389,53 @@
 		<xsl:apply-templates select="following-sibling::tr[1]" mode="simple-table-rowspan">
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="getLang">
+	</xsl:template><xsl:template name="getLang">
 		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
 		<xsl:choose>
 			<xsl:when test="$language = 'English'">en</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="capitalizeWords">
+	</xsl:template><xsl:template name="capitalizeWords">
 		<xsl:param name="str"/>
 		<xsl:variable name="str2" select="translate($str, '-', ' ')"/>
 		<xsl:choose>
 			<xsl:when test="contains($str2, ' ')">
 				<xsl:variable name="substr" select="substring-before($str2, ' ')"/>
-				<xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
-				<xsl:value-of select="substring($substr, 2)"/>
+				<!-- <xsl:value-of select="translate(substring($substr, 1, 1), $lower, $upper)"/>
+				<xsl:value-of select="substring($substr, 2)"/> -->
+				<xsl:call-template name="capitalize">
+					<xsl:with-param name="str" select="$substr"/>
+				</xsl:call-template>
 				<xsl:text> </xsl:text>
 				<xsl:call-template name="capitalizeWords">
 					<xsl:with-param name="str" select="substring-after($str2, ' ')"/>
 				</xsl:call-template>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
-				<xsl:value-of select="substring($str2, 2)"/>
+				<!-- <xsl:value-of select="translate(substring($str2, 1, 1), $lower, $upper)"/>
+				<xsl:value-of select="substring($str2, 2)"/> -->
+				<xsl:call-template name="capitalize">
+					<xsl:with-param name="str" select="$str2"/>
+				</xsl:call-template>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="mathml:math">
+	</xsl:template><xsl:template name="capitalize">
+		<xsl:param name="str"/>
+		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(substring($str, 1, 1)))"/>
+		<xsl:value-of select="substring($str, 2)"/>		
+	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX2Math">
 			<fo:instream-foreign-object fox:alt-text="Math"> 
 				<xsl:copy-of select="."/>
 			</fo:instream-foreign-object>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='localityStack']">
+	</xsl:template><xsl:template match="*[local-name()='localityStack']">
 		<xsl:for-each select="*[local-name()='locality']">
 			<xsl:if test="position() =1"><xsl:text>, </xsl:text></xsl:if>
 			<xsl:apply-templates select="."/>
 			<xsl:if test="position() != last()"><xsl:text>; </xsl:text></xsl:if>
 		</xsl:for-each>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='link']" name="link">
+	</xsl:template><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
@@ -4012,7 +4465,7 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:inline>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='sourcecode']" name="sourcecode">
+	</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>
@@ -4023,19 +4476,29 @@
 			</xsl:choose> -->
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='bookmark']">
+	</xsl:template><xsl:template match="*[local-name()='bookmark']">
 		<fo:inline id="{@id}"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']">
+	</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 xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']/*[local-name()='title']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']/*[local-name()='title']" mode="process">
+	</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 xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']//*[local-name()='example']">
+	</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>
@@ -4045,11 +4508,11 @@
 			</xsl:if>
 		</fo:block>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']//*[local-name()='example']/*[local-name()='name']"/><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name()='appendix']//*[local-name()='example']/*[local-name()='name']" mode="process">
+	</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 xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name() = 'callout']">		
+	</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 xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name() = 'annotation']">
+	</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">			
@@ -4059,14 +4522,25 @@
 				</xsl:apply-templates>
 			</fo:inline>
 		</fo:block>		
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" match="*[local-name() = 'annotation']/*[local-name() = 'p']">
+	</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 xmlns:java="http://xml.apache.org/xalan/java" name="convertDate">
+	</xsl:template><xsl:template match="*[local-name() = 'modification']">
+		<xsl:variable name="title-modified">
+			<xsl:call-template name="getTitle">
+				<xsl:with-param name="name" select="'title-modified'"/>
+			</xsl:call-template>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
+			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
+		</xsl:choose>
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
 		<xsl:variable name="year" select="substring($date, 1, 4)"/>
@@ -4099,7 +4573,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:value-of select="$result"/>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="insertKeywords">
+	</xsl:template><xsl:template name="insertKeywords">
 		<xsl:param name="sorting" select="'true'"/>
 		<xsl:param name="charAtEnd" select="'.'"/>
 		<xsl:param name="charDelim" select="', '"/>
@@ -4122,7 +4596,7 @@
 				</xsl:for-each>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:template xmlns:java="http://xml.apache.org/xalan/java" name="insertKeyword">
+	</xsl:template><xsl:template name="insertKeyword">
 		<xsl:param name="charAtEnd"/>
 		<xsl:param name="charDelim"/>
 		<xsl:apply-templates/>
@@ -4130,4 +4604,136 @@
 			<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
 			<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:template name="addPDFUAmeta">
+		<fo:declarations>
+			<pdf:catalog xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf">
+					<pdf:dictionary type="normal" key="ViewerPreferences">
+						<pdf:boolean key="DisplayDocTitle">true</pdf:boolean>
+					</pdf:dictionary>
+				</pdf:catalog>
+			<x:xmpmeta xmlns:x="adobe:ns:meta/">
+				<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+					<rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:pdf="http://ns.adobe.com/pdf/1.3/" rdf:about="">
+					<!-- Dublin Core properties go here -->
+						<dc:title>
+							<xsl:variable name="title">
+								
+									<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en' and @type = 'main']"/>
+								
+								
+								
+																
+							</xsl:variable>
+							<xsl:choose>
+								<xsl:when test="normalize-space($title) != ''">
+									<xsl:value-of select="$title"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:text> </xsl:text>
+								</xsl:otherwise>
+							</xsl:choose>							
+						</dc:title>
+						<dc:creator>
+							
+							
+						</dc:creator>
+						<dc:description>
+							<xsl:variable name="abstract">
+								
+								
+									<xsl:copy-of select="/*/*[local-name() = 'bibliography']/*[local-name() = 'references']/*[local-name() = 'bibitem']/*[local-name() = 'abstract'][@language = 'en']//text()"/>
+								
+								
+								
+							</xsl:variable>
+							<xsl:value-of select="normalize-space($abstract)"/>
+						</dc:description>
+						<pdf:Keywords>
+							<xsl:call-template name="insertKeywords"/>
+						</pdf:Keywords>
+					</rdf:Description>
+					<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
+						<!-- XMP properties go here -->
+						<xmp:CreatorTool/>
+					</rdf:Description>
+				</rdf:RDF>
+			</x:xmpmeta>
+		</fo:declarations>
+	</xsl:template><xsl:template name="getId">
+		<xsl:choose>
+			<xsl:when test="../@id">
+				<xsl:value-of select="../@id"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<!-- <xsl:value-of select="concat(local-name(..), '_', text())"/> -->
+				<xsl:value-of select="concat(generate-id(..), '_', text())"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="getLevel">
+		<xsl:variable name="level_total" select="count(ancestor::*)"/>
+		<xsl:variable name="level">
+			<xsl:choose>
+				<xsl:when test="ancestor::*[local-name() = 'preface']">
+					<xsl:value-of select="$level_total - 2"/>
+				</xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'sections']">
+					<xsl:value-of select="$level_total - 2"/>
+				</xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'bibliography']">
+					<xsl:value-of select="$level_total - 2"/>
+				</xsl:when>
+				<xsl:when test="local-name(ancestor::*[1]) = 'annex'">1</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="$level_total - 1"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:value-of select="$level"/>
+	</xsl:template><xsl:template name="getSubSection">
+		<xsl:number format=".1" level="multiple" count="*[local-name() = 'clause']/*[local-name() = 'clause'] |                  *[local-name() = 'clause']/*[local-name() = 'terms'] |                  *[local-name() = 'terms']/*[local-name() = 'term'] |                  *[local-name() = 'clause']/*[local-name() = 'term'] |                   *[local-name() = 'terms']/*[local-name() = 'clause'] |                 *[local-name() = 'terms']/*[local-name() = 'definitions'] |                 *[local-name() = 'definitions']/*[local-name() = 'clause'] |                 *[local-name() = 'clause']/*[local-name() = 'definitions'] |                 *[local-name() = 'definitions']/*[local-name() = 'definitions'] |                 *[local-name() = 'clause']/*[local-name() = 'references']"/>
+	</xsl:template><xsl:template name="split">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<xsl:if test="string-length($pText) &gt;0">
+		<item>
+			<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
+		</item>
+		<xsl:call-template name="split">
+			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
+			<xsl:with-param name="sep" select="$sep"/>
+		</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template name="getDocumentId">		
+		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>
+	</xsl:template><xsl:template name="namespaceCheck">
+		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="XSLNS">			
+			
+			
+				<xsl:value-of select="document('')//*/namespace::iec"/>
+			
+			
+			
+			
+			
+			
+			
+			
+			
+						
+						
+		</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>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLanguage">
+		<xsl:param name="lang"/>		
+		<xsl:variable name="language" select="java:toLowerCase(java:java.lang.String.new($lang))"/>
+		<xsl:choose>
+			<xsl:when test="$language = 'en'">English</xsl:when>
+			<xsl:when test="$language = 'fr'">French</xsl:when>
+			<xsl:when test="$language = 'de'">Deutsch</xsl:when>
+			<xsl:when test="$language = 'cn'">Chinese</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template></xsl:stylesheet>