metanorma-iso 1.6.0 → 1.7.3

data/lib/isodoc/iso/html/html_iso_intro.html

@@ -2,7 +2,7 @@
 
 <nav>
 
-  <h1 id="content">Contents</h1>
+  <h1 id="content">{{ labels["table_of_contents"] }}</h1>
   <div id="toc"></div>
 
 </nav>

data/lib/isodoc/iso/html/html_iso_titlepage.html

@@ -8,7 +8,7 @@
     {% endif %}
 
 {% if revdate %}
-<p class="coverpage_docnumber">Date: {{ revdate }}</p>
+<p class="coverpage_docnumber">{{ labels["date"]}}: {{ revdate }}</p>
 {% endif %}
 
 {% if tc_docnumber.size > 0 %}

data/lib/isodoc/iso/html/word_iso_intro.html

@@ -8,7 +8,7 @@ margin-left:5.1pt;margin-right:5.1pt'>
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 {% else %}
 
-<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">Contents</span></p>
+<p class="zzContents" style='margin-top:0cm'><span lang="EN-GB">{{ labels["table_of_contents"] }}</span></p>
 
 WORDTOC
 {% endif %}

data/lib/isodoc/iso/html/word_iso_titlepage.html

@@ -11,7 +11,7 @@ style='mso-bidi-font-weight:normal'><span lang="EN-GB" style='font-size:14.0pt'>
 {% endif %}
 
 {% if revdate %}
-<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>Date: {{ revdate }}</span></p>
+<p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-GB" style='mso-no-proof:yes'>{{ labels["date"]}}: {{ revdate }}</span></p>
 {% endif %}
 
 {% if tc_docnumber.size > 0 %}

data/lib/isodoc/iso/html_convert.rb

@@ -19,9 +19,9 @@ module IsoDoc
 
       def default_fonts(options)
         {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' :
+          bodyfont: (options[:script] == "Hans" ? '"Source Han Sans",serif' :
                      options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
-        headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
+        headerfont: (options[:script] == "Hans" ? '"Source Han Sans",sans-serif' :
                      options[:alt] ? '"Lato",sans-serif' : '"Cambria",serif'),
         monospacefont: (options[:alt] ?  '"Space Mono",monospace' :
                         '"Courier New",monospace'),

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

@@ -12,3 +12,9 @@ all_rights_reserved: All rights reserved
 reference_number: Reference Number
 price_based_on: Price based on % pages
 under_preparation: Under preparation. (Stage at the time of publication %).
+table_of_contents: Contents
+date: Date
+index: Index
+see: see
+see_also: see also
+

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

@@ -12,4 +12,8 @@ all_rights_reserved: Tous droits réservés
 reference_number: Numéro de référence
 price_based_on: Prix basé sur % pages
 under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
+date: Date
+index: Index
+see: voir
+see_also: voir aussi
 

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

@@ -10,4 +10,8 @@ all_rights_reserved: 版权所有
 reference_number: 参考编号
 price_based_on: 价格基于%页
 under_preparation: 制定中（出版时最新状态为%）
+date: 日期
+index: 索引
+see: 见
+see_also: 另见
 

data/lib/isodoc/iso/index.rb

@@ -0,0 +1,139 @@
+module IsoDoc
+  module Iso
+    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+      def add_id
+        %(id="_#{UUIDTools::UUID.random_create}")
+      end
+
+      def index(docxml)
+        unless docxml.at(ns("//index"))
+          docxml.xpath(ns("//indexsect")).each { |i| i.remove }
+          return
+        end
+        i = docxml.at(ns("//indexsect")) ||
+          docxml.root.add_child("<indexsect #{add_id}><title>#{@i18n.index}</title></indexsect>").first
+        index = sort_indexterms(docxml.xpath(ns("//index")), docxml.xpath(ns("//index-xref[@also = 'false']")),
+                                docxml.xpath(ns("//index-xref[@also = 'true']")))
+        index1(docxml, i, index)
+      end
+
+      def index1(docxml, i, index)
+        c = i.add_child("<ul></ul>").first
+        index.keys.sort.each do |k|
+          #c = i.add_child "<clause #{add_id}><title>#{k}</title><ul></ul></clause>"
+          words = index[k].keys.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+          words.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+            #c.first.at(ns("./ul")).add_child index_entries(words, index[k], w)
+            c.add_child index_entries(words, index[k], w)
+          end
+        end
+        @xrefs.bookmark_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
+      end
+
+      def sortable(s)
+        HTMLEntities.new.decode(Nokogiri::XML.fragment(s).text)
+      end
+
+      def index_entries_opt
+        { xref_lbl: ", ", see_lbl: ", #{see_lbl}", also_lbl: ", #{also_lbl}" }
+      end
+
+      def index_entries(words, index, primary)
+        ret = index_entries_head(words[primary], index.dig(words[primary], nil, nil), index_entries_opt)
+        words2 = index[words[primary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        unless words2.empty?
+          ret += "<ul>"
+          words2.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+            ret += index_entries2(words2, index[words[primary]], w)
+          end
+          ret += "</ul>"
+        end
+        ret + "</li>"
+      end
+
+      def index_entries2(words, index, secondary)
+        ret = index_entries_head(words[secondary], index.dig(words[secondary], nil), index_entries_opt)
+        words3 = index[words[secondary]]&.keys&.reject { |k| k.nil?}&.each_with_object({}) { |w, v| v[w.downcase] = w }
+        unless words3.empty?
+          ret += "<ul>"
+          words3.keys.localize(@lang.to_sym).sort.to_a.each do |w|
+            ret += (index_entries_head(words3[w], index[words[secondary]][words3[w]], index_entries_opt) + "</li>")
+          end
+          ret += "</ul>"
+        end
+        ret + "</li>"
+      end
+
+      def index_entries_head(head, entries, opt)
+        ret = "<li>#{head}"
+        xref = entries&.dig(:xref)&.join(", ")
+        see_sort = entries&.dig(:see)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+        see = see_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| see_sort[k] }&.join(", ")
+        also_sort = entries&.dig(:also)&.each_with_object({}) { |w, v| v[sortable(w).downcase] = w }
+        also = also_sort&.keys&.localize(@lang.to_sym)&.sort&.to_a&.map { |k| also_sort[k] }&.join(", ")
+        ret += "#{opt[:xref_lbl]} #{xref}" if xref
+        ret += "#{opt[:see_lbl]} #{see}" if see
+        ret += "#{opt[:also_lbl]} #{also}" if also
+        ret
+      end
+
+      def see_lbl
+        @lang == "en" ? @i18n.see : "<em>#{@i18n.see}</em>"
+      end
+
+      def also_lbl
+        @lang == "en" ? @i18n.see_also : "<em>#{@i18n.see_also}</em>"
+      end
+
+      def sort_indexterms(terms, see, also)
+        index = extract_indexterms(terms)
+        index = extract_indexsee(index, see, :see)
+        index = extract_indexsee(index, also, :also)
+        index.keys.sort.each_with_object({}) do |k, v|
+          v[sortable(k)[0].upcase.transliterate] ||= {}
+          v[sortable(k)[0].upcase.transliterate][k] = index[k]
+        end
+      end
+
+      def extract_indexsee(v, terms, label)
+        terms.each_with_object(v) do |t, v|
+          term = t&.at(ns("./primary"))&.children&.to_xml
+          term2 = t&.at(ns("./secondary"))&.children&.to_xml
+          term3 = t&.at(ns("./tertiary"))&.children&.to_xml
+          v[term] ||= {}
+          v[term][term2] ||= {}
+          v[term][term2][term3] ||= {}
+          v[term][term2][term3][label] ||= []
+          v[term][term2][term3][label] << t&.at(ns("./target"))&.children&.to_xml
+          t.remove
+        end
+      end
+
+      def xml_encode_attr(s)
+        HTMLEntities.new.encode(s, :basic, :hexadecimal).gsub(/\&#x([^;]+);/) { |x| "&#x#{$1.upcase};" }
+      end
+
+      # attributes are decoded into UTF-8, elements in extract_indexsee are still in entities
+      def extract_indexterms(terms)
+        terms.each_with_object({}) do |t, v|
+          term = t&.at(ns("./primary"))&.children&.to_xml
+          term2 = t&.at(ns("./secondary"))&.children&.to_xml
+          term3 = t&.at(ns("./tertiary"))&.children&.to_xml
+          index2bookmark(t)
+          v[term] ||= {}
+          v[term][term2] ||= {}
+          v[term][term2][term3] ||= {}
+          v[term][term2][term3][:xref] ||= []
+          to = t["to"] ? "to='#{t['to']}' " : ""
+          v[term][term2][term3][:xref] << "<xref target='#{t['id']}' #{to}pagenumber='true'/>"
+        end
+      end
+
+      def index2bookmark(t)
+        t.name = "bookmark"
+        t.children.each { |x| x.remove }
+        t["id"] = "_#{UUIDTools::UUID.random_create}"
+      end
+    end
+  end
+end

data/lib/isodoc/iso/iso.amendment.xsl

@@ -1,19 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:java="http://xml.apache.org/xalan/java" exclude-result-prefixes="java" version="1.0">
+<?xml version="1.0" encoding="UTF-8"?><xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:iso="https://www.metanorma.org/ns/iso" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:xalan="http://xml.apache.org/xalan" xmlns:fox="http://xmlgraphics.apache.org/fop/extensions" xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf" 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="svg_images"/>
+	<xsl:param name="external_index"/><!-- path to index xml, generated on 1st pass, based on FOP Intermediate Format -->
 	<xsl:variable name="images" select="document($svg_images)"/>
 	
 	
 
 	<xsl:key name="kfn" match="iso:p/iso:fn" use="@reference"/>
 	
+	<xsl:key name="attachments" match="iso:eref[contains(@bibitemid, '.exp')]" use="@bibitemid"/>
+	
 	
 	
 	<xsl:variable name="debug">false</xsl:variable>
-	<xsl:variable name="pageWidth" select="'210mm'"/>
-	<xsl:variable name="pageHeight" select="'297mm'"/>
+	<xsl:variable name="pageWidth" select="210"/>
+	<xsl:variable name="pageHeight" select="297"/>
+	<xsl:variable name="marginLeftRight1" select="25"/>
+	<xsl:variable name="marginLeftRight2" select="12.5"/>
+	<xsl:variable name="marginTop" select="27.4"/>
+	<xsl:variable name="marginBottom" select="13"/>
+
+	<xsl:variable name="figure_name_height">14</xsl:variable>
+	<xsl:variable name="width_effective" select="$pageWidth - $marginLeftRight1 - $marginLeftRight2"/><!-- paper width minus margins -->
+	<xsl:variable name="height_effective" select="$pageHeight - $marginTop - $marginBottom - $figure_name_height"/><!-- paper height minus margins and title height -->
+	<xsl:variable name="image_dpi" select="96"/>
+	<xsl:variable name="width_effective_px" select="$width_effective div 25.4 * $image_dpi"/>
+	<xsl:variable name="height_effective_px" select="$height_effective div 25.4 * $image_dpi"/>
 
 	<xsl:variable name="docidentifierISO" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso'] | /iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'ISO']"/>
 
@@ -157,6 +171,7 @@
 		<contents>
 			<xsl:call-template name="processPrefaceSectionsDefault_Contents"/>
 			<xsl:call-template name="processMainSectionsDefault_Contents"/>
+			<xsl:apply-templates select="//iso:indexsect" mode="contents"/>
 		</contents>
 	</xsl:variable>
 	
@@ -170,10 +185,11 @@
 			<xsl:if test="$lang = 'zh'">
 				<xsl:attribute name="font-family">Source Han Sans, Times New Roman, Cambria Math</xsl:attribute>
 			</xsl:if>
+			
 			<fo:layout-master-set>
 				
 				<!-- cover page -->
-				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="31.7mm" margin-right="31.7mm"/>
 					<fo:region-before region-name="cover-page-header" extent="25.4mm"/>
 					<fo:region-after/>
@@ -181,7 +197,7 @@
 					<fo:region-end region-name="cover-right-region" extent="31.7mm"/>
 				</fo:simple-page-master>
 				
-				<fo:simple-page-master master-name="cover-page-published" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="cover-page-published" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="12.7mm" margin-bottom="40mm" margin-left="78mm" margin-right="18.5mm"/>
 					<fo:region-before region-name="cover-page-header" extent="12.7mm"/>
 					<fo:region-after region-name="cover-page-footer" extent="40mm" display-align="after"/>
@@ -190,19 +206,19 @@
 				</fo:simple-page-master>
 				
 				
-				<fo:simple-page-master master-name="cover-page-publishedISO-odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="12.7mm" margin-bottom="40mm" margin-left="25mm" margin-right="12.5mm"/>
+				<fo:simple-page-master master-name="cover-page-publishedISO-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="12.7mm" margin-bottom="40mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
 					<fo:region-before region-name="cover-page-header" extent="12.7mm"/>
 					<fo:region-after region-name="cover-page-footer" extent="40mm" display-align="after"/>
-					<fo:region-start region-name="cover-left-region" extent="25mm"/>
-					<fo:region-end region-name="cover-right-region" extent="12.5mm"/>
+					<fo:region-start region-name="cover-left-region" extent="{$marginLeftRight1}mm"/>
+					<fo:region-end region-name="cover-right-region" extent="{$marginLeftRight2}mm"/>
 				</fo:simple-page-master>
-				<fo:simple-page-master master-name="cover-page-publishedISO-even" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="12.7mm" margin-bottom="40mm" margin-left="12.5mm" margin-right="25mm"/>
+				<fo:simple-page-master master-name="cover-page-publishedISO-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="12.7mm" margin-bottom="40mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
 					<fo:region-before region-name="cover-page-header" extent="12.7mm"/>
 					<fo:region-after region-name="cover-page-footer" extent="40mm" display-align="after"/>
-					<fo:region-start region-name="cover-left-region" extent="12.5mm"/>
-					<fo:region-end region-name="cover-right-region" extent="25mm"/>
+					<fo:region-start region-name="cover-left-region" extent="{$marginLeftRight2}mm"/>
+					<fo:region-end region-name="cover-right-region" extent="{$marginLeftRight1}mm"/>
 				</fo:simple-page-master>
 				<fo:page-sequence-master master-name="cover-page-publishedISO">
 					<fo:repeatable-page-master-alternatives>
@@ -214,7 +230,7 @@
 
 				<!-- contents pages -->
 				<!-- odd pages -->
-				<fo:simple-page-master master-name="odd" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="19mm" margin-right="19mm"/>
 					<fo:region-before region-name="header-odd" extent="27.4mm"/> <!--   display-align="center" -->
 					<fo:region-after region-name="footer-odd" extent="13mm"/>
@@ -222,7 +238,7 @@
 					<fo:region-end region-name="right-region" extent="19mm"/>
 				</fo:simple-page-master>
 				<!-- even pages -->
-				<fo:simple-page-master master-name="even" page-width="{$pageWidth}" page-height="{$pageHeight}">
+				<fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
 					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="19mm" margin-right="19mm"/>
 					<fo:region-before region-name="header-even" extent="27.4mm"/> <!--   display-align="center" -->
 					<fo:region-after region-name="footer-even" extent="13mm"/>
@@ -244,35 +260,35 @@
 				
 				
 				<!-- first page -->
-				<fo:simple-page-master master-name="first-publishedISO" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="25mm" margin-right="12.5mm"/>
-					<fo:region-before region-name="header-first" extent="27.4mm"/> <!--   display-align="center" -->
-					<fo:region-after region-name="footer-odd" extent="13mm"/>
-					<fo:region-start region-name="left-region" extent="25mm"/>
-					<fo:region-end region-name="right-region" extent="12.5mm"/>
+				<fo:simple-page-master master-name="first-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-first" extent="{$marginTop}mm"/> <!--   display-align="center" -->
+					<fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
+					<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 				</fo:simple-page-master>
 				<!-- odd pages -->
-				<fo:simple-page-master master-name="odd-publishedISO" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="25mm" margin-right="12.5mm"/>
-					<fo:region-before region-name="header-odd" extent="27.4mm"/> <!--   display-align="center" -->
-					<fo:region-after region-name="footer-odd" extent="13mm"/>
-					<fo:region-start region-name="left-region" extent="25mm"/>
-					<fo:region-end region-name="right-region" extent="12.5mm"/>
+				<fo:simple-page-master master-name="odd-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
+					<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> <!--   display-align="center" -->
+					<fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
+					<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
 				</fo:simple-page-master>
 				<!-- even pages -->
-				<fo:simple-page-master master-name="even-publishedISO" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="12.5mm" margin-right="25mm"/>
-					<fo:region-before region-name="header-even" extent="27.4mm"/>
-					<fo:region-after region-name="footer-even" extent="13mm"/>
-					<fo:region-start region-name="left-region" extent="12.5mm"/>
-					<fo:region-end region-name="right-region" extent="25mm"/>
+				<fo:simple-page-master master-name="even-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
+					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
+					<fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
+					<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
 				</fo:simple-page-master>
-				<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="12.5mm" margin-right="25mm"/>
-					<fo:region-before region-name="header" extent="27.4mm"/>
-					<fo:region-after region-name="footer" extent="13mm"/>
-					<fo:region-start region-name="left" extent="12.5mm"/>
-					<fo:region-end region-name="right" extent="25mm"/>
+				<fo:simple-page-master master-name="blankpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
+					<fo:region-before region-name="header" extent="{$marginTop}mm"/>
+					<fo:region-after region-name="footer" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left" extent="{$marginLeftRight2}mm"/>
+					<fo:region-end region-name="right" extent="{$marginLeftRight1}mm"/>
 				</fo:simple-page-master>
 				<fo:page-sequence-master master-name="preface-publishedISO">
 					<fo:repeatable-page-master-alternatives>
@@ -291,17 +307,48 @@
 					</fo:repeatable-page-master-alternatives>
 				</fo:page-sequence-master>
 				
-				<fo:simple-page-master master-name="last-page" page-width="{$pageWidth}" page-height="{$pageHeight}">
-					<fo:region-body margin-top="27.4mm" margin-bottom="13mm" margin-left="12.5mm" margin-right="25mm"/>
-					<fo:region-before region-name="header-even" extent="27.4mm"/>
-					<fo:region-after region-name="last-page-footer" extent="13mm"/>
-					<fo:region-start region-name="left-region" extent="12.5mm"/>
-					<fo:region-end region-name="right-region" extent="25mm"/>
+				<fo:simple-page-master master-name="last-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
+					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
+					<fo:region-after region-name="last-page-footer" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
+					<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
 				</fo:simple-page-master>
 				
+				<!-- Index pages -->
+				<fo:simple-page-master master-name="index-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="2" column-gap="10mm"/>
+					<fo:region-before region-name="header-odd" extent="{$marginTop}mm"/>
+					<fo:region-after region-name="footer-odd" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="{$marginLeftRight1}mm"/>
+					<fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
+				</fo:simple-page-master>
+				<fo:simple-page-master master-name="index-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
+					<fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="2" column-gap="10mm"/>
+					<fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
+					<fo:region-after region-name="footer-even" extent="{$marginBottom}mm"/>
+					<fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
+					<fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
+				</fo:simple-page-master>
+				<fo:page-sequence-master master-name="index">
+					<fo:repeatable-page-master-alternatives>						
+						<fo:conditional-page-master-reference odd-or-even="even" master-reference="index-even"/>
+						<fo:conditional-page-master-reference odd-or-even="odd" master-reference="index-odd"/>
+					</fo:repeatable-page-master-alternatives>
+				</fo:page-sequence-master>
+				
+				
 			</fo:layout-master-set>
+			
+			<fo:declarations>
+				<xsl:call-template name="addPDFUAmeta"/>
+				<xsl:for-each select="//*[local-name() = 'eref'][generate-id(.)=generate-id(key('attachments',@bibitemid)[1])]">
+					<xsl:variable name="url" select="concat('url(', ., ')')"/>
+					<pdf:embedded-file src="{$url}"/>
+				</xsl:for-each>
+			</fo:declarations>
 
-			<xsl:call-template name="addPDFUAmeta"/>
+			
 			
 			<xsl:call-template name="addBookmarks">
 				<xsl:with-param name="contents" select="$contents"/>
@@ -1024,20 +1071,20 @@
 							<fo:block-container font-weight="bold">
 								
 								<fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
-									<xsl:variable name="title-toc">
-										<xsl:call-template name="getTitle">
-											<xsl:with-param name="name" select="'title-toc'"/>
+									<fo:inline font-size="16pt" font-weight="bold">
+										<!-- Contents -->
+										<xsl:call-template name="getLocalizedString">
+											<xsl:with-param name="key">table_of_contents</xsl:with-param>
 										</xsl:call-template>
-									</xsl:variable>
-									<fo:inline font-size="16pt" font-weight="bold"><xsl:value-of select="$title-toc"/></fo:inline>
+									</fo:inline>
 									<fo:inline keep-together.within-line="always">
 										<fo:leader leader-pattern="space"/>
-										<xsl:variable name="title-page">
-											<xsl:call-template name="getTitle">
-												<xsl:with-param name="name" select="'title-page'"/>
-											</xsl:call-template>
-										</xsl:variable>
-										<fo:inline font-weight="normal" font-size="10pt"><xsl:value-of select="$title-page"/></fo:inline>
+										<fo:inline font-weight="normal" font-size="10pt">
+											<!-- Page -->
+											<xsl:call-template name="getLocalizedString">
+											<xsl:with-param name="key">locality.page</xsl:with-param>
+										</xsl:call-template>
+										</fo:inline>
 									</fo:inline>
 								</fo:block>
 								
@@ -1182,6 +1229,10 @@
 				</fo:flow>
 			</fo:page-sequence>
 			
+			
+			<!-- Index -->
+			<xsl:apply-templates select="//iso:indexsect" mode="index"/>
+			
 			<xsl:if test="$isPublished = 'true'">
 				<fo:page-sequence master-reference="last-page" force-page-count="no-force">
 					<xsl:call-template name="insertHeaderEven"/>
@@ -1314,7 +1365,10 @@
 		</xsl:variable>
 		
 		<xsl:variable name="type">
-			<xsl:value-of select="local-name()"/>
+			<xsl:choose>
+				<xsl:when test="local-name() = 'indexsect'">index</xsl:when>
+				<xsl:otherwise><xsl:value-of select="local-name()"/></xsl:otherwise>
+			</xsl:choose>
 		</xsl:variable>
 			
 		<xsl:variable name="display">
@@ -1347,10 +1401,15 @@
 			</xsl:variable>
 			
 			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
+				<xsl:if test="$type = 'index'">
+					<xsl:attribute name="level">1</xsl:attribute>
+				</xsl:if>
 				<title>
 					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
 				</title>
-				<xsl:apply-templates mode="contents"/>
+				<xsl:if test="$type != 'index'">
+					<xsl:apply-templates mode="contents"/>
+				</xsl:if>
 			</item>
 		</xsl:if>
 	</xsl:template>
@@ -1588,6 +1647,9 @@
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+			<xsl:if test="@id">
+				<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</xsl:element>
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
@@ -1891,7 +1953,300 @@
 		</fo:block>
 	</xsl:template>
 	
+	<!-- =================== -->
+	<!-- SVG images processing -->
+	<!-- =================== -->
+	<xsl:template match="*[local-name() = 'figure'][not(*[local-name() = 'image'])]/*[local-name() = 'svg']" priority="2">
+		
+		<xsl:choose>
+			<xsl:when test=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]">
+				<fo:block>
+					<xsl:variable name="width" select="@width"/>
+					<xsl:variable name="height" select="@height"/>
+					
+					<xsl:variable name="scale_x">
+						<xsl:choose>
+							<xsl:when test="$width &gt; $width_effective_px">
+								<xsl:value-of select="$width_effective_px div $width"/>
+							</xsl:when>
+							<xsl:otherwise>1</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					
+					<xsl:variable name="scale_y">
+						<xsl:choose>
+							<xsl:when test="$height * $scale_x &gt; $height_effective_px">
+								<xsl:value-of select="$height_effective_px div ($height * $scale_x)"/>
+							</xsl:when>
+							<xsl:otherwise>1</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					
+					<xsl:variable name="scale">
+						<xsl:choose>
+							<xsl:when test="$scale_y != 1">
+								<xsl:value-of select="$scale_x * $scale_y"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="$scale_x"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+					 
+					<xsl:variable name="width_scale" select="round($width * $scale)"/>
+					<xsl:variable name="height_scale" select="round($height * $scale)"/>
+					
+					<fo:table table-layout="fixed" width="100%">
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-column column-width="{$width_scale}px"/>
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-body>
+							<fo:table-row>
+								<fo:table-cell column-number="2">
+									<fo:block>
+										<fo:block-container width="{$width_scale}px" height="{$height_scale}px">
+											<fo:block text-depth="0" line-height="0" font-size="0">
+												<fo:instream-foreign-object fox:alt-text="{../*[local-name() = 'name']}">
+													<xsl:attribute name="width">100%</xsl:attribute>
+													<xsl:attribute name="content-height">100%</xsl:attribute>
+													<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+													<xsl:attribute name="scaling">uniform</xsl:attribute>
+
+													<xsl:apply-templates select="." mode="svg_remove_a"/>
+												</fo:instream-foreign-object>
+											</fo:block>
+											
+											<xsl:apply-templates select=".//*[local-name() = 'a'][*[local-name() = 'rect'] or *[local-name() = 'polygon'] or *[local-name() = 'circle'] or *[local-name() = 'ellipse']]" mode="svg_imagemap_links">
+												<xsl:with-param name="scale" select="$scale"/>
+											</xsl:apply-templates>
+										</fo:block-container>
+									</fo:block>
+								</fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+					</fo:table>
+				</fo:block>
+				
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block xsl:use-attribute-sets="image-style">
+					<fo:instream-foreign-object fox:alt-text="{../*[local-name() = 'name']}">
+						<xsl:attribute name="width">100%</xsl:attribute>
+						<xsl:attribute name="content-height">100%</xsl:attribute>
+						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
+						<!-- effective height 297 - 27.4 - 13 =  256.6 -->
+						<!-- effective width 210 - 12.5 - 25 = 172.5 -->
+						<!-- effective height / width = 1.48, 1.4 - with title -->
+						<xsl:if test="@height &gt; (@width * 1.4)"> <!-- for images with big height -->
+							<xsl:variable name="width" select="((@width * 1.4) div @height) * 100"/>
+							<xsl:attribute name="width"><xsl:value-of select="$width"/>%</xsl:attribute>
+						</xsl:if>
+						<xsl:attribute name="scaling">uniform</xsl:attribute>
+						<xsl:copy-of select="."/>
+					</fo:instream-foreign-object>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template match="@*|node()" mode="svg_remove_a">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="svg_remove_a"/>
+		</xsl:copy>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'a']" mode="svg_remove_a">
+		<xsl:apply-templates mode="svg_remove_a"/>
+	</xsl:template>
+	
+	<xsl:template match="*[local-name() = 'a']" mode="svg_imagemap_links">
+		<xsl:param name="scale"/>
+		<xsl:variable name="dest">
+			<xsl:choose>
+				<xsl:when test="starts-with(@href, '#')">
+					<xsl:value-of select="substring-after(@href, '#')"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="@href"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:for-each select="./*[local-name() = 'rect']">
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor(@x * $scale)"/>
+				<xsl:with-param name="top" select="floor(@y * $scale)"/>
+				<xsl:with-param name="width" select="floor(@width * $scale)"/>
+				<xsl:with-param name="height" select="floor(@height * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+		
+		<xsl:for-each select="./*[local-name() = 'polygon']">
+			<xsl:variable name="points">
+				<xsl:call-template name="split">
+					<xsl:with-param name="pText" select="@points"/>
+				</xsl:call-template>
+			</xsl:variable>
+			<xsl:variable name="x_coords">
+				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 1]">
+					<xsl:sort select="." data-type="number"/>
+					<x><xsl:value-of select="."/></x>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="y_coords">
+				<xsl:for-each select="xalan:nodeset($points)//item[position() mod 2 = 0]">
+					<xsl:sort select="." data-type="number"/>
+					<y><xsl:value-of select="."/></y>
+				</xsl:for-each>
+			</xsl:variable>
+			<xsl:variable name="x" select="xalan:nodeset($x_coords)//x[1]"/>
+			<xsl:variable name="y" select="xalan:nodeset($y_coords)//y[1]"/>
+			<xsl:variable name="width" select="xalan:nodeset($x_coords)//x[last()] - $x"/>
+			<xsl:variable name="height" select="xalan:nodeset($y_coords)//y[last()] - $y"/>
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor($x * $scale)"/>
+				<xsl:with-param name="top" select="floor($y * $scale)"/>
+				<xsl:with-param name="width" select="floor($width * $scale)"/>
+				<xsl:with-param name="height" select="floor($height * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+		
+		<xsl:for-each select="./*[local-name() = 'circle']">
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor((@cx - @r) * $scale)"/>
+				<xsl:with-param name="top" select="floor((@cy - @r) * $scale)"/>
+				<xsl:with-param name="width" select="floor(@r * 2 * $scale)"/>
+				<xsl:with-param name="height" select="floor(@r * 2 * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+		<xsl:for-each select="./*[local-name() = 'ellipse']">
+			<xsl:call-template name="insertSVGMapLink">
+				<xsl:with-param name="left" select="floor((@cx - @rx) * $scale)"/>
+				<xsl:with-param name="top" select="floor((@cy - @ry) * $scale)"/>
+				<xsl:with-param name="width" select="floor(@rx * 2 * $scale)"/>
+				<xsl:with-param name="height" select="floor(@ry * 2 * $scale)"/>
+				<xsl:with-param name="dest" select="$dest"/>
+			</xsl:call-template>
+		</xsl:for-each>
+	</xsl:template>
+	
+	<xsl:template name="insertSVGMapLink">
+		<xsl:param name="left"/>
+		<xsl:param name="top"/>
+		<xsl:param name="width"/>
+		<xsl:param name="height"/>
+		<xsl:param name="dest"/>
+		<fo:block-container position="absolute" left="{$left}px" top="{$top}px" width="{$width}px" height="{$height}px">
+		 <fo:block font-size="1pt">
+			<fo:basic-link internal-destination="{$dest}" fox:alt-text="svg link">
+				<fo:inline-container inline-progression-dimension="100%">
+					<fo:block-container height="{$height - 1}px" width="100%">
+						<!-- DEBUG <xsl:if test="local-name()='polygon'">
+							<xsl:attribute name="background-color">magenta</xsl:attribute>
+						</xsl:if> -->
+					<fo:block> </fo:block></fo:block-container>
+				</fo:inline-container>
+			</fo:basic-link>
+		 </fo:block>
+	  </fo:block-container>
+	</xsl:template>
+	
+	<!-- =================== -->
+	<!-- End SVG images processing -->
+	<!-- =================== -->
+	
+	<!-- For express listings PDF attachments -->
+	<xsl:template match="*[local-name() = 'eref'][contains(., '.exp')]" priority="2">
+		<fo:inline xsl:use-attribute-sets="eref-style">
+			<xsl:variable name="url" select="concat('url(embedded-file:', @bibitemid, ')')"/>
+			<fo:basic-link external-destination="{$url}" fox:alt-text="{@citeas}">
+				<xsl:if test="normalize-space(@citeas) = ''">
+					<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+				</xsl:if>
+				<xsl:apply-templates/>
+			</fo:basic-link>
+		</fo:inline>
+	</xsl:template>
+	
 
+	<!-- =================== -->
+	<!-- Index processing -->
+	<!-- =================== -->
+	
+	<xsl:template match="iso:indexsect"/>
+	<xsl:template match="iso:indexsect" mode="index">
+	
+		<fo:page-sequence master-reference="index" force-page-count="no-force">
+			<xsl:variable name="header-title">
+				<xsl:choose>
+					<xsl:when test="./iso:title[1]/*[local-name() = 'tab']">
+						<xsl:apply-templates select="./iso:title[1]/*[local-name() = 'tab'][1]/following-sibling::node()" mode="header"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="./iso:title[1]" mode="header"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:call-template name="insertHeaderFooter">
+				<xsl:with-param name="header-title" select="$header-title"/>
+			</xsl:call-template>
+			
+			<fo:flow flow-name="xsl-region-body">
+				<fo:block id="{@id}" span="all">
+					<xsl:apply-templates select="iso:title"/>
+				</fo:block>
+				<fo:block>
+					<xsl:apply-templates select="*[not(local-name() = 'title')]"/>
+				</fo:block>
+			</fo:flow>
+		</fo:page-sequence>
+	</xsl:template>
+	
+	<!-- <xsl:template match="iso:clause[@type = 'index']/iso:title" priority="4"> -->
+	<xsl:template match="iso:indexsect/iso:title" priority="4">
+		<fo:block font-size="16pt" font-weight="bold" margin-bottom="84pt">
+			<!-- Index -->
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+		
+	<!-- <xsl:template match="iso:clause[@type = 'index']/iso:clause/iso:title" priority="4"> -->
+	<xsl:template match="iso:indexsect/iso:clause/iso:title" priority="4">
+		<!-- Letter A, B, C, ... -->
+		<fo:block font-size="10pt" font-weight="bold" margin-bottom="3pt" keep-with-next="always">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	
+	<xsl:template match="iso:indexsect//iso:li/text()">
+		<!-- to split by '_' and other chars -->
+		<xsl:call-template name="add-zero-spaces-java"/>
+	</xsl:template>
+	
+	<xsl:template match="iso:xref" priority="2">
+		<fo:basic-link internal-destination="{@target}" fox:alt-text="{@target}" xsl:use-attribute-sets="xref-style">
+			<xsl:choose>
+				<xsl:when test="@pagenumber='true'">
+					<fo:inline>
+						<xsl:if test="@id">
+							<xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
+						</xsl:if>
+						<fo:page-number-citation ref-id="{@target}"/>
+					</fo:inline>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</fo:basic-link>
+	</xsl:template>
+	
+	<!-- =================== -->
+	<!-- End of Index processing -->
+	<!-- =================== -->
+	
 	
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="font-weight" select="'bold'"/>
@@ -2393,6 +2748,9 @@
 		
 		
 		
+			<xsl:attribute name="text-align">justify</xsl:attribute>
+		
+		
 		
 		
 		
@@ -2534,6 +2892,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-source-style">		
 		
 		
@@ -2670,201 +3029,240 @@
 	</xsl:template><xsl:template match="*[local-name()='td']//text() | *[local-name()='th']//text() | *[local-name()='dt']//text() | *[local-name()='dd']//text()" priority="1">
 		<!-- <xsl:call-template name="add-zero-spaces"/> -->
 		<xsl:call-template name="add-zero-spaces-java"/>
-	</xsl:template><xsl:template match="*[local-name()='table']">
+	</xsl:template><xsl:template match="*[local-name()='table']" name="table">
 	
-		<xsl:variable name="simple-table">	
-			<xsl:call-template name="getSimpleTable"/>			
-		</xsl:variable>
+		<xsl:variable name="table">
 	
-		
-		
-		
-		
-		<!-- <xsl:if test="$namespace = 'bipm'">
-			<fo:block>&#xA0;</fo:block>				
-		</xsl:if> -->
-		
-		<!-- $namespace = 'iso' or  -->
-		
-				
+			<xsl:variable name="simple-table">	
+				<xsl:call-template name="getSimpleTable"/>			
+			</xsl:variable>
 		
 			
-		
-		<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
-		
-		<!-- <xsl:variable name="cols-count">
-			<xsl:choose>
-				<xsl:when test="*[local-name()='thead']">
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:call-template name="calculate-columns-numbers">
-						<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
-					</xsl:call-template>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable> -->
-		<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
-		<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
-		
-		
-		
-		<xsl:variable name="colwidths">
-			<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
-				<xsl:call-template name="calculate-column-widths">
-					<xsl:with-param name="cols-count" select="$cols-count"/>
-					<xsl:with-param name="table" select="$simple-table"/>
-				</xsl:call-template>
-			</xsl:if>
-		</xsl:variable>
-		<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
-		
-		<!-- <xsl:variable name="colwidths2">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-			</xsl:call-template>
-		</xsl:variable> -->
-		
-		<!-- cols-count=<xsl:copy-of select="$cols-count"/>
-		colwidthsNew=<xsl:copy-of select="$colwidths"/>
-		colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
-		
-		<xsl:variable name="margin-left">
-			<xsl:choose>
-				<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
-				<xsl:otherwise>0</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		
-		<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
 			
-				<xsl:attribute name="font-size">10pt</xsl:attribute>
 			
 			
-						
-						
-						
+			<!-- <xsl:if test="$namespace = 'bipm'">
+				<fo:block>&#xA0;</fo:block>				
+			</xsl:if> -->
 			
+			<!-- $namespace = 'iso' or  -->
 			
-									
+					
 			
+				
+			
+			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
+			
+			<!-- <xsl:variable name="cols-count">
+				<xsl:choose>
+					<xsl:when test="*[local-name()='thead']">
+						<xsl:call-template name="calculate-columns-numbers">
+							<xsl:with-param name="table-row" select="*[local-name()='thead']/*[local-name()='tr'][1]"/>
+						</xsl:call-template>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:call-template name="calculate-columns-numbers">
+							<xsl:with-param name="table-row" select="*[local-name()='tbody']/*[local-name()='tr'][1]"/>
+						</xsl:call-template>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable> -->
+			<!-- cols-count=<xsl:copy-of select="$cols-count"/> -->
+			<!-- cols-count2=<xsl:copy-of select="$cols-count2"/> -->
 			
-				<xsl:attribute name="margin-top">12pt</xsl:attribute>
-				<xsl:attribute name="margin-left">0mm</xsl:attribute>
-				<xsl:attribute name="margin-right">0mm</xsl:attribute>
-				<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
 			
 			
+			<xsl:variable name="colwidths">
+				<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
+					<xsl:call-template name="calculate-column-widths">
+						<xsl:with-param name="cols-count" select="$cols-count"/>
+						<xsl:with-param name="table" select="$simple-table"/>
+					</xsl:call-template>
+				</xsl:if>
+			</xsl:variable>
+			<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 			
+			<!-- <xsl:variable name="colwidths2">
+				<xsl:call-template name="calculate-column-widths">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+				</xsl:call-template>
+			</xsl:variable> -->
 			
+			<!-- cols-count=<xsl:copy-of select="$cols-count"/>
+			colwidthsNew=<xsl:copy-of select="$colwidths"/>
+			colwidthsOld=<xsl:copy-of select="$colwidths2"/>z -->
 			
+			<xsl:variable name="margin-left">
+				<xsl:choose>
+					<xsl:when test="sum(xalan:nodeset($colwidths)//column) &gt; 75">15</xsl:when>
+					<xsl:otherwise>0</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			
-			<xsl:variable name="table_attributes">
-				<attribute name="table-layout">fixed</attribute>
-				<attribute name="width">100%</attribute>
-				<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
-				<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
+			<fo:block-container margin-left="-{$margin-left}mm" margin-right="-{$margin-left}mm">			
+				
+					<xsl:attribute name="font-size">10pt</xsl:attribute>
 				
-					<attribute name="border">1.5pt solid black</attribute>
-					<xsl:if test="*[local-name()='thead']">
-						<attribute name="border-top">1pt solid black</attribute>
-					</xsl:if>
 				
+							
+							
+							
 				
 				
+										
 				
-					<attribute name="margin-left">0mm</attribute>
-					<attribute name="margin-right">0mm</attribute>
 				
-								
-								
-								
+					<xsl:attribute name="margin-top">12pt</xsl:attribute>
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+					<xsl:attribute name="margin-right">0mm</xsl:attribute>
+					<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
+				
+				
+				
+				
+				
+				<xsl:variable name="table_width">
+					<!-- for centered table always 100% (@width will be set for middle/second cell of outer table) -->
+					100%
+							
+					
+				</xsl:variable>
+				
+				<xsl:variable name="table_attributes">
+					<attribute name="table-layout">fixed</attribute>
+					<attribute name="width"><xsl:value-of select="normalize-space($table_width)"/></attribute>
+					<attribute name="margin-left"><xsl:value-of select="$margin-left"/>mm</attribute>
+					<attribute name="margin-right"><xsl:value-of select="$margin-left"/>mm</attribute>
+					
+						<attribute name="border">1.5pt solid black</attribute>
+						<xsl:if test="*[local-name()='thead']">
+							<attribute name="border-top">1pt solid black</attribute>
+						</xsl:if>
+					
+					
+					
+					
+						<attribute name="margin-left">0mm</attribute>
+						<attribute name="margin-right">0mm</attribute>
+					
+									
+									
+									
+					
+									
+					
+				</xsl:variable>
+				
+				
+				<fo:table id="{@id}" table-omit-footer-at-break="true">
+					
+					<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">					
+						<xsl:attribute name="{@name}">
+							<xsl:value-of select="."/>
+						</xsl:attribute>
+					</xsl:for-each>
+					
+					<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>				
+					<xsl:if test="$isNoteOrFnExist = 'true'">
+						<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
+					</xsl:if>
+					
+					<xsl:choose>
+						<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
+							<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
+								<fo:table-column column-width="{@width}"/>
+							</xsl:for-each>
+						</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>
+					
+					<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>
+				
+				<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>				
+				<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
+					<xsl:call-template name="insertTableFooterInSeparateTable">
+						<xsl:with-param name="table_attributes" select="$table_attributes"/>
+						<xsl:with-param name="colwidths" select="$colwidths"/>				
+						<xsl:with-param name="colgroup" select="$colgroup"/>				
+					</xsl:call-template>
+				</xsl:for-each>
+				
+				<!-- insert footer as table -->
+				<!-- <fo:table>
+					<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
+						<xsl:attribute name="{@name}">
+							<xsl:value-of select="."/>
+						</xsl:attribute>
+					</xsl:for-each>
+					
+					<xsl:for-each select="xalan:nodeset($colwidths)//column">
+						<xsl:choose>
+							<xsl:when test=". = 1 or . = 0">
+								<fo:table-column column-width="proportional-column-width(2)"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<fo:table-column column-width="proportional-column-width({.})"/>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+				</fo:table>-->
 				
-								
 				
-			</xsl:variable>
-			
-			
-			<fo:table id="{@id}" table-omit-footer-at-break="true">
 				
-				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">					
-					<xsl:attribute name="{@name}">
-						<xsl:value-of select="."/>
-					</xsl:attribute>
-				</xsl:for-each>
 				
-				<xsl:variable name="isNoteOrFnExist" select="./*[local-name()='note'] or .//*[local-name()='fn'][local-name(..) != 'name']"/>				
-				<xsl:if test="$isNoteOrFnExist = 'true'">
-					<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
-				</xsl:if>
 				
-				<xsl:choose>
-					<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
-						<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
-							<fo:table-column column-width="{@width}"/>
-						</xsl:for-each>
-					</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:block-container>
+		</xsl:variable>
+		
+		
+		
+		<xsl:choose>
+			<xsl:when test="@width">
+	
+				<!-- centered table when table name is centered (see table-name-style) -->
 				
-				<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 table-layout="fixed" width="100%">
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-column column-width="{@width}"/>
+						<fo:table-column column-width="proportional-column-width(1)"/>
+						<fo:table-body>
+							<fo:table-row>
+								<fo:table-cell column-number="2">
+									<fo:block><xsl:copy-of select="$table"/></fo:block>
+								</fo:table-cell>
+							</fo:table-row>
+						</fo:table-body>
+					</fo:table>
 				
-			</fo:table>
-			
-			<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>				
-			<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
-				<xsl:call-template name="insertTableFooterInSeparateTable">
-					<xsl:with-param name="table_attributes" select="$table_attributes"/>
-					<xsl:with-param name="colwidths" select="$colwidths"/>				
-					<xsl:with-param name="colgroup" select="$colgroup"/>				
-				</xsl:call-template>
-			</xsl:for-each>
-			
-			<!-- insert footer as table -->
-			<!-- <fo:table>
-				<xsl:for-each select="xalan::nodeset($table_attributes)/attribute">
-					<xsl:attribute name="{@name}">
-						<xsl:value-of select="."/>
-					</xsl:attribute>
-				</xsl:for-each>
 				
-				<xsl:for-each select="xalan:nodeset($colwidths)//column">
-					<xsl:choose>
-						<xsl:when test=". = 1 or . = 0">
-							<fo:table-column column-width="proportional-column-width(2)"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<fo:table-column column-width="proportional-column-width({.})"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:for-each>
-			</fo:table>-->
-			
-			
-			
-			
-			
-		</fo:block-container>
+				
+				
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="$table"/>
+			</xsl:otherwise>
+		</xsl:choose>
+		
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
@@ -2994,7 +3392,15 @@
 	</xsl:template><xsl:template match="*[local-name()='link']" mode="td_text">
 		<xsl:value-of select="@target"/>
 	</xsl:template><xsl:template match="*[local-name()='math']" mode="td_text">
-		<xsl:variable name="math_text" select="normalize-space(.)"/>
+		<xsl:variable name="mathml">
+			<xsl:for-each select="*">
+				<xsl:if test="local-name() != 'unit' and local-name() != 'prefix' and local-name() != 'dimension' and local-name() != 'quantity'">
+					<xsl:copy-of select="."/>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		
+		<xsl:variable name="math_text" select="normalize-space(xalan:nodeset($mathml))"/>
 		<xsl:value-of select="translate($math_text, ' ', '#')"/><!-- mathml images as one 'word' without spaces -->
 	</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
 		<xsl:param name="cols-count"/>
@@ -3771,7 +4177,7 @@
 										<xsl:with-param name="table" select="$html-table"/>
 									</xsl:call-template>
 								</xsl:variable>
-								<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
+								<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 								<xsl:variable name="maxlength_dt">							
 									<xsl:call-template name="getMaxLength_dt"/>							
 								</xsl:variable>
@@ -3800,13 +4206,22 @@
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:choose>
+					<!-- to set width check most wide chars like `W` -->
 					<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%"/>
+						<fo:table-column column-width="7%"/>
+						<fo:table-column column-width="93%"/>
+					</xsl:when>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 5"> <!-- if dt contains short text like ABC, etc -->
+						<fo:table-column column-width="15%"/>
+						<fo:table-column column-width="85%"/>
+					</xsl:when>
+					<xsl:when test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 7"> <!-- if dt contains short text like ABCDEF, etc -->
+						<fo:table-column column-width="20%"/>
+						<fo:table-column column-width="80%"/>
 					</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 test="normalize-space($maxlength_dt) != '' and number($maxlength_dt) &lt;= 10"> <!-- if dt contains short text like ABCDEFEF, etc -->
+						<fo:table-column column-width="25%"/>
+						<fo:table-column column-width="75%"/>
 					</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%"/>
@@ -4004,6 +4419,7 @@
 				
 				
 				
+				
 						
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
@@ -4017,10 +4433,18 @@
 			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
+	</xsl:template><xsl:template match="*[local-name()='underline']">
+		<fo:inline text-decoration="underline">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</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 match="*[local-name()='hi']">
+		<fo:inline background-color="yellow">
+			<xsl:apply-templates/>
+		</fo:inline>
 	</xsl:template><xsl:template match="text()[ancestor::*[local-name()='smallcap']]">
 		<xsl:variable name="text" select="normalize-space(.)"/>
 		<fo:inline font-size="75%">
@@ -4110,6 +4534,10 @@
 		<xsl:param name="text" select="."/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
+	</xsl:template><xsl:template name="add-zero-spaces-link-java">
+		<xsl:param name="text" select="."/>
+		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
 	</xsl:template><xsl:template name="add-zero-spaces">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-chars">-</xsl:variable>
@@ -4357,6 +4785,7 @@
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
+				
 				<!-- <xsl:copy-of select="."/> -->
 				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>			
@@ -4370,7 +4799,12 @@
 			<!-- replace start and end spaces to non-break space -->
 			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
 		</xsl:copy>
-	</xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
+	</xsl:template><xsl:template match="mathml:mi[. = ',' and not(following-sibling::*[1][local-name() = 'mtext' and text() = ' '])]" mode="mathml">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" mode="mathml"/>
+		</xsl:copy>
+		<mathml:mspace width="0.5ex"/>
+	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space(@target), 'mailto:')">
@@ -4391,7 +4825,10 @@
 					<fo:basic-link external-destination="{@target}" fox:alt-text="{@target}">
 						<xsl:choose>
 							<xsl:when test="normalize-space(.) = ''">
-								<xsl:value-of select="$target"/>
+								<!-- <xsl:value-of select="$target"/> -->
+								<xsl:call-template name="add-zero-spaces-link-java">
+									<xsl:with-param name="text" select="$target"/>
+								</xsl:call-template>
 							</xsl:when>
 							<xsl:otherwise>
 								<xsl:apply-templates/>
@@ -4401,8 +4838,6 @@
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:inline>
-	</xsl:template><xsl:template match="*[local-name()='bookmark']">
-		<fo:inline id="{@id}"/>
 	</xsl:template><xsl:template match="*[local-name()='appendix']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="appendix-style">
 			<xsl:apply-templates select="*[local-name()='title']" mode="process"/>
@@ -4595,7 +5030,7 @@
 				</xsl:if> -->
 			</fo:inline>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']" name="figure">
 		<fo:block-container id="{@id}">			
 			
 			<fo:block>
@@ -4611,6 +5046,7 @@
 		<fo:block id="{@id}">
 			<xsl:apply-templates/>
 		</fo:block>
+		<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 	</xsl:template><xsl:template match="*[local-name() = 'figure'][@class = 'pseudocode']//*[local-name() = 'p']">
 		<fo:block xsl:use-attribute-sets="figure-pseudocode-p-style">
 			<xsl:apply-templates/>
@@ -4802,6 +5238,12 @@
 		<!-- <xsl:text> </xsl:text> -->
 	</xsl:template><xsl:template name="getSection">
 		<xsl:value-of select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+		<!-- 
+		<xsl:for-each select="*[local-name() = 'title']/*[local-name() = 'tab'][1]/preceding-sibling::node()">
+			<xsl:value-of select="."/>
+		</xsl:for-each>
+		-->
+		
 	</xsl:template><xsl:template name="getName">
 		<xsl:choose>
 			<xsl:when test="*[local-name() = 'title']/*[local-name() = 'tab']">
@@ -4854,6 +5296,12 @@
 		<xsl:copy>
 			<xsl:apply-templates mode="contents_item"/>
 		</xsl:copy>		
+	</xsl:template><xsl:template match="*[local-name() = 'em']" mode="contents_item">
+		<xsl:copy>
+			<xsl:apply-templates mode="contents_item"/>
+		</xsl:copy>		
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents_item">
+		<xsl:copy-of select="."/>
 	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
@@ -4879,6 +5327,7 @@
 						
 						9
 						
+						
 								
 						
 						
@@ -5137,8 +5586,8 @@
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
 			<xsl:variable name="element">
-				block				
-				
+								
+				inline
 				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if> 
 			</xsl:variable>
 			
@@ -5181,9 +5630,15 @@
 		</xsl:choose>
 
 	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
-	
+		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:variable name="element">
-			block
+			
+			
+				<xsl:choose>
+					<xsl:when test="$num = 1">inline</xsl:when>
+					<xsl:otherwise>block</xsl:otherwise>
+				</xsl:choose>
+			
 			
 		</xsl:variable>		
 		<xsl:choose>			
@@ -5259,11 +5714,13 @@
 				</xsl:if>
 			</xsl:if>
 			
+			
 			<fo:block-container margin-left="0mm">
 		
 				<fo:block xsl:use-attribute-sets="quote-style">
 					<!-- <xsl:apply-templates select=".//*[local-name() = 'p']"/> -->
-					<xsl:apply-templates select="./*[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
+					
+					<xsl:apply-templates select="./node()[not(local-name() = 'author') and not(local-name() = 'source')]"/> <!-- process all nested nodes, except author and source -->
 				</fo:block>
 				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
 					<fo:block xsl:use-attribute-sets="quote-source-style">
@@ -5286,29 +5743,47 @@
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name() = 'eref']">
-		<fo:inline xsl:use-attribute-sets="eref-style">
-			<xsl:if test="@type = 'footnote'">
-				
-					<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
-					<xsl:attribute name="font-size">80%</xsl:attribute>
-					<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
-					<xsl:attribute name="vertical-align">super</xsl:attribute>
-									
-				
-			</xsl:if>	
-		
-			<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
-					
-				<xsl:if test="@type = 'inline'">
-					
-					
-					
-				</xsl:if>
-			
-			
-				<xsl:apply-templates/>
-			</fo:basic-link>
-		</fo:inline>
+	
+		<xsl:variable name="bibitemid">
+			<xsl:choose>
+				<xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
+				<xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
+				<xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+	
+		<xsl:choose>
+			<xsl:when test="normalize-space($bibitemid) != ''">
+				<fo:inline xsl:use-attribute-sets="eref-style">
+					<xsl:if test="@type = 'footnote'">
+						
+							<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
+							<xsl:attribute name="font-size">80%</xsl:attribute>
+							<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
+							<xsl:attribute name="vertical-align">super</xsl:attribute>
+											
+						
+					</xsl:if>	
+											
+					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
+						<xsl:if test="normalize-space(@citeas) = ''">
+							<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
+						</xsl:if>
+						<xsl:if test="@type = 'inline'">
+							
+							
+							
+						</xsl:if>
+
+						<xsl:apply-templates/>
+					</fo:basic-link>
+							
+				</fo:inline>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline><xsl:apply-templates/></fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'tab']">
 		<!-- zero-space char -->
 		<xsl:variable name="depth">
@@ -5419,6 +5894,7 @@
 					<xsl:attribute name="space-before">18pt</xsl:attribute>
 				</xsl:if>
 			
+			
 						
 			
 						
@@ -5430,7 +5906,7 @@
 		
 		
 		
-	</xsl:template><xsl:template match="/*/*[local-name() = 'preface']/*" priority="2">
+	</xsl:template><xsl:template match="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*" priority="2"> <!-- /*/*[local-name() = 'preface']/* -->
 		<fo:block break-after="page"/>
 		<fo:block>
 			<xsl:call-template name="setId"/>
@@ -5438,7 +5914,8 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'clause']">
 		<fo:block>
-			<xsl:call-template name="setId"/>			
+			<xsl:call-template name="setId"/>
+			
 			
 			<xsl:apply-templates/>
 		</fo:block>
@@ -5489,6 +5966,153 @@
 				</fo:block>
 			</xsl:otherwise>
 		</xsl:choose>
+	</xsl:template><xsl:variable name="index" select="document($external_index)"/><xsl:variable name="dash" select="'–'"/><xsl:variable name="bookmark_in_fn">
+		<xsl:for-each select="//*[local-name() = 'bookmark'][ancestor::*[local-name() = 'fn']]">
+			<bookmark><xsl:value-of select="@id"/></bookmark>
+		</xsl:for-each>
+	</xsl:variable><xsl:template match="@*|node()" mode="index_add_id">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="index_add_id"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'xref']" mode="index_add_id">
+		<xsl:variable name="id">
+			<xsl:call-template name="generateIndexXrefId"/>
+		</xsl:variable>
+		<xsl:copy> <!-- add id to xref -->
+			<xsl:apply-templates select="@*" mode="index_add_id"/>
+			<xsl:attribute name="id">
+				<xsl:value-of select="$id"/>
+			</xsl:attribute>
+			<xsl:apply-templates mode="index_add_id"/>
+		</xsl:copy>
+		<!-- split <xref target="bm1" to="End" pagenumber="true"> to two xref:
+		<xref target="bm1" pagenumber="true"> and <xref target="End" pagenumber="true"> -->
+		<xsl:if test="@to">
+			<xsl:value-of select="$dash"/>
+			<xsl:copy>
+				<xsl:copy-of select="@*"/>
+				<xsl:attribute name="target"><xsl:value-of select="@to"/></xsl:attribute>
+				<xsl:attribute name="id">
+					<xsl:value-of select="$id"/><xsl:text>_to</xsl:text>
+				</xsl:attribute>
+				<xsl:apply-templates mode="index_add_id"/>
+			</xsl:copy>
+		</xsl:if>
+	</xsl:template><xsl:template match="@*|node()" mode="index_update">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="index_update"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" mode="index_update">
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="index_update"/>
+		<xsl:apply-templates select="node()[1]" mode="process_li_element"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/node()" mode="process_li_element" priority="2">
+		<xsl:param name="element"/>
+		<xsl:param name="remove" select="'false'"/>
+		<xsl:param name="target"/>
+		<!-- <node></node> -->
+		<xsl:choose>
+			<xsl:when test="self::text()  and (normalize-space(.) = ',' or normalize-space(.) = $dash) and $remove = 'true'">
+				<!-- skip text (i.e. remove it) and process next element -->
+				<!-- [removed_<xsl:value-of select="."/>] -->
+				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
+					<xsl:with-param name="target"><xsl:value-of select="$target"/></xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:when>
+			<xsl:when test="self::text()">
+				<xsl:value-of select="."/>
+				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
+			</xsl:when>
+			<xsl:when test="self::* and local-name(.) = 'xref'">
+				<xsl:variable name="id" select="@id"/>
+				<xsl:variable name="page" select="$index//item[@id = $id]"/>
+				<xsl:variable name="id_next" select="following-sibling::*[local-name() = 'xref'][1]/@id"/>
+				<xsl:variable name="page_next" select="$index//item[@id = $id_next]"/>
+				
+				<xsl:variable name="id_prev" select="preceding-sibling::*[local-name() = 'xref'][1]/@id"/>
+				<xsl:variable name="page_prev" select="$index//item[@id = $id_prev]"/>
+				
+				<xsl:choose>
+					<!-- 2nd pass -->
+					<!-- if page is equal to page for next and page is not the end of range -->
+					<xsl:when test="$page != '' and $page_next != '' and $page = $page_next and not(contains($page, '_to'))">  <!-- case: 12, 12-14 -->
+						<!-- skip element (i.e. remove it) and remove next text ',' -->
+						<!-- [removed_xref] -->
+						
+						<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
+							<xsl:with-param name="remove">true</xsl:with-param>
+							<xsl:with-param name="target">
+								<xsl:choose>
+									<xsl:when test="$target != ''"><xsl:value-of select="$target"/></xsl:when>
+									<xsl:otherwise><xsl:value-of select="@target"/></xsl:otherwise>
+								</xsl:choose>
+							</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:when>
+					
+					<xsl:when test="$page != '' and $page_prev != '' and $page = $page_prev and contains($page_prev, '_to')"> <!-- case: 12-14, 14, ... -->
+						<!-- remove xref -->
+						<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element">
+							<xsl:with-param name="remove">true</xsl:with-param>
+						</xsl:apply-templates>
+					</xsl:when>
+
+					<xsl:otherwise>
+						<xsl:apply-templates select="." mode="xref_copy">
+							<xsl:with-param name="target" select="$target"/>
+						</xsl:apply-templates>
+						<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:when>
+			<xsl:when test="self::* and local-name(.) = 'ul'">
+				<!-- ul -->
+				<xsl:apply-templates select="." mode="index_update"/>
+			</xsl:when>
+			<xsl:otherwise>
+			 <xsl:apply-templates select="." mode="xref_copy">
+					<xsl:with-param name="target" select="$target"/>
+				</xsl:apply-templates>
+				<xsl:apply-templates select="following-sibling::node()[1]" mode="process_li_element"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template match="@*|node()" mode="xref_copy">
+		<xsl:param name="target"/>
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="xref_copy"/>
+			<xsl:if test="$target != '' and not(xalan:nodeset($bookmark_in_fn)//bookmark[. = $target])">
+				<xsl:attribute name="target"><xsl:value-of select="$target"/></xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates select="node()" mode="xref_copy"/>
+		</xsl:copy>
+	</xsl:template><xsl:template name="generateIndexXrefId">
+		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
+		
+		<xsl:variable name="docid">
+			<xsl:call-template name="getDocumentId"/>
+		</xsl:variable>
+		<xsl:variable name="item_number">
+			<xsl:number count="*[local-name() = 'li'][ancestor::*[local-name() = 'indexsect']]" level="any"/>
+		</xsl:variable>
+		<xsl:variable name="xref_number"><xsl:number count="*[local-name() = 'xref']"/></xsl:variable>
+		<xsl:value-of select="concat($docid, '_', $item_number, '_', $xref_number)"/> <!-- $level, '_',  -->
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']/*[local-name() = 'clause']" priority="4">
+		<xsl:apply-templates/>
+		<fo:block>
+		<xsl:if test="following-sibling::*[local-name() = 'clause']">
+			<fo:block> </fo:block>
+		</xsl:if>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'ul']" priority="4">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
+		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
+		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'bookmark']">
+		<fo:inline id="{@id}"/>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>
@@ -5584,6 +6208,8 @@
 		<xsl:value-of select="translate(.,'. ','')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
 		<xsl:value-of select="substring(.,1,1)"/>
+	</xsl:template><xsl:template match="*[local-name() = 'title']" mode="title">
+		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -5608,6 +6234,57 @@
 		</xsl:variable>
 		<xsl:variable name="result">
 			<xsl:choose>
+				<xsl:when test="$format = 'ddMMyyyy'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+				</xsl:when>
+				<xsl:when test="$format = 'ddMM'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+				</xsl:when>
+				<xsl:when test="$format = 'short' or $day = ''">
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $day, ', ' , $year))"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:value-of select="$result"/>
+	</xsl:template><xsl:template name="convertDateLocalized">
+		<xsl:param name="date"/>
+		<xsl:param name="format" select="'short'"/>
+		<xsl:variable name="year" select="substring($date, 1, 4)"/>
+		<xsl:variable name="month" select="substring($date, 6, 2)"/>
+		<xsl:variable name="day" select="substring($date, 9, 2)"/>
+		<xsl:variable name="monthStr">
+			<xsl:choose>
+				<xsl:when test="$month = '01'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_january</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '02'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_february</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '03'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_march</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '04'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_april</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '05'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_may</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '06'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_june</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '07'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_july</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '08'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_august</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '09'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_september</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '10'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_october</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '11'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_november</xsl:with-param></xsl:call-template></xsl:when>
+				<xsl:when test="$month = '12'"><xsl:call-template name="getLocalizedString"><xsl:with-param name="key">month_december</xsl:with-param></xsl:call-template></xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:variable name="result">
+			<xsl:choose>
+				<xsl:when test="$format = 'ddMMyyyy'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text>
+					<xsl:value-of select="normalize-space(concat($monthStr, ' ' , $year))"/>
+				</xsl:when>
+				<xsl:when test="$format = 'ddMM'">
+					<xsl:if test="$day != ''"><xsl:value-of select="number($day)"/></xsl:if>
+					<xsl:text> </xsl:text><xsl:value-of select="$monthStr"/>
+				</xsl:when>
 				<xsl:when test="$format = 'short' or $day = ''">
 					<xsl:value-of select="normalize-space(concat($monthStr, ' ', $year))"/>
 				</xsl:when>
@@ -5623,7 +6300,7 @@
 		<xsl:param name="charDelim" select="', '"/>
 		<xsl:choose>
 			<xsl:when test="$sorting = 'true' or $sorting = 'yes'">
-				<xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
+				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:sort data-type="text" order="ascending"/>
 					<xsl:call-template name="insertKeyword">
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
@@ -5632,7 +6309,7 @@
 				</xsl:for-each>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:for-each select="/*/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
+				<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
 					<xsl:call-template name="insertKeyword">
 						<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
 						<xsl:with-param name="charDelim" select="$charDelim"/>
@@ -5649,65 +6326,71 @@
 			<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:variable name="lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		<pdf:catalog>
+				<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:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
+								
+									<xsl:value-of select="*[local-name() = 'title'][@language = $lang and @type = 'main']"/>
 								
-									<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'title'][@language = 'en' and @type = 'main']"/>
 								
 								
 								
 								
 																
-							</xsl:variable>
-							<xsl:choose>
-								<xsl:when test="normalize-space($title) != ''">
-									<xsl:value-of select="$title"/>
-								</xsl:when>
-								<xsl:otherwise>
-									<xsl:text> </xsl:text>
-								</xsl:otherwise>
-							</xsl:choose>							
-						</dc:title>
-						<dc:creator>
+							</xsl:for-each>
+						</xsl:variable>
+						<xsl:choose>
+							<xsl:when test="normalize-space($title) != ''">
+								<xsl:value-of select="$title"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:text> </xsl:text>
+							</xsl:otherwise>
+						</xsl:choose>							
+					</dc:title>
+					<dc:creator>
+						<xsl:for-each select="(//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']">
+							
+								<xsl:for-each select="*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']">
+									<xsl:value-of select="*[local-name() = 'organization']/*[local-name() = 'name']"/>
+									<xsl:if test="position() != last()">; </xsl:if>
+								</xsl:for-each>
 							
-								<xsl:value-of select="/*/*[local-name() = 'bibdata']/*[local-name() = 'contributor'][*[local-name() = 'role']/@type='author']/*[local-name() = 'organization']/*[local-name() = 'name']"/>
 							
 							
+						</xsl:for-each>
+					</dc:creator>
+					<dc:description>
+						<xsl:variable name="abstract">
 							
-						</dc:creator>
-						<dc:description>
-							<xsl:variable name="abstract">
-								
-									<xsl:copy-of select="/*/*[local-name() = 'bibliography']/*[local-name() = 'references']/*[local-name() = 'bibitem']/*[local-name() = 'abstract']//text()"/>
-								
-								
-								
-								
-								
-							</xsl:variable>
-							<xsl:value-of select="normalize-space($abstract)"/>
-						</dc:description>
-						<pdf:Keywords>
-							<xsl:call-template name="insertKeywords"/>
-						</pdf:Keywords>
-					</rdf:Description>
-					<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
-						<!-- XMP properties go here -->
-						<xmp:CreatorTool/>
-					</rdf:Description>
-				</rdf:RDF>
-			</x:xmpmeta>
-		</fo:declarations>
+								<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>									
+							
+							
+						</xsl:variable>
+						<xsl:value-of select="normalize-space($abstract)"/>
+					</dc:description>
+					<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>
 	</xsl:template><xsl:template name="getId">
 		<xsl:choose>
 			<xsl:when test="../@id">
@@ -5804,6 +6487,7 @@
 			
 			
 			
+			
 		</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>
@@ -5863,6 +6547,11 @@
 			<xsl:call-template name="getLang"/>
 		</xsl:variable>
 		
-		<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		<xsl:choose>
+			<xsl:when test="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]">
+				<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$key"/></xsl:otherwise>
+		</xsl:choose>
 		
 	</xsl:template></xsl:stylesheet>